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

Always unhide on move

This commit is contained in:
M66B 2021-04-17 12:22:27 +02:00
parent 7c2c6addeb
commit 4c64edcb0a
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4530,8 +4530,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
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); db.message().setMessageUiIgnored(message.id, true);
if (!hide)
db.message().setMessageUiHide(message.id, false);
EntityMessage.snooze(context, message.id, hide ? Long.MAX_VALUE : null); EntityMessage.snooze(context, message.id, hide ? Long.MAX_VALUE : null);
db.setTransactionSuccessful(); db.setTransactionSuccessful();

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

@ -3453,7 +3453,6 @@ class Core {
} }
if (message.ui_hide && if (message.ui_hide &&
message.ui_snoozed == null &&
(message.ui_busy == null || message.ui_busy < new Date().getTime()) && (message.ui_busy == null || message.ui_busy < new Date().getTime()) &&
db.operation().getOperationCount(folder.id, message.id) == 0 && db.operation().getOperationCount(folder.id, message.id) == 0 &&
db.operation().getOperationCount(folder.id, EntityOperation.PURGE) == 0) { db.operation().getOperationCount(folder.id, EntityOperation.PURGE) == 0) {

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

@ -292,8 +292,7 @@ public class EntityOperation {
message.ui_flagged = false; message.ui_flagged = false;
message.color = null; message.color = null;
} }
if (message.ui_snoozed == null) message.ui_hide = false;
message.ui_hide = false;
message.ui_browsed = false; message.ui_browsed = false;
message.error = null; message.error = null;
message.id = db.message().insertMessage(message); message.id = db.message().insertMessage(message);