From 696073c909730fbdeb0a4715d7015e17de0d1ca3 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 28 Jan 2019 16:57:30 +0000 Subject: [PATCH] Prevent hide on move onto self --- app/src/main/java/eu/faircode/email/EntityOperation.java | 2 ++ app/src/main/java/eu/faircode/email/ServiceSynchronize.java | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java index 68d9d17f86..f4f07f9dfd 100644 --- a/app/src/main/java/eu/faircode/email/EntityOperation.java +++ b/app/src/main/java/eu/faircode/email/EntityOperation.java @@ -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); diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java index fcef806190..cedf5e3d1a 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java +++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java @@ -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);