aboutsummaryrefslogtreecommitdiffstats
path: root/src/de/gultsch/chat/ui/ConversationActivity.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-02-10 15:24:34 +0100
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-02-10 15:24:34 +0100
commitcfc74e7c8e912c7a194ad674ec5f98ab6950640f (patch)
tree95aae079591ae9462697499a965ec89b13a83113 /src/de/gultsch/chat/ui/ConversationActivity.java
parent2d0c0e6a4081955b68669c82071a5099e2e1a96e (diff)
fixed a bug where account options where toggled instead of set off. fixed null pointer for missing selfi. made sefli optional
Diffstat (limited to 'src/de/gultsch/chat/ui/ConversationActivity.java')
-rw-r--r--src/de/gultsch/chat/ui/ConversationActivity.java11
1 files changed, 8 insertions, 3 deletions
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;