From 962c9476059fac3f3fc0b0ead19d692463831ce9 Mon Sep 17 00:00:00 2001
From: sachaaaaa <sacha@loki.network>
Date: Mon, 3 Dec 2018 17:43:32 +1100
Subject: [PATCH] Prevent "secure session reset succeeded" message from being
 cleaned up at startup

---
 js/background.js           | 4 ++++
 js/models/conversations.js | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/js/background.js b/js/background.js
index ebc613361..dc94d55ba 100644
--- a/js/background.js
+++ b/js/background.js
@@ -347,6 +347,10 @@
           return;
         }
 
+        if (message.isEndSession()) {
+          return;
+        }
+
         if (message.hasErrors()) {
           return;
         }
diff --git a/js/models/conversations.js b/js/models/conversations.js
index b1acd41eb..8b5c7540b 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -1494,7 +1494,7 @@
         // Only create a new message if *we* initiated the session reset.
         // On the receiver side, the actual message containing the END_SESSION flag
         // will ensure the "session reset" message will be added to their conversation.
-        if (this.get('sessionResetStatus') === SessionResetEnum.none) {
+        if (this.get('sessionResetStatus') !== SessionResetEnum.request_received) {
           await this.onSessionResetInitiated();
           const message = await this.createAndStoreEndSessionMessage('ongoing');
           const options = this.getSendOptions();