|
|
|
@ -4429,13 +4429,23 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
|
|
|
|
ArrayList<MessageTarget> result = args.getParcelableArrayList("result");
|
|
|
|
|
|
|
|
|
|
DB db = DB.getInstance(context);
|
|
|
|
|
|
|
|
|
|
long now = new Date().getTime();
|
|
|
|
|
long busy = now + UNDO_TIMEOUT * 2;
|
|
|
|
|
for (MessageTarget target : result) {
|
|
|
|
|
db.message().setMessageUiBusy(target.id, busy, now);
|
|
|
|
|
db.message().setMessageUiHide(target.id, true);
|
|
|
|
|
// Prevent new message notification on undo
|
|
|
|
|
db.message().setMessageUiIgnored(target.id, true);
|
|
|
|
|
try {
|
|
|
|
|
db.beginTransaction();
|
|
|
|
|
|
|
|
|
|
for (MessageTarget target : result) {
|
|
|
|
|
db.message().setMessageUiBusy(target.id, busy);
|
|
|
|
|
db.message().setMessageUiHide(target.id, true);
|
|
|
|
|
// Prevent new message notification on undo
|
|
|
|
|
db.message().setMessageUiIgnored(target.id, true);
|
|
|
|
|
db.message().setMessageLastAttempt(target.id, now);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
db.setTransactionSuccessful();
|
|
|
|
|
} finally {
|
|
|
|
|
db.endTransaction();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
@ -4469,8 +4479,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
|
|
|
|
|
|
|
|
|
for (MessageTarget target : result) {
|
|
|
|
|
Log.i("Move undo id=" + target.id);
|
|
|
|
|
db.message().setMessageUiBusy(target.id, null, new Date().getTime());
|
|
|
|
|
db.message().setMessageUiBusy(target.id, null);
|
|
|
|
|
db.message().setMessageUiHide(target.id, false);
|
|
|
|
|
db.message().setMessageLastAttempt(target.id, new Date().getTime());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
db.setTransactionSuccessful();
|
|
|
|
@ -4518,7 +4529,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
Log.i("Move id=" + id + " target=" + target.folder.name);
|
|
|
|
|
db.message().setMessageUiBusy(target.id, null, new Date().getTime());
|
|
|
|
|
db.message().setMessageUiBusy(target.id, null);
|
|
|
|
|
db.message().setMessageLastAttempt(target.id, new Date().getTime());
|
|
|
|
|
EntityOperation.queue(context, message, EntityOperation.MOVE, target.folder.id);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|