Granular message transaction

7 years ago · 90ee847281
parent f68c63b1ad
commit 90ee847281
2 changed files with 119 additions and 109 deletions
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@ -922,7 +922,6 @@ class Core {

                for (int j = isub.length - 1; j >= 0 && state.running(); j--)
                    try {
-                        db.beginTransaction();
                        EntityMessage message = synchronizeMessage(
                                context,
                                account, folder,
@ -930,7 +929,6 @@ class Core {
                                false,
                                rules);
                        ids[from + j] = message.id;
-                        db.setTransactionSuccessful();
                    } catch (MessageRemovedException ex) {
                        Log.w(folder.name, ex);
                    } catch (FolderClosedException ex) {
@ -945,7 +943,6 @@ class Core {
                        Log.e(folder.name, ex);
                        db.folder().setFolderError(folder.id, Helper.formatThrowable(ex, true));
                    } finally {
-                        db.endTransaction();
                        // Reduce memory usage
                        ((IMAPMessage) isub[j]).invalidateHeaders();
                    }
@ -1039,6 +1036,7 @@ class Core {
        boolean flagged = helper.getFlagged();
        String flags = helper.getFlags();
        String[] keywords = helper.getKeywords();
+        boolean update = false;
        boolean filter = false;

        DB db = DB.getInstance(context);
@ -1076,7 +1074,7 @@ class Core {
                    dup.msgid = msgid;
                    dup.thread = thread;
                    dup.error = null;
-                    db.message().updateMessage(dup);
+                    update = true;
                    message = dup;
                }
            }
@ -1123,6 +1121,8 @@ class Core {
                }
            }

+            MessageHelper.MessageParts parts = helper.getMessageParts();
+
            message = new EntityMessage();
            message.account = folder.account;
            message.folder = folder.id;
@ -1173,12 +1173,13 @@ class Core {
                    message.warning = context.getString(R.string.title_via, s[1]);
            }

-            message.id = db.message().insertMessage(message);
+            try {
+                db.beginTransaction();

+                message.id = db.message().insertMessage(message);
                Log.i(folder.name + " added id=" + message.id + " uid=" + message.uid);

                int sequence = 1;
-            MessageHelper.MessageParts parts = helper.getMessageParts();
                for (EntityAttachment attachment : parts.getAttachments()) {
                    Log.i(folder.name + " attachment seq=" + sequence +
                            " name=" + attachment.name + " type=" + attachment.type +
@ -1244,9 +1245,15 @@ class Core {
                        }
                    }
                }
-        } else {
-            boolean update = false;

+
+                runRules(context, imessage, message, rules);
+
+                db.setTransactionSuccessful();
+            } finally {
+                db.endTransaction();
+            }
+        } else {
            if (!message.seen.equals(seen) || !message.seen.equals(message.ui_seen)) {
                update = true;
                message.seen = seen;
@ -1301,14 +1308,26 @@ class Core {
            }

            Uri lookupUri = ContactInfo.getLookupUri(context, message.from);
-            if ((message.avatar == null) == (lookupUri != null)) {
+            if ((message.avatar == null) != (lookupUri == null)) {
                update = true;
                message.avatar = (lookupUri == null ? null : lookupUri.toString());
                Log.i(folder.name + " updated id=" + message.id + " lookup=" + lookupUri);
            }

            if (update)
+                try {
+                    db.beginTransaction();
+
                    db.message().updateMessage(message);
+
+                    if (filter)
+                        runRules(context, imessage, message, rules);
+
+                    db.setTransactionSuccessful();
+                } finally {
+                    db.endTransaction();
+                }
+
            else if (BuildConfig.DEBUG)
                Log.i(folder.name + " unchanged uid=" + uid);
        }
@ -1326,7 +1345,14 @@ class Core {
            db.folder().setFolderKeywords(folder.id, DB.Converters.fromStringArray(fkeywords.toArray(new String[0])));
        }

-        if (filter && Helper.isPro(context))
+        return message;
+    }
+
+    private static void runRules(Context context, IMAPMessage imessage, EntityMessage message, List<EntityRule> rules) {
+        if (!Helper.isPro(context))
+            return;
+
+        DB db = DB.getInstance(context);
        try {
            for (EntityRule rule : rules)
                if (rule.matches(context, message, imessage)) {
@ -1338,8 +1364,6 @@ class Core {
            Log.e(ex);
            db.message().setMessageError(message.id, Helper.formatThrowable(ex));
        }
-
-        return message;
    }

    static void downloadMessage(
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@ -681,19 +681,12 @@ public class ServiceSynchronize extends LifecycleService {

                                        for (Message imessage : e.getMessages())
                                            try {
-                                                EntityMessage message;
-                                                try {
-                                                    db.beginTransaction();
-                                                    message = Core.synchronizeMessage(
+                                                EntityMessage message = Core.synchronizeMessage(
                                                        ServiceSynchronize.this,
                                                        account, folder,
                                                        ifolder, (IMAPMessage) imessage,
                                                        false,
                                                        db.rule().getEnabledRules(folder.id));
-                                                    db.setTransactionSuccessful();
-                                                } finally {
-                                                    db.endTransaction();
-                                                }

                                                if (db.folder().getFolderDownload(folder.id))
                                                    Core.downloadMessage(ServiceSynchronize.this,
@ -771,19 +764,12 @@ public class ServiceSynchronize extends LifecycleService {
                                            fp.add(IMAPFolder.FetchProfileItem.FLAGS);
                                            ifolder.fetch(new Message[]{e.getMessage()}, fp);

-                                            EntityMessage message;
-                                            try {
-                                                db.beginTransaction();
-                                                message = Core.synchronizeMessage(
+                                            EntityMessage message = Core.synchronizeMessage(
                                                    ServiceSynchronize.this,
                                                    account, folder,
                                                    ifolder, (IMAPMessage) e.getMessage(),
                                                    false,
                                                    db.rule().getEnabledRules(folder.id));
-                                                db.setTransactionSuccessful();
-                                            } finally {
-                                                db.endTransaction();
-                                            }

                                            if (db.folder().getFolderDownload(folder.id))
                                                Core.downloadMessage(ServiceSynchronize.this,