Merge remote-tracking branch 'refs/remotes/siacs/master'

1 files changed, 18 insertions, 1 deletions

diff --git a/src/main/java/eu/siacs/conversations/utils/SerialSingleThreadExecutor.java b/src/main/java/eu/siacs/conversations/utils/SerialSingleThreadExecutor.java
index bfb4668db..55489ee30 100644
--- a/src/main/java/eu/siacs/conversations/utils/SerialSingleThreadExecutor.java
+++ b/src/main/java/eu/siacs/conversations/utils/SerialSingleThreadExecutor.java
@@ -1,5 +1,7 @@
 package eu.siacs.conversations.utils;
 
+import android.os.Looper;
+
 import java.util.ArrayDeque;
 import java.util.Queue;
 import java.util.concurrent.Executor;
@@ -8,9 +10,24 @@ import java.util.concurrent.Executors;
 public class SerialSingleThreadExecutor implements Executor {
 
 	final Executor executor = Executors.newSingleThreadExecutor();
-	final Queue<Runnable> tasks = new ArrayDeque();
+	protected final Queue<Runnable> tasks = new ArrayDeque();
 	Runnable active;
 
+	public SerialSingleThreadExecutor() {
+		this(false);
+	}
+
+	public SerialSingleThreadExecutor(boolean prepareLooper) {
+		if (prepareLooper) {
+			execute(new Runnable() {
+				@Override
+				public void run() {
+					Looper.prepare();
+				}
+			});
+		}
+	}
+
 	public synchronized void execute(final Runnable r) {
 		tasks.offer(new Runnable() {
 			public void run() {