Skip redundant sync messages.

SignalServiceKit/src/Devices/OWSDevice.h

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
 #import "TSYapDatabaseObject.h"
@@ -17,6 +17,7 @@ extern uint32_t const OWSDevicePrimaryDeviceId;
 
 - (BOOL)mayHaveLinkedDevices:(YapDatabaseConnection *)dbConnection;
 - (void)setMayHaveLinkedDevices:(BOOL)value dbConnection:(YapDatabaseConnection *)dbConnection;
+- (void)setMayHaveLinkedDevices:(BOOL)value transaction:(YapDatabaseReadWriteTransaction *)transaction;
 
 - (BOOL)hasReceivedSyncMessageInLastSeconds:(NSTimeInterval)intervalSeconds;
 - (void)setHasReceivedSyncMessage;

SignalServiceKit/src/Devices/OWSDevice.m

@@ -19,7 +19,6 @@ NSString *const kTSStorageManager_MayHaveLinkedDevices = @"kTSStorageManager_May
 
 @interface OWSDeviceManager ()
 
-@property (atomic, nullable) NSNumber *mayHaveLinkedDevicesCached;
 @property (atomic) NSDate *lastReceivedSyncMessage;
 
 @end
@@ -49,13 +48,9 @@ NSString *const kTSStorageManager_MayHaveLinkedDevices = @"kTSStorageManager_May
 
     @synchronized(self)
     {
-        if (!self.mayHaveLinkedDevicesCached) {
+        return [dbConnection boolForKey:kTSStorageManager_MayHaveLinkedDevices
-            self.mayHaveLinkedDevicesCached = @([dbConnection boolForKey:kTSStorageManager_MayHaveLinkedDevices
+                           inCollection:kTSStorageManager_OWSDeviceCollection
-                                                            inCollection:kTSStorageManager_OWSDeviceCollection
+                           defaultValue:NO];
-                                                            defaultValue:NO]);
-        }
-
-        return [self.mayHaveLinkedDevicesCached boolValue];
     }
 }
 
@@ -63,15 +58,20 @@ NSString *const kTSStorageManager_MayHaveLinkedDevices = @"kTSStorageManager_May
 {
     OWSAssert(dbConnection);
 
+    [dbConnection asyncReadWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
+        [self setMayHaveLinkedDevices:value transaction:transaction];
+    }];
+}
+
+- (void)setMayHaveLinkedDevices:(BOOL)value transaction:(YapDatabaseReadWriteTransaction *)transaction
+{
+    OWSAssert(transaction);
+
     @synchronized(self)
     {
-        self.mayHaveLinkedDevicesCached = @(value);
+        [transaction setObject:@(value)
-
+                        forKey:kTSStorageManager_MayHaveLinkedDevices
-        [dbConnection asyncReadWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
+                  inCollection:kTSStorageManager_OWSDeviceCollection];
-            [transaction setObject:@(value)
-                            forKey:kTSStorageManager_MayHaveLinkedDevices
-                      inCollection:kTSStorageManager_OWSDeviceCollection];
-        }];
     }
 }
 

SignalServiceKit/src/Messages/OWSMessageManager.m

@@ -278,6 +278,7 @@ NS_ASSUME_NONNULL_BEGIN
             [self handleIncomingEnvelope:envelope withSyncMessage:content.syncMessage transaction:transaction];
 
             [[OWSDeviceManager sharedManager] setHasReceivedSyncMessage];
+            [OWSDeviceManager.sharedManager setMayHaveLinkedDevices:YES transaction:transaction];
         } else if (content.hasDataMessage) {
             [self handleIncomingEnvelope:envelope withDataMessage:content.dataMessage transaction:transaction];
         } else if (content.hasCallMessage) {