Prevent hide on move onto self

This commit is contained in:
M66B 2019-01-28 16:57:30 +00:00
parent 30de1b0ad5
commit 696073c909
2 changed files with 2 additions and 5 deletions

View File

@ -158,6 +158,8 @@ public class EntityOperation {
EntityFolder source = db.folder().getFolder(message.folder);
EntityFolder target = db.folder().getFolder(jargs.getLong(0));
if (source.id.equals(target.id))
return;
if (!EntityFolder.ARCHIVE.equals(source.type) || EntityFolder.TRASH.equals(target.type))
db.message().setMessageUiHide(message.id, true);

View File

@ -1797,11 +1797,6 @@ public class ServiceSynchronize extends LifecycleService {
if (autoread && !imessage.isSet(Flags.Flag.SEEN))
imessage.setFlag(Flags.Flag.SEEN, true);
if (target.id.equals(folder.id)) {
Log.w(folder.name + " MOVE onto self");
return;
}
if (istore.hasCapability("MOVE") && !EntityFolder.DRAFTS.equals(folder.type)) {
Folder itarget = istore.getFolder(target.name);
ifolder.moveMessages(new Message[]{imessage}, itarget);