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

Ignore messages on tapping summary notification

This commit is contained in:
M66B 2019-02-09 14:01:46 +00:00
parent f0fc21bfbc
commit 50ee5750fc
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,12 +155,13 @@ public class ServiceSynchronize extends LifecycleService {
private static final long YIELD_DURATION = 200L; // milliseconds private static final long YIELD_DURATION = 200L; // milliseconds
static final int PI_WHY = 1; static final int PI_WHY = 1;
static final int PI_CLEAR = 2; static final int PI_SUMMARY = 2;
static final int PI_SEEN = 3; static final int PI_CLEAR = 3;
static final int PI_ARCHIVE = 4; static final int PI_SEEN = 4;
static final int PI_TRASH = 5; static final int PI_ARCHIVE = 5;
static final int PI_IGNORED = 6; static final int PI_TRASH = 6;
static final int PI_SNOOZED = 7; static final int PI_IGNORED = 7;
static final int PI_SNOOZED = 8;
@Override @Override
public void onCreate() { public void onCreate() {
@ -337,6 +338,7 @@ public class ServiceSynchronize extends LifecycleService {
serviceManager.service_reload(intent.getStringExtra("reason")); serviceManager.service_reload(intent.getStringExtra("reason"));
break; break;
case "summary":
case "clear": case "clear":
case "seen": case "seen":
case "archive": case "archive":
@ -356,6 +358,15 @@ public class ServiceSynchronize extends LifecycleService {
return; return;
switch (parts[0]) { switch (parts[0]) {
case "summary":
db.message().ignoreAll();
Intent view = new Intent(ServiceSynchronize.this, ActivityView.class);
view.setAction("unified");
view.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(view);
break;
case "clear": case "clear":
db.message().ignoreAll(); db.message().ignoreAll();
break; break;
@ -476,7 +487,7 @@ public class ServiceSynchronize extends LifecycleService {
// https://developer.android.com/training/notify-user/group // https://developer.android.com/training/notify-user/group
String group = Long.toString(account); String group = Long.toString(account);
String summary = getResources().getQuantityString( String title = getResources().getQuantityString(
R.plurals.title_notification_unseen, messages.size(), messages.size()); R.plurals.title_notification_unseen, messages.size(), messages.size());
// Get contact info // Get contact info
@ -485,11 +496,9 @@ public class ServiceSynchronize extends LifecycleService {
messageContact.put(message, ContactInfo.get(this, message.from, false)); messageContact.put(message, ContactInfo.get(this, message.from, false));
// Build pending intent // Build pending intent
Intent view = new Intent(this, ActivityView.class); Intent summary = new Intent(this, ServiceSynchronize.class);
view.setAction("unified"); summary.setAction("summary");
view.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); PendingIntent piSummary = PendingIntent.getService(this, PI_SUMMARY, summary, PendingIntent.FLAG_UPDATE_CURRENT);
PendingIntent piView = PendingIntent.getActivity(
this, ActivityView.REQUEST_UNIFIED, view, PendingIntent.FLAG_UPDATE_CURRENT);
Intent clear = new Intent(this, ServiceSynchronize.class); Intent clear = new Intent(this, ServiceSynchronize.class);
clear.setAction("clear"); clear.setAction("clear");
@ -506,8 +515,8 @@ public class ServiceSynchronize extends LifecycleService {
pbuilder pbuilder
.setSmallIcon(R.drawable.baseline_email_white_24) .setSmallIcon(R.drawable.baseline_email_white_24)
.setContentTitle(summary) .setContentTitle(title)
.setContentIntent(piView) .setContentIntent(piSummary)
.setNumber(messages.size()) .setNumber(messages.size())
.setShowWhen(false) .setShowWhen(false)
.setDeleteIntent(piClear) .setDeleteIntent(piClear)
@ -528,7 +537,7 @@ public class ServiceSynchronize extends LifecycleService {
builder builder
.setSmallIcon(R.drawable.baseline_email_white_24) .setSmallIcon(R.drawable.baseline_email_white_24)
.setContentTitle(getResources().getQuantityString(R.plurals.title_notification_unseen, messages.size(), messages.size())) .setContentTitle(getResources().getQuantityString(R.plurals.title_notification_unseen, messages.size(), messages.size()))
.setContentIntent(piView) .setContentIntent(piSummary)
.setNumber(messages.size()) .setNumber(messages.size())
.setShowWhen(false) .setShowWhen(false)
.setDeleteIntent(piClear) .setDeleteIntent(piClear)
@ -570,7 +579,7 @@ public class ServiceSynchronize extends LifecycleService {
builder.setStyle(new Notification.BigTextStyle() builder.setStyle(new Notification.BigTextStyle()
.bigText(Html.fromHtml(sb.toString())) .bigText(Html.fromHtml(sb.toString()))
.setSummaryText(summary)); .setSummaryText(title));
} }
notifications.add(builder.build()); notifications.add(builder.build());