Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-06 09:03:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow ignoring individual messages

Browse Source
This commit is contained in:
M66B
2018-10-16 11:29:12 +00:00
parent 3d5e4ca4a2
commit 1527208327
8 changed files with 1049 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View File

@@ -137,6 +137,7 @@ public class ServiceSynchronize extends LifecycleService {
static final int PI_SEEN = 1;
static final int PI_TRASH = 2;
static final int PI_IGNORED = 3;
static final String ACTION_SYNCHRONIZE_FOLDER = BuildConfig.APPLICATION_ID + ".SYNCHRONIZE_FOLDER";
static final String ACTION_PROCESS_OPERATIONS = BuildConfig.APPLICATION_ID + ".PROCESS_OPERATIONS";
@@ -237,7 +238,7 @@ public class ServiceSynchronize extends LifecycleService {
serviceManager.queue_stop();
else if ("reload".equals(action))
serviceManager.queue_reload();
else if (action.startsWith("seen:") || action.startsWith("trash:")) {
else if (action.startsWith("seen:") || action.startsWith("trash:") || action.startsWith("ignored:")) {
Bundle args = new Bundle();
args.putLong("id", Long.parseLong(action.split(":")[1]));
args.putString("action", action.split(":")[0]);
@@ -261,7 +262,8 @@ public class ServiceSynchronize extends LifecycleService {
EntityFolder trash = db.folder().getFolderByType(message.account, EntityFolder.TRASH);
if (trash != null)
EntityOperation.queue(db, message, EntityOperation.MOVE, trash.id);
}
} else if ("ignored".equals(action))
db.message().setMessageUiIgnored(message.id, true);
db.setTransactionSuccessful();
} finally {
@@ -272,11 +274,6 @@ public class ServiceSynchronize extends LifecycleService {
return null;
}
@Override
protected void onLoaded(Bundle args, Void data) {
Log.i(Helper.TAG, "Set seen");
}
}.load(this, args);
}
}
@@ -391,9 +388,13 @@ public class ServiceSynchronize extends LifecycleService {
Intent thread = new Intent(this, ActivityView.class);
thread.setAction("thread:" + message.id);
thread.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
PendingIntent piThread = PendingIntent.getActivity(
PendingIntent piContent = PendingIntent.getActivity(
this, ActivityView.REQUEST_THREAD, thread, PendingIntent.FLAG_UPDATE_CURRENT);
Intent ignored = new Intent(this, ServiceSynchronize.class);
ignored.setAction("ignored:" + message.id);
PendingIntent piDelete = PendingIntent.getService(this, PI_IGNORED, ignored, PendingIntent.FLAG_UPDATE_CURRENT);
Intent seen = new Intent(this, ServiceSynchronize.class);
seen.setAction("seen:" + message.id);
PendingIntent piSeen = PendingIntent.getService(this, PI_SEEN, seen, PendingIntent.FLAG_UPDATE_CURRENT);
@@ -422,10 +423,10 @@ public class ServiceSynchronize extends LifecycleService {
.addExtras(args)
.setSmallIcon(R.drawable.baseline_mail_24)
.setContentTitle(MessageHelper.getFormattedAddresses(message.from, true))
.setContentIntent(piThread)
.setContentIntent(piContent)
.setSound(uri)
.setWhen(message.sent == null ? message.received : message.sent)
.setOngoing(true)
.setDeleteIntent(piDelete)
.setPriority(Notification.PRIORITY_DEFAULT)
.setCategory(Notification.CATEGORY_STATUS)
.setVisibility(Notification.VISIBILITY_PRIVATE)
@@ -1694,6 +1695,7 @@ public class ServiceSynchronize extends LifecycleService {
message.ui_flagged = false;
message.ui_hide = false;
message.ui_found = found;
message.ui_ignored = false;
if (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_CONTACTS)
== PackageManager.PERMISSION_GRANTED) {