From 38182efe01a625c8b4fbaef8d7f91550b3639493 Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Mon, 17 Feb 2020 15:31:35 +1100
Subject: [PATCH] Fix check to see if we have keys or not.

The previous check was also forcing the keys to be processed, which we don't want.
---
 libtextsecure/sendmessage.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/libtextsecure/sendmessage.js b/libtextsecure/sendmessage.js
index 191379418..57ebb6a6a 100644
--- a/libtextsecure/sendmessage.js
+++ b/libtextsecure/sendmessage.js
@@ -411,6 +411,19 @@ MessageSender.prototype = {
 
     const ourNumber = textsecure.storage.user.getNumber();
 
+    // Check wether we have the keys to start a session with the user
+    const hasKeys = async number => {
+      try {
+        const [preKey, signedPreKey] = await Promise.all([
+          textsecure.storage.protocol.loadContactPreKey(number),
+          textsecure.storage.protocol.loadContactSignedPreKey(number),
+        ]);
+        return preKey !== undefined && signedPreKey !== undefined;
+      } catch (e) {
+        return false;
+      }
+    };
+
     // Note: Since we're just doing independant tasks,
     // using `async` in the `forEach` loop should be fine.
     // If however we want to use the results from forEach then
@@ -428,7 +441,7 @@ MessageSender.prototype = {
       // If we don't have a session but we already have prekeys to
       // start communication then we should use them
       if (!haveSession && !options.isPublic) {
-        keysFound = await outgoing.getKeysForNumber(number, []);
+        keysFound = await hasKeys(number);
       }
 
       if (