Handle sync messages properly for some edge cases, ensure we always have a primaryDevicePubKey, send contact sync message

js/models/conversations.js

@@ -192,7 +192,10 @@
     },
 
     isMe() {
-      return this.id === this.ourNumber;
+      return (
+        this.id === this.ourNumber ||
+        this.id === window.storage.get('primaryDevicePubKey')
+      );
     },
     isPublic() {
       return this.id && this.id.match(/^publicChat:/);

js/models/messages.js

@@ -1261,7 +1261,9 @@
           });
 
           this.trigger('sent', this);
-          this.sendSyncMessage();
+          if (this.get('type') !== 'friend-request') {
+            this.sendSyncMessage();
+          }
         })
         .catch(result => {
           this.trigger('done');
@@ -1702,6 +1704,7 @@
       //   2. on a sent message sync'd from another device
       //   3. in rare cases, an incoming message can be retried, though it will
       //      still go through one of the previous two codepaths
+      const ourNumber = textsecure.storage.user.getNumber();
       const message = this;
       const source = message.get('source');
       const type = message.get('type');
@@ -1711,7 +1714,8 @@
       );
       if (initialMessage.group) {
         conversationId = initialMessage.group.id;
-      } else if (authorisation) {
+      } else if (source !== ourNumber && authorisation) {
+        // Ignore auth from our devices
         conversationId = authorisation.primaryDevicePubKey;
       }
 
@@ -1908,8 +1912,6 @@
                 c.onReadMessage(message);
               }
             } else {
-              const ourNumber = textsecure.storage.user.getNumber();
-
               if (
                 message.attributes.body &&
                 message.attributes.body.indexOf(`@${ourNumber}`) !== -1
@@ -1999,12 +2001,12 @@
               autoAccept = true;
               message.set({ friendStatus: 'accepted' });
               await sendingDeviceConversation.onFriendRequestAccepted();
-              window.libloki.api.sendBackgroundMessage(message.get('source'));
             } else {
               await sendingDeviceConversation.onFriendRequestReceived();
             }
-          } else {
-            await conversation.onFriendRequestAccepted();
+          } else if (message.get('type') !== 'outgoing') {
+            // Ignore 'outgoing' messages because they are sync messages
+            await sendingDeviceConversation.onFriendRequestAccepted();
             // We need to return for these types of messages because android struggles
             if (
               !message.get('body') &&

libloki/api.js

@@ -164,13 +164,21 @@
     const pairingAuthorisation = createPairingAuthorisationProtoMessage(
       authorisation
     );
-    // Send profile name to secondary device
     const ourNumber = textsecure.storage.user.getNumber();
-    const conversation = await ConversationController.getOrCreateAndWait(
+    const ourConversation = await ConversationController.getOrCreateAndWait(
       ourNumber,
       'private'
     );
-    const lokiProfile = conversation.getLokiProfile();
+    const secondaryConversation = await ConversationController.getOrCreateAndWait(
+      recipientPubKey,
+      'private'
+    );
+    // Always be friends with secondary devices
+    secondaryConversation.setFriendRequestStatus(
+      window.friends.friendRequestStatusEnum.friends
+    );
+    // Send profile name to secondary device
+    const lokiProfile = ourConversation.getLokiProfile();
     const profile = new textsecure.protobuf.DataMessage.LokiProfile(
       lokiProfile
     );
@@ -178,12 +186,11 @@
       profile,
     });
     // Attach contact list
-    // TODO: Reenable sending of the syncmessage for pairing requests
-    // const syncMessage = await createContactSyncProtoMessage();
+    const syncMessage = await createContactSyncProtoMessage();
     const content = new textsecure.protobuf.Content({
       pairingAuthorisation,
       dataMessage,
-      // syncMessage,
+      syncMessage,
     });
     // Send
     const options = { messageType: 'pairing-request' };

libloki/storage.js

@@ -239,6 +239,7 @@
     getAuthorisationForSecondaryPubKey,
     getAllDevicePubKeysForPrimaryPubKey,
     getSecondaryDevicesFor,
+    getPrimaryDeviceMapping,
   };
 
   // Libloki protocol store

libtextsecure/account_manager.js

@@ -546,6 +546,10 @@
     async registrationDone(number, displayName) {
       window.log.info('registration done');
 
+      if (!textsecure.storage.get('secondaryDeviceStatus')) {
+        // We have registered as a primary device
+        textsecure.storage.put('primaryDevicePubKey', number);
+      }
       // Ensure that we always have a conversation for ourself
       const conversation = await ConversationController.getOrCreateAndWait(
         number,