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

Revert "Simplified hide/snooze messages" 

This reverts commit 75b77791b4.
This commit is contained in:
M66B 2021-06-23 08:38:24 +02:00
parent bfc8471360
commit c842881a34
2 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3149,7 +3149,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
args.putLong("time", 0);
}
onSnoozeOrHide(args);
onSnooze(args);
}
private void onActionHide(TupleMessageEx message) {
@ -3159,8 +3159,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
args.putLong("id", message.id);
args.putLong("duration", message.ui_snoozed == null ? Long.MAX_VALUE : 0);
args.putLong("time", message.ui_snoozed == null ? Long.MAX_VALUE : 0);
args.putBoolean("hide", true);
onSnoozeOrHide(args);
onSnooze(args);
}
private void onActionSnoozeSelection() {
@ -6166,7 +6167,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
break;
case REQUEST_MESSAGE_SNOOZE:
if (resultCode == RESULT_OK && data != null)
onSnoozeOrHide(data.getBundleExtra("args"));
onSnooze(data.getBundleExtra("args"));
break;
case REQUEST_MESSAGES_SNOOZE:
if (resultCode == RESULT_OK && data != null)
@ -7527,7 +7528,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
}.execute(this, args, "message:color");
}
private void onSnoozeOrHide(Bundle args) {
private void onSnooze(Bundle args) {
long duration = args.getLong("duration");
long time = args.getLong("time");
args.putLong("wakeup", duration == 0 ? -1 : time);
@ -7541,6 +7542,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
Long wakeup = args.getLong("wakeup");
if (wakeup < 0)
wakeup = null;
boolean hide = args.getBoolean("hide");
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean flag_snoozed = prefs.getBoolean("flag_snoozed", false);
@ -7557,15 +7559,14 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
account, thread, threading ? null : id, null);
for (EntityMessage threaded : messages) {
db.message().setMessageUnsnoozed(threaded.id, false);
if (wakeup == null || wakeup == Long.MAX_VALUE || threaded.id.equals(id)) {
db.message().setMessageSnoozed(threaded.id, wakeup);
EntityMessage.snooze(context, threaded.id, wakeup);
if (wakeup != null && wakeup != Long.MAX_VALUE && threaded.id.equals(id)) {
EntityOperation.queue(context, threaded, EntityOperation.SEEN, true);
if (flag_snoozed)
EntityOperation.queue(context, threaded, EntityOperation.FLAG, true);
}
}
db.message().setMessageSnoozed(threaded.id, wakeup);
if (threaded.id.equals(id))
EntityOperation.queue(context, threaded, EntityOperation.SEEN, true, wakeup == null);
else
db.message().setMessageUiIgnored(threaded.id, true);
if (!hide && flag_snoozed && threaded.folder.equals(message.folder))
EntityOperation.queue(context, threaded, EntityOperation.FLAG, wakeup != null);
EntityMessage.snooze(context, threaded.id, wakeup);
}
db.setTransactionSuccessful();
@ -7626,15 +7627,14 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
message.account, message.thread, threading ? null : id, null);
for (EntityMessage threaded : messages) {
db.message().setMessageUnsnoozed(threaded.id, false);
if (wakeup == null || threaded.id.equals(id)) {
db.message().setMessageSnoozed(threaded.id, wakeup);
EntityMessage.snooze(context, threaded.id, wakeup);
if (wakeup != null && threaded.id.equals(id)) {
EntityOperation.queue(context, threaded, EntityOperation.SEEN, true);
if (flag_snoozed)
EntityOperation.queue(context, threaded, EntityOperation.FLAG, true);
}
}
db.message().setMessageSnoozed(threaded.id, wakeup);
if (threaded.id.equals(id))
EntityOperation.queue(context, threaded, EntityOperation.SEEN, true, wakeup == null);
else
db.message().setMessageUiIgnored(threaded.id, true);
if (flag_snoozed && threaded.folder.equals(message.folder))
EntityOperation.queue(context, threaded, EntityOperation.FLAG, wakeup != null);
EntityMessage.snooze(context, threaded.id, wakeup);
}
}

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

@ -969,8 +969,10 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
}
db.message().setMessageSnoozed(message.id, null);
db.message().setMessageUnsnoozed(message.id, true);
EntityOperation.queue(ServiceSynchronize.this, message, EntityOperation.SEEN, false, false);
if (!message.ui_ignored) {
db.message().setMessageUnsnoozed(message.id, true);
EntityOperation.queue(ServiceSynchronize.this, message, EntityOperation.SEEN, false, false);
}
}
db.setTransactionSuccessful();