Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

1 files changed, 13 insertions, 0 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
index 4a67aa3e..9c217e35 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
@@ -8,6 +8,8 @@ import android.preference.PreferenceManager;
 import java.io.File;
 
 import de.thedevstack.conversationsplus.utils.ImageUtil;
+import eu.siacs.conversations.utils.SerialSingleThreadExecutor;
+
 import eu.siacs.conversations.R;
 
 /**
@@ -19,6 +21,9 @@ public class ConversationsPlusApplication extends Application {
      */
     private static ConversationsPlusApplication instance;
 
+    private final SerialSingleThreadExecutor mFileAddingExecutor = new SerialSingleThreadExecutor();
+    private final SerialSingleThreadExecutor mDatabaseExecutor = new SerialSingleThreadExecutor();
+
     /**
      * Initializes the application and saves its instance.
      */
@@ -37,6 +42,14 @@ public class ConversationsPlusApplication extends Application {
         return ConversationsPlusApplication.instance;
     }
 
+    public static void executeFileAdding(Runnable r) {
+        getInstance().mFileAddingExecutor.execute(r);
+    }
+
+    public static void executeDatabaseOperation(Runnable r) {
+        getInstance().mDatabaseExecutor.execute(r);
+    }
+
     /**
      * Returns the application's context.
      * @return Context the application's context