mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Cancel notifications on ignore with group

This commit is contained in:
M66B 2023-05-14 09:04:26 +02:00
parent 98bda4fd77
commit 32909d157b
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/faircode/email/ActivityView.java
View File

@ -1980,8 +1980,9 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
} else if (action.startsWith("thread")) { } else if (action.startsWith("thread")) {
long id = Long.parseLong(action.split(":", 2)[1]); long id = Long.parseLong(action.split(":", 2)[1]);
boolean ignore = intent.getBooleanExtra("ignore", false); boolean ignore = intent.getBooleanExtra("ignore", false);
long group = intent.getLongExtra("group", -1L);
if (ignore) if (ignore)
ServiceUI.ignore(this, id); ServiceUI.ignore(this, id, group);
intent.putExtra("id", id); intent.putExtra("id", id);
onViewThread(intent); onViewThread(intent);

1
app/src/main/java/eu/faircode/email/Core.java
View File

@ -5668,6 +5668,7 @@ class Core {
// Build pending intents // Build pending intents
Intent thread = new Intent(context, ActivityView.class); Intent thread = new Intent(context, ActivityView.class);
thread.setAction("thread:" + message.id); thread.setAction("thread:" + message.id);
thread.putExtra("group", group);
thread.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); thread.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
thread.putExtra("account", message.account); thread.putExtra("account", message.account);
thread.putExtra("folder", message.folder); thread.putExtra("folder", message.folder);

1
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@ -6220,6 +6220,7 @@ public class FragmentCompose extends FragmentBase {
Intent thread = new Intent(v.getContext(), ActivityView.class); Intent thread = new Intent(v.getContext(), ActivityView.class);
thread.setAction("thread:" + message.id); thread.setAction("thread:" + message.id);
// No group
thread.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); thread.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
thread.putExtra("account", message.account); thread.putExtra("account", message.account);
thread.putExtra("folder", message.folder); thread.putExtra("folder", message.folder);

6
app/src/main/java/eu/faircode/email/ServiceUI.java
View File

@ -157,6 +157,7 @@ public class ServiceUI extends IntentService {
break; break;
case "ignore": case "ignore":
cancel(group, id);
onIgnore(id); onIgnore(id);
break; break;
@ -520,10 +521,11 @@ public class ServiceUI extends IntentService {
} }
} }
static void ignore(Context context, long id) { static void ignore(Context context, long id, long group) {
try { try {
Intent ignore = new Intent(context, ServiceUI.class) Intent ignore = new Intent(context, ServiceUI.class)
.setAction("ignore:" + id); .setAction("ignore:" + id)
.putExtra("group", group);
context.startService(ignore); context.startService(ignore);
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(ex); Log.e(ex);