Merge branch 'mkirk/verification-sync'

Podfile.lock

@@ -134,7 +134,7 @@ CHECKOUT OPTIONS:
     :commit: 521686c112bbae7a762f85d52b1e41eeb1760772
     :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
   SignalServiceKit:
-    :commit: 8b04e2a880bf31533c17359657ad9ae8a4db0d3d
+    :commit: 8fda18a8e351d4b857c8c6297087b5c2590cd469
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf

Signal/src/AppDelegate.m

@@ -181,6 +181,7 @@ static NSString *const kURLHostVerifyPrefix             = @"verify";
             }];
 
     self.contactsSyncing = [[OWSContactsSyncing alloc] initWithContactsManager:[Environment getCurrent].contactsManager
+                                                               identityManager:[OWSIdentityManager sharedManager]
                                                                  messageSender:[Environment getCurrent].messageSender];
 
     [[NSNotificationCenter defaultCenter] addObserver:self

Signal/src/ViewControllers/FingerprintViewController.m

@@ -515,11 +515,13 @@ typedef void (^CustomLayoutBlock)();
     if (gestureRecognizer.state == UIGestureRecognizerStateRecognized) {
         BOOL isVerified = [[OWSIdentityManager sharedManager] verificationStateForRecipientId:self.recipientId]
             == OWSVerificationStateVerified;
-        [[OWSIdentityManager sharedManager]
+
-             setVerificationState:(isVerified ? OWSVerificationStateDefault : OWSVerificationStateVerified)identityKey
+        OWSVerificationState newVerificationState
-                                 :self.identityKey
+            = (isVerified ? OWSVerificationStateDefault : OWSVerificationStateVerified);
-                      recipientId:self.recipientId
+        [[OWSIdentityManager sharedManager] setVerificationState:newVerificationState
-            isUserInitiatedChange:YES];
+                                                     identityKey:self.identityKey
+                                                     recipientId:self.recipientId
+                                           isUserInitiatedChange:YES];
 
         [self dismissViewControllerAnimated:YES completion:nil];
     }

Signal/src/util/OWSContactsSyncing.h

@@ -8,10 +8,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 @class OWSContactsManager;
 @class OWSMessageSender;
+@class OWSIdentityManager;
 
 @interface OWSContactsSyncing : NSObject
 
 - (instancetype)initWithContactsManager:(OWSContactsManager *)contactsManager
+                        identityManager:(OWSIdentityManager *)identityManager
                           messageSender:(OWSMessageSender *)messageSender;
 
 @end

Signal/src/util/OWSContactsSyncing.m

@@ -22,7 +22,9 @@ NSString *const kTSStorageManagerOWSContactsSyncingLastMessageKey =
 @property (nonatomic, readonly) dispatch_queue_t serialQueue;
 
 @property (nonatomic, readonly) OWSContactsManager *contactsManager;
+@property (nonatomic, readonly) OWSIdentityManager *identityManager;
 @property (nonatomic, readonly) OWSMessageSender *messageSender;
+
 @property (nonatomic) BOOL isRequestInFlight;
 
 @end
@@ -30,6 +32,7 @@ NSString *const kTSStorageManagerOWSContactsSyncingLastMessageKey =
 @implementation OWSContactsSyncing
 
 - (instancetype)initWithContactsManager:(OWSContactsManager *)contactsManager
+                        identityManager:(OWSIdentityManager *)identityManager
                           messageSender:(OWSMessageSender *)messageSender
 {
     self = [super init];
@@ -40,8 +43,10 @@ NSString *const kTSStorageManagerOWSContactsSyncingLastMessageKey =
 
     OWSAssert(contactsManager);
     OWSAssert(messageSender);
+    OWSAssert(identityManager);
 
     _contactsManager = contactsManager;
+    _identityManager = identityManager;
     _messageSender = messageSender;
 
     OWSSingletonAssert();
@@ -85,8 +90,8 @@ NSString *const kTSStorageManagerOWSContactsSyncingLastMessageKey =
             return;
         }
 
-        OWSSyncContactsMessage *syncContactsMessage =
+        OWSSyncContactsMessage *syncContactsMessage = [[OWSSyncContactsMessage alloc] initWithContactsManager:self.contactsManager
-            [[OWSSyncContactsMessage alloc] initWithContactsManager:self.contactsManager];
+                                                                                              identityManager:self.identityManager];
 
         NSData *messageData = [syncContactsMessage buildPlainTextAttachmentData];