aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationActivity.java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationActivity.java14
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);