From 813530145e46175ada62e71715f6e788d741d6bb Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Wed, 8 Apr 2015 13:07:36 +0200 Subject: clear notification when dismissing a conversation --- src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 1 + src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index ca182867..9badbbd8 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -1129,6 +1129,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa } public void archiveConversation(Conversation conversation) { + getNotificationService().clear(conversation); conversation.setStatus(Conversation.STATUS_ARCHIVED); conversation.setNextEncryption(-1); synchronized (this.conversations) { diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index e771e6dc..79b2c5c9 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -193,6 +193,7 @@ public class ConversationActivity extends XmppActivity swipedConversation = listAdapter.getItem(position); listAdapter.remove(swipedConversation); swipedConversation.markRead(); + xmppConnectionService.getNotificationService().clear(swipedConversation); final int top = (v == null) ? 0 : (v.getTop() - listView.getPaddingTop()); -- cgit v1.2.3