conversation archiveable. new conversation will find or restart old conversations

1 files changed, 4 insertions, 5 deletions

diff --git a/src/de/gultsch/chat/ui/NewConversationActivity.java b/src/de/gultsch/chat/ui/NewConversationActivity.java
index 917b4c62..d3a3aa00 100644
--- a/src/de/gultsch/chat/ui/NewConversationActivity.java
+++ b/src/de/gultsch/chat/ui/NewConversationActivity.java
@@ -85,9 +85,7 @@ public class NewConversationActivity extends XmppActivity {
 				
 				Account account = new Account();
 				
-				Conversation conversation = new Conversation(clickedContact.getDisplayName(), clickedContact.getProfilePhoto(), account, clickedContact.getJid());
-			
-				xmppConnectionService.addConversation(conversation);
+				Conversation conversation = xmppConnectionService.findOrCreateConversation(account, clickedContact);
 				
 				Intent viewConversationIntent = new Intent(v.getContext(),ConversationActivity.class);
 				viewConversationIntent.setAction(Intent.ACTION_VIEW);
@@ -218,9 +216,10 @@ public class NewConversationActivity extends XmppActivity {
 	}
 
 	@Override
-	void servConnected() {
-		// TODO Auto-generated method stub
+	void onBackendConnected() {
 		
+		getActionBar().setDisplayHomeAsUpEnabled(false);
+		getActionBar().setHomeButtonEnabled(false);
 	}
 	
 	@Override