mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-01 12:44:42 +00:00
Code Issues Releases Wiki Activity

Prevent flagging on hide

Browse source
This commit is contained in:
M66B 2020-05-23 20:57:47 +02:00
parent e79a9270da
commit 18e5d8adc3
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/eu/faircode/email/FragmentMessages.java
View file

@ -2641,6 +2641,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
args.putLong("id", message.id); args.putLong("id", message.id);
args.putLong("duration", message.ui_snoozed == null ? Long.MAX_VALUE : 0); args.putLong("duration", message.ui_snoozed == null ? Long.MAX_VALUE : 0);
args.putLong("time", message.ui_snoozed == null ? Long.MAX_VALUE : 0); args.putLong("time", message.ui_snoozed == null ? Long.MAX_VALUE : 0);
args.putBoolean("hide", true);
onSnooze(args); onSnooze(args);
} }
@ -6183,6 +6184,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
Long wakeup = args.getLong("wakeup"); Long wakeup = args.getLong("wakeup");
if (wakeup < 0) if (wakeup < 0)
wakeup = null; wakeup = null;
boolean hide = args.getBoolean("hide");
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean flag_snoozed = prefs.getBoolean("flag_snoozed", false); boolean flag_snoozed = prefs.getBoolean("flag_snoozed", false);
@ -6200,7 +6202,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
for (EntityMessage threaded : messages) { for (EntityMessage threaded : messages) {
db.message().setMessageSnoozed(threaded.id, wakeup); db.message().setMessageSnoozed(threaded.id, wakeup);
db.message().setMessageUiIgnored(threaded.id, true); db.message().setMessageUiIgnored(threaded.id, true);
if (flag_snoozed && threaded.folder.equals(message.folder)) if (!hide && flag_snoozed && threaded.folder.equals(message.folder))
EntityOperation.queue(context, threaded, EntityOperation.FLAG, wakeup != null); EntityOperation.queue(context, threaded, EntityOperation.FLAG, wakeup != null);
EntityMessage.snooze(context, threaded.id, wakeup); EntityMessage.snooze(context, threaded.id, wakeup);
} }