Merge pull request #181 from loki-project/multi-device-session-reset

Multi Device Friend Request Bug Fixes

SignalServiceKit/src/Messages/OWSMessageManager.m

@@ -404,10 +404,21 @@ NS_ASSUME_NONNULL_BEGIN
         return;
     }
 
-    BOOL duplicateEnvelope = [self.incomingMessageFinder existsMessageWithTimestamp:envelope.timestamp
-                                                                           sourceId:envelope.source
-                                                                     sourceDeviceId:envelope.sourceDevice
-                                                                        transaction:transaction];
+    OWSPrimaryStorage *storage = OWSPrimaryStorage.sharedManager;
+    __block NSSet<NSString *> *linkedDeviceHexEncodedPublicKeys;
+    [storage.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
+        linkedDeviceHexEncodedPublicKeys = [LKDatabaseUtilities getLinkedDeviceHexEncodedPublicKeysFor:envelope.source in:transaction];
+    }];
+
+    BOOL duplicateEnvelope = NO;
+    for (NSString *hexEncodedPublicKey in linkedDeviceHexEncodedPublicKeys) {
+        duplicateEnvelope = duplicateEnvelope
+            || [self.incomingMessageFinder existsMessageWithTimestamp:envelope.timestamp
+                                                             sourceId:hexEncodedPublicKey
+                                                       sourceDeviceId:envelope.sourceDevice
+                                                          transaction:transaction];
+    }
+
     if (duplicateEnvelope) {
         OWSLogInfo(@"Ignoring previously received envelope from: %@ with timestamp: %llu.",
             envelopeAddress(envelope),

SignalServiceKit/src/Messages/OWSMessageSender.m

@@ -1185,7 +1185,11 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
                 [message saveIsCalculatingProofOfWork:YES withTransaction:transaction];
                 // Update the message and thread if needed
                 if (signalMessage.isFriendRequest) {
-                    [message.thread saveFriendRequestStatus:LKThreadFriendRequestStatusRequestSending withTransaction:transaction];
+                    __block TSContactThread *thread;
+                    [OWSPrimaryStorage.sharedManager.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
+                        thread = [TSContactThread getThreadWithContactId:recipientID transaction:transaction]; // Take into account multi device
+                    }];
+                    [thread saveFriendRequestStatus:LKThreadFriendRequestStatusRequestSending withTransaction:transaction];
                     [message saveFriendRequestStatus:LKMessageFriendRequestStatusSendingOrFailed withTransaction:transaction];
                 }
             }];
@@ -1197,7 +1201,11 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
                 [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
                     // Update the message and thread if needed
                     if (signalMessage.isFriendRequest) {
-                        [message.thread saveFriendRequestStatus:LKThreadFriendRequestStatusNone withTransaction:transaction];
+                        __block TSContactThread *thread;
+                        [OWSPrimaryStorage.sharedManager.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
+                            thread = [TSContactThread getThreadWithContactId:recipientID transaction:transaction]; // Take into account multi device
+                        }];
+                        [thread saveFriendRequestStatus:LKThreadFriendRequestStatusNone withTransaction:transaction];
                         [message saveFriendRequestStatus:LKMessageFriendRequestStatusSendingOrFailed withTransaction:transaction];
                     }
                     // Update the PoW calculation status
@@ -1224,7 +1232,11 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
                         if (!message.skipSave) {
                             [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
                                 // Update the thread
-                                [message.thread saveFriendRequestStatus:LKThreadFriendRequestStatusRequestSent withTransaction:transaction];
+                                __block TSContactThread *thread;
+                                [OWSPrimaryStorage.sharedManager.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
+                                    thread = [TSContactThread getThreadWithContactId:recipientID transaction:transaction]; // Take into account multi device
+                                }];
+                                [thread saveFriendRequestStatus:LKThreadFriendRequestStatusRequestSent withTransaction:transaction];
                                 [message.thread removeOldOutgoingFriendRequestMessagesIfNeededWithTransaction:transaction];
                                 if ([message.thread isKindOfClass:[TSContactThread class]]) {
                                     [((TSContactThread *) message.thread) removeAllSessionRestoreDevicesWithTransaction:transaction];