aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-04-09 10:46:26 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-04-09 10:46:26 +0200
commitf880473435b6c3167edc727eacccef377643a8c5 (patch)
treeede7f178510894aabb227e03fccc9f25bc85c682 /src/main/java/eu/siacs/conversations/services
parent59ea143147548ee15211d7c334076a158757c85f (diff)
parentdace8ba3d3815599a70d5e369cd3b1f418842a0e (diff)
Merge pull request #1104 from BrianBlade/feature/swipe_out_conversation
Enable end-conversation by swipe gesture
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/services/XmppConnectionService.java1
1 files changed, 1 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) {