From c6440aab12460490ef8e9167eac0b515e04f1cdf Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel.gultsch@rwth-aachen.de>
Date: Sun, 9 Feb 2014 14:10:52 +0100
Subject: carbons

---
 src/de/gultsch/chat/ui/NewConversationActivity.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/de/gultsch/chat/ui/NewConversationActivity.java')

diff --git a/src/de/gultsch/chat/ui/NewConversationActivity.java b/src/de/gultsch/chat/ui/NewConversationActivity.java
index 4e2628a6..2fb14008 100644
--- a/src/de/gultsch/chat/ui/NewConversationActivity.java
+++ b/src/de/gultsch/chat/ui/NewConversationActivity.java
@@ -181,7 +181,9 @@ public class NewConversationActivity extends XmppActivity {
 					});
 					accountChooser.create().show();
 				} else {
-					clickedContact.setAccount(accounts.get(0));
+					if (clickedContact.getAccount()==null) {
+						clickedContact.setAccount(accounts.get(0));
+					}
 					showIsMucDialogIfNeeded(clickedContact);
 				}
 			}
@@ -226,6 +228,7 @@ public class NewConversationActivity extends XmppActivity {
 	}
 
 	public void startConversation(Contact contact, Account account, boolean muc) {
+		Log.d("xmppService","starting conversation for account:"+account.getJid()+" and contact:"+contact.getJid());
 		Conversation conversation = xmppConnectionService
 				.findOrCreateConversation(account, contact, muc);
 
-- 
cgit v1.2.3