diff options
author | iNPUTmice <daniel@gultsch.de> | 2014-11-20 18:20:42 +0100 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2014-11-20 18:20:42 +0100 |
commit | 0ad6d0616f9663814f6f9f24590833425f6ad372 (patch) | |
tree | fa4b9b39accdf10e176b1c34e4f1b4b140cd6eed /src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | |
parent | e9948f6b8417803e2856f53482d5a158eb9ffa2e (diff) |
brought ad hoc conferences back. fixed #688 fixed #367
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationActivity.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 721ad9c3..0be3a957 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -225,6 +225,18 @@ public class ConversationActivity extends XmppActivity implements } } + @Override + public void switchToConversation(Conversation conversation) { + setSelectedConversation(conversation); + runOnUiThread(new Runnable() { + @Override + public void run() { + ConversationActivity.this.mConversationFragment.reInit(getSelectedConversation()); + openConversation(); + } + }); + } + public void openConversation() { ActionBar ab = getActionBar(); if (ab != null) { @@ -286,7 +298,7 @@ public class ConversationActivity extends XmppActivity implements menuAttach.setVisible(false); } else { menuMucDetails.setVisible(false); - menuInviteContact.setVisible(false); + menuInviteContact.setTitle(R.string.conference_with); } if (this.getSelectedConversation().isMuted()) { menuMute.setVisible(false); |