Don't sync secondary devices and make sure initAPIs has been called before sending friend requests to synced contacts

js/background.js

@@ -262,6 +262,7 @@
     if (storage.get('isSecondaryDevice')) {
       window.lokiFileServerAPI.updateOurDeviceMapping();
     }
+    Whisper.events.trigger('apisReady');
   };
 
   function mapOldThemeToNew(theme) {

libloki/api.js

@@ -120,7 +120,11 @@
       { ConversationCollection: Whisper.ConversationCollection }
     );
     // Extract required contacts information out of conversations
-    const rawContacts = conversations.map(conversation => {
+    const rawContacts = conversations.reduce((acc, conversation) => {
+      if (conversation.isSecondaryDevice()) {
+        // Don't bother syncing secondary devices
+        return acc;
+      }
       const profile = conversation.getLokiProfile();
       const number = conversation.getNumber();
       const name = profile
@@ -135,15 +139,15 @@
         destination: number,
         identityKey: StringView.hexToArrayBuffer(number),
       });
-      return {
+      return acc.concat({
         name,
         verified,
         number,
         nickname: conversation.getNickname(),
         blocked: conversation.isBlocked(),
         expireTimer: conversation.get('expireTimer'),
-      };
-    });
+      });
+    }, []);
     // Convert raw contacts to an array of buffers
     const contactDetails = rawContacts
       .filter(x => x.number !== textsecure.storage.user.getNumber())

libtextsecure/message_receiver.js

@@ -21,6 +21,7 @@
 /* global Whisper: false */
 /* global lokiFileServerAPI: false */
 /* global WebAPI: false */
+/* global ConversationController: false */
 
 /* eslint-disable more/no-then */
 /* eslint-disable no-unreachable */
@@ -1110,6 +1111,11 @@ MessageReceiver.prototype.extend({
         window.storage.remove('secondaryDeviceStatus');
         window.storage.put('isSecondaryDevice', true);
         window.storage.put('primaryDevicePubKey', primaryDevicePubKey);
+        const primaryConversation = await ConversationController.getOrCreateAndWait(
+          primaryDevicePubKey,
+          'private'
+        );
+        primaryConversation.trigger('change');
         Whisper.events.trigger('secondaryDeviceRegistration');
         // Update profile name
         if (dataMessage && dataMessage.profile) {
@@ -1124,7 +1130,10 @@ MessageReceiver.prototype.extend({
           // This call already removes the envelope from the cache
           await this.handleContacts(envelope, syncMessage.contacts);
           removedFromCache = true;
-          await this.sendFriendRequestsToSyncContacts(syncMessage.contacts);
+          // We need to wait here because initAPIs hasn't been called yet
+          Whisper.events.on('apisReady', async () => {
+            await this.sendFriendRequestsToSyncContacts(syncMessage.contacts);
+          });
         }
       } else {
         window.log.warn('Unimplemented pairing authorisation message type');