Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-07 01:23:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Prevent unhide on sync

Browse Source
This commit is contained in:
M66B
2019-10-14 11:29:46 +02:00
parent d4905b86e1
commit 6668cab3e5
6 changed files with 1922 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1634,6 +1634,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
args.putLong("id", message.id);
args.putBoolean("thread", viewType != AdapterMessage.ViewType.THREAD);
args.putLong("target", target);
args.putLong("busy", new Date().getTime() + UNDO_TIMEOUT * 2);
new SimpleTask<ArrayList<MessageTarget>>() {
@Override
@@ -1641,6 +1642,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
long id = args.getLong("id");
boolean thread = args.getBoolean("thread");
long tid = args.getLong("target");
long busy = args.getLong("busy");
ArrayList<MessageTarget> result = new ArrayList<>();
@@ -1662,6 +1664,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
message.account, message.thread, threading && thread ? null : id, message.folder);
for (EntityMessage threaded : messages) {
result.add(new MessageTarget(threaded, account, target));
db.message().setMessageUiBusy(threaded.id, busy);
db.message().setMessageUiHide(threaded.id, true);
// Prevent new message notification on undo
db.message().setMessageUiIgnored(threaded.id, true);
@@ -3532,6 +3535,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
ArrayList<MessageTarget> result = args.getParcelableArrayList("result");
for (MessageTarget target : result) {
Log.i("Move undo id=" + target.id);
db.message().setMessageUiBusy(target.id, null);
db.message().setMessageUiHide(target.id, false);
}
@@ -3580,6 +3584,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
continue;
Log.i("Move id=" + id + " target=" + target.folder.name);
db.message().setMessageUiBusy(target.id, null);
EntityOperation.queue(context, message, EntityOperation.MOVE, target.folder.id);
}