diff options
author | iNPUTmice <daniel@gultsch.de> | 2014-10-02 21:07:11 +0200 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2014-10-02 21:07:11 +0200 |
commit | f671938e842ece605f600860107ec9d2b8bfd019 (patch) | |
tree | da3d64802587a683130b2b8878a6851cb72266a6 /src/eu/siacs/conversations/services | |
parent | cc76e15b95af16a2030b02b9a5035126d3ba18da (diff) |
mark conversation as read when displayed marker from another client is received
Diffstat (limited to 'src/eu/siacs/conversations/services')
-rw-r--r-- | src/eu/siacs/conversations/services/XmppConnectionService.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java index ea2b59038..557a625b0 100644 --- a/src/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/eu/siacs/conversations/services/XmppConnectionService.java @@ -1631,16 +1631,19 @@ public class XmppConnectionService extends Service { return null; } - public void markRead(Conversation conversation) { + public void markRead(Conversation conversation, boolean calledByUi) { conversation.markRead(); mNotificationService.clear(conversation); String id = conversation.popLatestMarkableMessageId(); - if (confirmMessages() && id != null) { + if (confirmMessages() && id != null && calledByUi) { Account account = conversation.getAccount(); String to = conversation.getContactJid(); this.sendMessagePacket(conversation.getAccount(), mMessageGenerator.confirm(account, to, id)); } + if (!calledByUi) { + updateConversationUi(); + } } public void failWaitingOtrMessages(Conversation conversation) { |