From 149da3374adb744c42d3fffd886d3e237713b71e Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Fri, 23 Nov 2018 10:59:10 +1100
Subject: [PATCH] Fix pkb not being saved on the first cipher message.

---
 libtextsecure/message_receiver.js | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index 87a650df5..28b3ad11c 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -725,19 +725,10 @@ MessageReceiver.prototype.extend({
       // We don't automatically save on a friend request because
       //  we only want to save the preKeys when we click the accept button.
       if (envelope.type !== textsecure.protobuf.Envelope.Type.FRIEND_REQUEST) {
-        try {
-          const conversation = window.ConversationController.get(envelope.source);
-
-          // Make sure we only save the preKeys if we're friends
-          if (conversation.isFriend()) {
-            await this.handlePreKeyBundleMessage(
-              envelope.source,
-              envelope.preKeyBundleMessage
-            );
-          }
-        } catch (e) {
-          window.log.info('Error saving preKeyBundleMessage from: ', envelope.source);
-        }
+        await this.handlePreKeyBundleMessage(
+          envelope.source,
+          envelope.preKeyBundleMessage
+        );
       }
     }