clear notification when dismissing a conversation

2 files changed, 2 insertions, 0 deletions

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());