diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-09-24 21:29:00 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-09-26 21:53:06 +0200 |
| commit | d90f4556868d95e041a06d31107ae87295ab7a57 (patch) | |
| tree | 330aefe40bef329f4d6c580398d83ac06ae6745e /src/main/java/de/pixart | |
| parent | 564acef3dc2f1fe74c164563889b20b9943322a5 (diff) | |
don't reset encryption choice to auto on archiving
Diffstat (limited to 'src/main/java/de/pixart')
| -rw-r--r-- | src/main/java/de/pixart/messenger/services/XmppConnectionService.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java index 16ebd8c11..1083f5965 100644 --- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java +++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java @@ -1630,7 +1630,6 @@ public class XmppConnectionService extends Service { conversation.setMode(Conversation.MODE_SINGLE); conversation.setContactJid(jid.toBareJid()); } - conversation.setNextEncryption(-1); conversation.addAll(0, databaseBackend.getMessages(conversation, Config.PAGE_SIZE)); this.databaseBackend.updateConversation(conversation); } else { @@ -1671,7 +1670,6 @@ public class XmppConnectionService extends Service { public void archiveConversation(Conversation conversation) { getNotificationService().clear(conversation); conversation.setStatus(Conversation.STATUS_ARCHIVED); - conversation.setNextEncryption(-1); synchronized (this.conversations) { if (conversation.getMode() == Conversation.MODE_MULTI) { if (conversation.getAccount().getStatus() == Account.State.ONLINE) { |