diff options
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 364e2ce4..d2a5c855 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -193,7 +193,8 @@ public class ConversationActivity extends XmppActivity } else if (getSelectedConversation() == item) { setSelectedConversation(listAdapter.getItem(0)); - endConversation(item, false, true); + ConversationActivity.this.mConversationFragment + .reInit(getSelectedConversation()); } return new EnhancedListView.Undoable() { @@ -210,7 +211,11 @@ public class ConversationActivity extends XmppActivity @Override public String getTitle() { - return getResources().getString(R.string.title_undo_swipe_out_conversation); + if (item.getMode() == Conversation.MODE_MULTI) { + return getResources().getString(R.string.title_undo_swipe_out_muc); + } else { + return getResources().getString(R.string.title_undo_swipe_out_conversation, item.getName()); + } } }; } |