From 41fdcef69503996b1dd1b2fa90eaf129cea23083 Mon Sep 17 00:00:00 2001
From: Beaudan Brown <beau@loki.network>
Date: Wed, 6 Nov 2019 13:16:48 +1100
Subject: [PATCH] Ensure that we can't miss the apisReady event and only listen
 for single emit

---
 js/background.js                  |  5 ++---
 libtextsecure/message_receiver.js | 10 +++++++---
 preload.js                        |  1 +
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/js/background.js b/js/background.js
index cdc72a4d8..00fda8103 100644
--- a/js/background.js
+++ b/js/background.js
@@ -233,9 +233,8 @@
     specialConvInited = true;
   };
 
-  let initialisedAPI = false;
   const initAPIs = async () => {
-    if (initialisedAPI) {
+    if (window.initialisedAPI) {
       return;
     }
     const ourKey = textsecure.storage.user.getNumber();
@@ -257,7 +256,7 @@
     });
     window.lokiP2pAPI.on('online', ConversationController._handleOnline);
     window.lokiP2pAPI.on('offline', ConversationController._handleOffline);
-    initialisedAPI = true;
+    window.initialisedAPI = true;
 
     if (storage.get('isSecondaryDevice')) {
       window.lokiFileServerAPI.updateOurDeviceMapping();
diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index 148a6ec80..20c749925 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -1130,10 +1130,14 @@ MessageReceiver.prototype.extend({
           // This call already removes the envelope from the cache
           await this.handleContacts(envelope, syncMessage.contacts);
           removedFromCache = true;
-          // We need to wait here because initAPIs hasn't been called yet
-          Whisper.events.on('apisReady', async () => {
+          if (window.initialisedAPI) {
             await this.sendFriendRequestsToSyncContacts(syncMessage.contacts);
-          });
+          } else {
+            // We need to wait here because initAPIs hasn't been called yet
+            Whisper.events.once('apisReady', async () => {
+              await this.sendFriendRequestsToSyncContacts(syncMessage.contacts);
+            });
+          }
         }
       } else {
         window.log.warn('Unimplemented pairing authorisation message type');
diff --git a/preload.js b/preload.js
index 9df58dadd..c414f02c1 100644
--- a/preload.js
+++ b/preload.js
@@ -42,6 +42,7 @@ window.JobQueue = JobQueue;
 window.getStoragePubKey = key =>
   window.isDev() ? key.substring(0, key.length - 2) : key;
 window.getDefaultFileServer = () => config.defaultFileServer;
+window.initialisedAPI = false;
 
 window.isBeforeVersion = (toCheck, baseVersion) => {
   try {