From c49e24c8b45106501f2055c10faa13e39c55ca9e Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 3 Sep 2018 17:48:48 +0000 Subject: [PATCH] Fixed composing message disappearing --- .../java/eu/faircode/email/ServiceSynchronize.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java index 3fea281abb..6ffe2f8479 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java +++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java @@ -910,17 +910,19 @@ public class ServiceSynchronize extends LifecycleService { MimeMessage imessage = MessageHelper.from(this, message, attachments, isession); AppendUID[] uid = ifolder.appendUIDMessages(new Message[]{imessage}); - if (message.uid != null) { - Message iprev = ifolder.getMessageByUID(message.uid); + Long old = message.uid; + + db.message().setMessageUid(message.id, uid[0].uid); + Log.i(Helper.TAG, "Appended uid=" + message.uid); + + if (old != null) { + Message iprev = ifolder.getMessageByUID(old); if (iprev != null) { - Log.i(Helper.TAG, "Deleting existing id=" + message.id); + Log.i(Helper.TAG, "Deleting existing uid=" + old); iprev.setFlag(Flags.Flag.DELETED, true); ifolder.expunge(); } } - - db.message().setMessageUid(message.id, uid[0].uid); - Log.i(Helper.TAG, "Appended uid=" + message.uid); } private void doMove(EntityFolder folder, Session isession, IMAPStore istore, IMAPFolder ifolder, EntityMessage message, JSONArray jargs, DB db) throws JSONException, MessagingException, IOException {