aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-08 20:51:27 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-08 20:51:27 +0100
commitea657ece0d9151cc912b955bb17306f99e603884 (patch)
tree85c310823b6b7645f9e9821ad0dd1542688d2767 /src/main/java
parent8a2f20b6ed4a121e47410f9ffe368caf0dae891a (diff)
update conversation fragment on every backend connect
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationActivity.java5
1 files changed, 3 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 2a4ddd2b..d02a7c7b 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -31,7 +31,6 @@ import android.widget.Toast;
import java.util.ArrayList;
import java.util.List;
-import eu.siacs.conversations.Config;
import eu.siacs.conversations.R;
import eu.siacs.conversations.entities.Contact;
import eu.siacs.conversations.entities.Conversation;
@@ -684,7 +683,9 @@ public class ConversationActivity extends XmppActivity implements
}
this.mConversationFragment.reInit(getSelectedConversation());
mOpenConverstaion = null;
- } else if (getSelectedConversation() == null) {
+ } else if (getSelectedConversation() != null) {
+ this.mConversationFragment.updateMessages();
+ } else {
showConversationsOverview();
mPendingImageUri = null;
setSelectedConversation(conversationList.get(0));