From fc2840ae30dfda4fe71a9cf892ee02b86fc88112 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 14 Jun 2019 08:31:37 +0200 Subject: [PATCH] Removed dependency on UIDPLUS --- app/src/main/java/eu/faircode/email/Core.java | 220 ++++++++---------- .../java/eu/faircode/email/DaoMessage.java | 3 + .../eu/faircode/email/EntityOperation.java | 26 +-- 3 files changed, 105 insertions(+), 144 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 3761c6151f..53f69cf2ac 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -43,7 +43,6 @@ import com.bugsnag.android.Bugsnag; import com.sun.mail.iap.CommandFailedException; import com.sun.mail.iap.ConnectionException; import com.sun.mail.iap.Response; -import com.sun.mail.imap.AppendUID; import com.sun.mail.imap.IMAPFolder; import com.sun.mail.imap.IMAPMessage; import com.sun.mail.imap.IMAPStore; @@ -146,7 +145,6 @@ class Core { crumb.put("args", op.args); crumb.put("folder", folder.type); crumb.put("free", Integer.toString(Log.getFreeMemMb())); - crumb.put("UIDPLUS", Boolean.toString(((IMAPStore) istore).hasCapability("UIDPLUS"))); Bugsnag.leaveBreadcrumb("operation", BreadcrumbType.LOG, crumb); // Fetch most recent copy of message @@ -436,144 +434,120 @@ class Core { DB db = DB.getInstance(context); // Get arguments - Long tmpid = (jargs.length() > 0 && !jargs.isNull(0) ? jargs.getLong(0) : null); + long target = (jargs.length() > 0 ? jargs.getLong(0) : folder.id); boolean autoread = (jargs.length() > 1 && jargs.getBoolean(1)); - boolean across = (jargs.length() > 2 && jargs.getBoolean(2)); - try { - if (EntityFolder.DRAFTS.equals(folder.type) && - !folder.id.equals(message.folder) && - !across) { - Log.i("Drafts moved folder=" + message.folder); - return; - } + if (target != folder.id) + throw new IllegalArgumentException("Invalid folder"); - // Delete previous message(s) with same ID - if (folder.id.equals(message.folder)) { - // Prevent adding/deleting message + // Prevent async deletion + if (folder.id.equals(message.folder)) { + if (message.uid != null) db.message().setMessageUid(message.id, null); + } - if (TextUtils.isEmpty(message.msgid)) { - // Draft might be created somewhere else - if (message.uid == null) - throw new IllegalArgumentException("Add without ID"); - else { - Message idelete = ifolder.getMessageByUID(message.uid); - Log.i(folder.name + " deleting previous uid=" + message.uid + " msgid=" + message.msgid); - try { - idelete.setFlag(Flags.Flag.DELETED, true); - } catch (MessageRemovedException ignored) { - } - } - message.msgid = EntityMessage.generateMessageId(); - } else { - Message[] ideletes = ifolder.search(new MessageIDTerm(message.msgid)); - for (Message idelete : ideletes) { - long uid = ifolder.getUID(idelete); - Log.i(folder.name + " deleting previous uid=" + uid + " msgid=" + message.msgid); - try { - idelete.setFlag(Flags.Flag.DELETED, true); - } catch (MessageRemovedException ignored) { - } - } - } - ifolder.expunge(); - } + // External draft might have a uid only + if (TextUtils.isEmpty(message.msgid)) { + message.msgid = EntityMessage.generateMessageId(); + db.message().setMessageMsgId(message.id, message.msgid); + } - // Get message - MimeMessage imessage; - if (folder.id.equals(message.folder)) { - // Pre flight checks - if (!message.content) - throw new IllegalArgumentException("Message body missing"); + // Get raw message + MimeMessage imessage; + if (folder.id.equals(message.folder)) { + // Pre flight checks + if (!message.content) + throw new IllegalArgumentException("Message body missing"); - EntityIdentity identity = - (message.identity == null ? null : db.identity().getIdentity(message.identity)); + EntityIdentity identity = + (message.identity == null ? null : db.identity().getIdentity(message.identity)); - imessage = MessageHelper.from(context, message, identity, isession); - } else { - // Cross account move - File file = message.getRawFile(context); - if (!file.exists()) - throw new IllegalArgumentException("raw message file not found"); - - Log.i(folder.name + " reading " + file); - try (InputStream is = new BufferedInputStream(new FileInputStream(file))) { - imessage = new MimeMessage(isession, is); - } - } + imessage = MessageHelper.from(context, message, identity, isession); + } else { + // Cross account move + File file = message.getRawFile(context); + if (!file.exists()) + throw new IllegalArgumentException("raw message file not found"); - // Handle auto read - if (ifolder.getPermanentFlags().contains(Flags.Flag.SEEN)) { - if (autoread && !imessage.isSet(Flags.Flag.SEEN)) { - Log.i(folder.name + " autoread"); - imessage.setFlag(Flags.Flag.SEEN, true); - } + Log.i(folder.name + " reading " + file); + try (InputStream is = new BufferedInputStream(new FileInputStream(file))) { + imessage = new MimeMessage(isession, is); } + } - // Handle draft - if (EntityFolder.DRAFTS.equals(folder.type)) - if (ifolder.getPermanentFlags().contains(Flags.Flag.DRAFT)) - imessage.setFlag(Flags.Flag.DRAFT, true); - - // Add message - long uid = -1; - if (istore.hasCapability("UIDPLUS")) { - AppendUID[] uids = ifolder.appendUIDMessages(new Message[]{imessage}); - if (uids != null && uids.length > 0) { - Log.i("Appended uid=" + uids[0].uid); - uid = uids[0].uid; - } - } else - ifolder.appendMessages(new Message[]{imessage}); - - // Lookup uid - if (uid <= 0) { - Log.i("Searching for appended msgid=" + message.msgid); - Message[] messages = ifolder.search(new MessageIDTerm(message.msgid)); - if (messages != null) - for (Message iappended : messages) { - long muid = ifolder.getUID(iappended); - Log.i("Found appended uid=" + muid); - // RFC3501: Unique identifiers are assigned in a strictly ascending fashion - if (muid > uid) - uid = muid; - } + // Handle auto read + if (ifolder.getPermanentFlags().contains(Flags.Flag.SEEN)) { + if (autoread && !imessage.isSet(Flags.Flag.SEEN)) { + Log.i(folder.name + " autoread"); + imessage.setFlag(Flags.Flag.SEEN, true); } + } - if (uid <= 0) - throw new IllegalArgumentException("uid not found"); - - Log.i(folder.name + " appended id=" + message.id + " uid=" + uid); - - try { - db.beginTransaction(); + // Handle draft + if (EntityFolder.DRAFTS.equals(folder.type)) + if (ifolder.getPermanentFlags().contains(Flags.Flag.DRAFT)) + imessage.setFlag(Flags.Flag.DRAFT, true); - if (folder.id.equals(message.folder)) { - if (EntityFolder.DRAFTS.equals(folder.type)) { - Log.i(folder.name + " Setting id=" + message.id + " uid=" + uid); - db.message().setMessageUid(message.id, uid); - } - } else { - // Mark source read - if (autoread) { - Log.i(folder.name + " queuing SEEN id=" + message.id); - EntityOperation.queue(context, message, EntityOperation.SEEN, true); + // Add message + ifolder.appendMessages(new Message[]{imessage}); + + if (folder.id.equals(message.folder)) { + // External draft might have a uid only + if (message.uid != null) { + Message iexisting = ifolder.getMessageByUID(message.uid); + if (iexisting == null) + Log.w(folder.name + " existing not found uid=" + message.uid); + else + try { + Log.i(folder.name + " deleting uid=" + message.uid); + iexisting.setFlag(Flags.Flag.DELETED, true); + } catch (MessageRemovedException ignored) { + Log.w(folder.name + " existing gone uid=" + message.uid); } + } - // Delete source - Log.i(folder.name + " queuing DELETE id=" + message.id); - EntityOperation.queue(context, message, EntityOperation.DELETE); + Log.i(folder.name + " searching for msgid=" + message.msgid); + Message[] imessages = ifolder.search(new MessageIDTerm(message.msgid)); + if (imessages == null) + Log.w(folder.name + " search for msgid=" + message.msgid + " returned null"); + else { + long uid = -1; + + for (Message iexisting : imessages) { + long muid = ifolder.getUID(iexisting); + Log.i(folder.name + " found uid=" + muid); + // RFC3501: Unique identifiers are assigned in a strictly ascending fashion + if (muid > uid) + uid = muid; } - db.setTransactionSuccessful(); - } finally { - db.endTransaction(); + if (uid < 0) + Log.w(folder.name + " appended msgid=" + message.msgid + " not found"); + else { + Log.i(folder.name + " appended uid=" + uid); + + for (Message iexisting : imessages) { + long muid = ifolder.getUID(iexisting); + if (muid != uid) + try { + Log.i(folder.name + " deleting uid=" + muid); + iexisting.setFlag(Flags.Flag.DELETED, true); + } catch (MessageRemovedException ignored) { + Log.w(folder.name + " existing gone uid=" + muid); + } + } + } } - } catch (Throwable ex) { - if (folder.id.equals(message.folder)) - db.message().setMessageUid(message.id, message.uid); - throw ex; + + ifolder.expunge(); + + } else { + // Mark source read + if (autoread) + EntityOperation.queue(context, message, EntityOperation.SEEN, true); + + // Delete source + EntityOperation.queue(context, message, EntityOperation.DELETE); } } @@ -675,9 +649,7 @@ class Core { if (jargs.length() > 0) { // Cross account move - long target = jargs.getLong(2); - jargs.remove(2); - jargs.put(2, true); // cross account + long target = jargs.getLong(0); Log.i(folder.name + " queuing ADD id=" + message.id + ":" + target); EntityOperation operation = new EntityOperation(); diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java index 1c276062fd..5159748154 100644 --- a/app/src/main/java/eu/faircode/email/DaoMessage.java +++ b/app/src/main/java/eu/faircode/email/DaoMessage.java @@ -326,6 +326,9 @@ public interface DaoMessage { @Query("UPDATE message SET uid = :uid WHERE id = :id") int setMessageUid(long id, Long uid); + @Query("UPDATE message SET msgid = :msgid WHERE id = :id") + int setMessageMsgId(long id, String msgid); + @Query("UPDATE message SET seen = :seen WHERE id = :id") int setMessageSeen(long id, boolean seen); diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java index c30c56ab8f..3b331e28c9 100644 --- a/app/src/main/java/eu/faircode/email/EntityOperation.java +++ b/app/src/main/java/eu/faircode/email/EntityOperation.java @@ -117,9 +117,8 @@ public class EntityOperation { else if (MOVE.equals(name)) { // Parameters: - // 0: target folder id - // 1: allow auto read - // 2: temporary target message id + // 0: target folder + // 1: auto read SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); boolean autoread = prefs.getBoolean("autoread", false); @@ -144,7 +143,6 @@ public class EntityOperation { // Create copy without uid in target folder // Message with same msgid can be in archive - Long tmpid = null; if (message.uid != null && target.synchronize && message.received > cal_keep.getTimeInMillis() && @@ -171,7 +169,7 @@ public class EntityOperation { message.ui_browsed = false; message.id = db.message().insertMessage(message); File mtarget = message.getFile(context); - tmpid = message.id; + long tmpid = message.id; message.id = id; message.account = source.account; @@ -194,25 +192,13 @@ public class EntityOperation { EntityAttachment.copy(context, message.id, tmpid); } - if (source.account.equals(target.account)) - jargs.put(2, tmpid); // Can be null - else { - // Cross account move + // Cross account move + if (!source.account.equals(target.account)) if (message.raw != null && message.raw) { name = ADD; folder = target.id; - jargs = new JSONArray(); - jargs.put(0, tmpid); // Can be null - jargs.put(1, autoread); - jargs.put(2, true); // Cross account - } else { + } else name = RAW; - jargs = new JSONArray(); - jargs.put(0, tmpid); // Can be null - jargs.put(1, autoread); - jargs.put(2, target.id); - } - } } else if (DELETE.equals(name)) db.message().setMessageUiHide(message.id, true);