From e3c9bcc6a38952f59d32677c6690f1f9110b91bb Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 4 Sep 2018 08:08:57 +0000 Subject: [PATCH] Refactoring --- .../java/eu/faircode/email/ServiceSynchronize.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java index b6094ac3..1af437aa 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java +++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java @@ -917,19 +917,15 @@ public class ServiceSynchronize extends LifecycleService { private void doAdd(EntityFolder folder, Session isession, IMAPFolder ifolder, EntityMessage message, JSONArray jargs, DB db) throws MessagingException, JSONException, IOException { // Append message List attachments = db.attachment().getAttachments(message.id); - MimeMessage imessage = MessageHelper.from(this, message, attachments, isession); AppendUID[] uid = ifolder.appendUIDMessages(new Message[]{imessage}); - - Long old = message.uid; - db.message().setMessageUid(message.id, uid[0].uid); - Log.i(Helper.TAG, "Appended uid=" + message.uid); + Log.i(Helper.TAG, "Appended uid=" + uid[0].uid); - if (old != null) { - Message iprev = ifolder.getMessageByUID(old); + if (message.uid != null) { + Message iprev = ifolder.getMessageByUID(message.uid); if (iprev != null) { - Log.i(Helper.TAG, "Deleting existing uid=" + old); + Log.i(Helper.TAG, "Deleting existing uid=" + message.uid); iprev.setFlag(Flags.Flag.DELETED, true); ifolder.expunge(); }