diff options
author | Christian S <christian@pix-art.de> | 2016-02-20 15:28:01 +0100 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2016-02-20 15:28:01 +0100 |
commit | fe52f30c5bbd6f4403b1fe97964488611a3c7276 (patch) | |
tree | 562388d395f2547b85c49d8979dbab6193d08199 /src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | |
parent | 2879ddadca409d05eb71ca0863980ed0ec6b1023 (diff) | |
parent | 3bde4dbedb80a8e1de89c09f58d842d7382598e8 (diff) |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationActivity.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index e95efc3de..2d5c7f8b3 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -446,11 +446,7 @@ public class ConversationActivity extends XmppActivity public void sendReadMarkerIfNecessary(final Conversation conversation) { if (!mActivityPaused && conversation != null) { - if (!conversation.isRead()) { - xmppConnectionService.sendReadMarker(conversation); - } else { - xmppConnectionService.markRead(conversation); - } + xmppConnectionService.sendReadMarker(conversation); } } @@ -1713,6 +1709,7 @@ public class ConversationActivity extends XmppActivity public void setMessagesLoaded() { if (mConversationFragment != null) { mConversationFragment.setMessagesLoaded(); + mConversationFragment.updateMessages(); } } } |