aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
diff options
context:
space:
mode:
authorDaniel Gultsch <inputmice@siacs.eu>2015-01-07 12:20:39 +0100
committerDaniel Gultsch <inputmice@siacs.eu>2015-01-07 12:20:39 +0100
commit81e9afdf192aa925f1dc18a1b5e1d666ab153342 (patch)
treed426f7225e9a23bd0501eae731401234fef7fdd1 /src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
parent943a01b9bf8cc5c66ad094850a3f42f790cfac14 (diff)
reset next encryption when archiving conversations
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationActivity.java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationActivity.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index e71f4cbb..795dabf2 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -492,7 +492,6 @@ public class ConversationActivity extends XmppActivity
}
public void endConversation(Conversation conversation) {
- conversation.setStatus(Conversation.STATUS_ARCHIVED);
showConversationsOverview();
xmppConnectionService.archiveConversation(conversation);
if (conversationList.size() > 0) {