From 4f902d8210d50a586c7ece1bb7da2ab26fd18da5 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 27 Jan 2014 20:40:42 +0100 Subject: conversation archiveable. new conversation will find or restart old conversations --- src/de/gultsch/chat/ui/NewConversationActivity.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (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 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 -- cgit v1.2.3