From fce78abb1cf985ac02af1c997ff8871f47ce97af Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Tue, 11 Nov 2014 00:16:43 +0100
Subject: temporarliy got rid of some insane work arounds in favor of some
 maybe less insane work arounds

---
 .../java/eu/siacs/conversations/ui/ConversationActivity.java     | 9 ++++-----
 src/main/java/eu/siacs/conversations/ui/XmppActivity.java        | 6 +++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/ui')

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index c6ec63df..8cb8a3aa 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -896,12 +896,11 @@ public class ConversationActivity extends XmppActivity implements
 			public void run() {
 				updateConversationList();
 				if (conversationList.size() == 0) {
-						startActivity(new Intent(getApplicationContext(),
-								StartConversationActivity.class));
-						finish();
-				} else {
-					ConversationActivity.this.mConversationFragment.updateMessages();
+					startActivity(new Intent(getApplicationContext(),
+							StartConversationActivity.class));
+					finish();
 				}
+				ConversationActivity.this.mConversationFragment.updateMessages();
 			}
 		});
 	}
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index 78d7956a..2dafbd26 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -105,7 +105,11 @@ public abstract class XmppActivity extends Activity {
 			XmppConnectionBinder binder = (XmppConnectionBinder) service;
 			xmppConnectionService = binder.getService();
 			xmppConnectionServiceBound = true;
-			onBackendConnected();
+			if (!isFinishing() && !isDestroyed()) {
+				onBackendConnected();
+			} else {
+				Log.d(Config.LOGTAG,"omitting call to onBackendConnected()");
+			}
 		}
 
 		@Override
-- 
cgit v1.2.3