From cfc74e7c8e912c7a194ad674ec5f98ab6950640f Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 10 Feb 2014 15:24:34 +0100 Subject: fixed a bug where account options where toggled instead of set off. fixed null pointer for missing selfi. made sefli optional --- src/de/gultsch/chat/ui/ConversationActivity.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/de/gultsch/chat/ui/ConversationActivity.java') diff --git a/src/de/gultsch/chat/ui/ConversationActivity.java b/src/de/gultsch/chat/ui/ConversationActivity.java index c5c03b12..ed328c46 100644 --- a/src/de/gultsch/chat/ui/ConversationActivity.java +++ b/src/de/gultsch/chat/ui/ConversationActivity.java @@ -265,9 +265,14 @@ public class ConversationActivity extends XmppActivity { break; case R.id.action_details: DialogContactDetails details = new DialogContactDetails(); - Contact contact = xmppConnectionService.findOrCreateContact(this.getSelectedConversation().getAccount(),this.getSelectedConversation().getContactJid()); - details.setContact(contact); - details.show(getFragmentManager(), "details"); + Contact contact = this.getSelectedConversation().getContact(); + if (contact != null) { + contact.setAccount(this.selectedConversation.getAccount()); + details.setContact(contact); + details.show(getFragmentManager(), "details"); + } else { + Log.d("xmppService","contact was null - means not in roster"); + } break; default: break; -- cgit v1.2.3