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

Skip marking seen on snooze/hide

This commit is contained in:
M66B 2019-11-04 09:00:14 +01:00
parent 12b14955a0
commit 9ef30a653e
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3206,6 +3206,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
return null; return null;
db.message().setMessageSnoozed(message.id, hide ? Long.MAX_VALUE : null); db.message().setMessageSnoozed(message.id, hide ? Long.MAX_VALUE : null);
db.message().setMessageUiIgnored(message.id, true);
EntityMessage.snooze(context, message.id, hide ? Long.MAX_VALUE : null); EntityMessage.snooze(context, message.id, hide ? Long.MAX_VALUE : null);
db.setTransactionSuccessful(); db.setTransactionSuccessful();

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

@ -471,12 +471,11 @@ public class EntityRule {
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
db.message().setMessageSnoozed(message.id, wakeup); db.message().setMessageSnoozed(message.id, wakeup);
db.message().setMessageUiIgnored(message.id, true);
EntityMessage.snooze(context, message.id, wakeup); EntityMessage.snooze(context, message.id, wakeup);
message.ui_snoozed = wakeup; message.ui_snoozed = wakeup;
onActionSeen(context, message, true);
return true; return true;
} }

5
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@ -2035,6 +2035,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
message.account, message.thread, threading ? null : id, message.folder); message.account, message.thread, threading ? null : id, message.folder);
for (EntityMessage threaded : messages) { for (EntityMessage threaded : messages) {
db.message().setMessageSnoozed(threaded.id, hide ? Long.MAX_VALUE : null); db.message().setMessageSnoozed(threaded.id, hide ? Long.MAX_VALUE : null);
db.message().setMessageUiIgnored(message.id, true);
EntityMessage.snooze(context, threaded.id, hide ? Long.MAX_VALUE : null); EntityMessage.snooze(context, threaded.id, hide ? Long.MAX_VALUE : null);
} }
} }
@ -4332,7 +4333,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
account, thread, threading ? null : id, null); account, thread, threading ? null : id, null);
for (EntityMessage threaded : messages) { for (EntityMessage threaded : messages) {
db.message().setMessageSnoozed(threaded.id, wakeup); db.message().setMessageSnoozed(threaded.id, wakeup);
EntityOperation.queue(context, threaded, EntityOperation.SEEN, true); db.message().setMessageUiIgnored(message.id, true);
EntityMessage.snooze(context, threaded.id, wakeup); EntityMessage.snooze(context, threaded.id, wakeup);
} }
@ -4391,8 +4392,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
message.account, message.thread, threading ? null : id, message.folder); message.account, message.thread, threading ? null : id, message.folder);
for (EntityMessage threaded : messages) { for (EntityMessage threaded : messages) {
db.message().setMessageSnoozed(threaded.id, wakeup); db.message().setMessageSnoozed(threaded.id, wakeup);
db.message().setMessageUiIgnored(message.id, true);
EntityMessage.snooze(context, threaded.id, wakeup); EntityMessage.snooze(context, threaded.id, wakeup);
EntityOperation.queue(context, threaded, EntityOperation.SEEN, true);
} }
} }

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

@ -332,7 +332,7 @@ public class ServiceUI extends IntentService {
return; return;
db.message().setMessageSnoozed(id, wakeup); db.message().setMessageSnoozed(id, wakeup);
EntityOperation.queue(this, message, EntityOperation.SEEN, true); db.message().setMessageUiIgnored(message.id, true);
EntityMessage.snooze(this, id, wakeup); EntityMessage.snooze(this, id, wakeup);
db.setTransactionSuccessful(); db.setTransactionSuccessful();