Merge branch 'trz/rebase' into trz/rename

Conflicts:
	build.gradle
	src/main/java/de/thedevstack/conversationsplus/crypto/OtrEngine.java
	src/main/java/de/thedevstack/conversationsplus/entities/Account.java
	src/main/java/de/thedevstack/conversationsplus/entities/Contact.java
	src/main/java/de/thedevstack/conversationsplus/entities/Downloadable.java
	src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java
	src/main/java/de/thedevstack/conversationsplus/entities/DownloadablePlaceholder.java
	src/main/java/de/thedevstack/conversationsplus/entities/Message.java
	src/main/java/de/thedevstack/conversationsplus/generator/IqGenerator.java
	src/main/java/de/thedevstack/conversationsplus/http/HttpConnection.java
	src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java
	src/main/java/de/thedevstack/conversationsplus/parser/AbstractParser.java
	src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
	src/main/java/de/thedevstack/conversationsplus/parser/PresenceParser.java
	src/main/java/de/thedevstack/conversationsplus/persistance/DatabaseBackend.java
	src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java
	src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java
	src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
	src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java
	src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
	src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
	src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java
	src/main/java/de/thedevstack/conversationsplus/ui/adapter/AccountAdapter.java
	src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
	src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java
	src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
	src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java
	src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java
	src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java
	src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleInbandTransport.java
	src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java
	src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/MessagePacket.java
	src/main/java/eu/siacs/conversations/crypto/OtrEngine.java
	src/main/java/eu/siacs/conversations/crypto/OtrService.java
	src/main/java/eu/siacs/conversations/entities/DownloadablePlaceholder.java
	src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java
	src/main/java/eu/siacs/conversations/http/HttpConnection.java
	src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
	src/main/res/layout/activity_about.xml

1 files changed, 34 insertions, 0 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/SerialSingleThreadExecutor.java b/src/main/java/de/thedevstack/conversationsplus/utils/SerialSingleThreadExecutor.java
new file mode 100644
index 00000000..264645c6
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/SerialSingleThreadExecutor.java
@@ -0,0 +1,34 @@
+package de.thedevstack.conversationsplus.utils;
+
+import java.util.ArrayDeque;
+import java.util.Queue;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
+public class SerialSingleThreadExecutor implements Executor {
+
+	final Executor executor = Executors.newSingleThreadExecutor();
+	final Queue<Runnable> tasks = new ArrayDeque();
+	Runnable active;
+
+	public synchronized void execute(final Runnable r) {
+		tasks.offer(new Runnable() {
+			public void run() {
+				try {
+					r.run();
+				} finally {
+					scheduleNext();
+				}
+			}
+		});
+		if (active == null) {
+			scheduleNext();
+		}
+	}
+
+	protected synchronized void scheduleNext() {
+		if ((active =  tasks.poll()) != null) {
+			executor.execute(active);
+		}
+	}
+}