Take into account multi device when counting duplicates

SignalServiceKit/src/Messages/OWSMessageManager.m

@@ -404,10 +404,21 @@ NS_ASSUME_NONNULL_BEGIN
         return;
     }
 
-    BOOL duplicateEnvelope = [self.incomingMessageFinder existsMessageWithTimestamp:envelope.timestamp
+    OWSPrimaryStorage *storage = OWSPrimaryStorage.sharedManager;
-                                                                           sourceId:envelope.source
+    __block NSSet<NSString *> *linkedDeviceHexEncodedPublicKeys;
-                                                                     sourceDeviceId:envelope.sourceDevice
+    [storage.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
-                                                                        transaction: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),