|
|
@ -226,6 +226,7 @@ public class EntityOperation {
|
|
|
|
db.message().setMessageImportance(similar.id, null);
|
|
|
|
db.message().setMessageImportance(similar.id, null);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (source.account.equals(target.account)) {
|
|
|
|
EntityAccount account = db.account().getAccount(message.account);
|
|
|
|
EntityAccount account = db.account().getAccount(message.account);
|
|
|
|
if ((account != null && !account.isGmail()) ||
|
|
|
|
if ((account != null && !account.isGmail()) ||
|
|
|
|
!EntityFolder.ARCHIVE.equals(source.type) ||
|
|
|
|
!EntityFolder.ARCHIVE.equals(source.type) ||
|
|
|
@ -237,6 +238,7 @@ public class EntityOperation {
|
|
|
|
EntityFolder.ARCHIVE.equals(source.type) &&
|
|
|
|
EntityFolder.ARCHIVE.equals(source.type) &&
|
|
|
|
!(EntityFolder.TRASH.equals(target.type) || EntityFolder.JUNK.equals(target.type)))
|
|
|
|
!(EntityFolder.TRASH.equals(target.type) || EntityFolder.JUNK.equals(target.type)))
|
|
|
|
name = COPY;
|
|
|
|
name = COPY;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (message.ui_snoozed != null &&
|
|
|
|
if (message.ui_snoozed != null &&
|
|
|
|
(EntityFolder.ARCHIVE.equals(target.type) || EntityFolder.TRASH.equals(target.type))) {
|
|
|
|
(EntityFolder.ARCHIVE.equals(target.type) || EntityFolder.TRASH.equals(target.type))) {
|
|
|
|