narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

properly clear notifications. fixed #921

Browse source
This commit is contained in:
iNPUTmice 2015-01-29 13:20:18 +01:00
parent 3c64839daf
commit 0eeead495f
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
View file

@ -262,8 +262,12 @@ public class ConversationActivity extends XmppActivity
} }
public void sendReadMarkerIfNecessary(final Conversation conversation) { public void sendReadMarkerIfNecessary(final Conversation conversation) {
if (!mActivityPaused && conversation != null && !conversation.isRead()) { if (!mActivityPaused && conversation != null) {
if (!conversation.isRead()) {
xmppConnectionService.sendReadMarker(conversation); xmppConnectionService.sendReadMarker(conversation);
} else {
xmppConnectionService.markRead(conversation);
}
} }
} }
@ -742,9 +746,11 @@ public class ConversationActivity extends XmppActivity
if (this.xmppConnectionServiceBound) { if (this.xmppConnectionServiceBound) {
this.xmppConnectionService.getNotificationService().setIsInForeground(true); this.xmppConnectionService.getNotificationService().setIsInForeground(true);
} }
if (!isConversationsOverviewVisable() || !isConversationsOverviewHideable()) { if (!isConversationsOverviewVisable() || !isConversationsOverviewHideable()) {
sendReadMarkerIfNecessary(getSelectedConversation()); sendReadMarkerIfNecessary(getSelectedConversation());
} }
} }
@Override @Override