aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/ui
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-10-02 21:07:11 +0200
committeriNPUTmice <daniel@gultsch.de>2014-10-02 21:07:11 +0200
commitf671938e842ece605f600860107ec9d2b8bfd019 (patch)
treeda3d64802587a683130b2b8878a6851cb72266a6 /src/eu/siacs/conversations/ui
parentcc76e15b95af16a2030b02b9a5035126d3ba18da (diff)
mark conversation as read when displayed marker from another client is received
Diffstat (limited to 'src/eu/siacs/conversations/ui')
-rw-r--r--src/eu/siacs/conversations/ui/ConversationActivity.java2
-rw-r--r--src/eu/siacs/conversations/ui/ConversationFragment.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index 03cf753d3..0c67beff9 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -156,7 +156,7 @@ public class ConversationActivity extends XmppActivity implements
openConversation(getSelectedConversation());
if (!getSelectedConversation().isRead()) {
xmppConnectionService
- .markRead(getSelectedConversation());
+ .markRead(getSelectedConversation(),true);
listView.invalidateViews();
}
}
diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index 064b00be4..34c68e00b 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -494,7 +494,7 @@ public class ConversationFragment extends Fragment {
getActivity().invalidateOptionsMenu();
updateChatMsgHint();
if (!activity.shouldPaneBeOpen()) {
- activity.xmppConnectionService.markRead(conversation);
+ activity.xmppConnectionService.markRead(conversation,true);
activity.updateConversationList();
}
this.updateSendButton();