From 99d0495ec771b71d1a18877288fcf1c5bdc1648e Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Thu, 18 Oct 2018 16:58:02 -0400
Subject: [PATCH] Respond to CR.

---
 .../ViewControllers/DebugUI/DebugUISyncMessages.m  |  6 ++++--
 SignalMessaging/contacts/OWSSyncManager.m          | 14 +++++++++-----
 SignalMessaging/profiles/OWSProfileManager.m       |  3 ++-
 SignalMessaging/profiles/OWSUserProfile.m          |  3 ++-
 SignalServiceKit/src/Messages/OWSMessageManager.m  |  3 ++-
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m
index 8a897c14b..44ce3db83 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m
@@ -90,13 +90,15 @@ NS_ASSUME_NONNULL_BEGIN
     return [OWSPrimaryStorage.sharedManager newDatabaseConnection];
 }
 
-+ (id<OWSSyncManagerProtocol>)syncManager {
++ (id<OWSSyncManagerProtocol>)syncManager
+{
     OWSAssertDebug(SSKEnvironment.shared.syncManager);
 
     return SSKEnvironment.shared.syncManager;
 }
 
-+ (void)sendContactsSyncMessage {
++ (void)sendContactsSyncMessage
+{
     [self.syncManager syncAllContacts];
 }
 
diff --git a/SignalMessaging/contacts/OWSSyncManager.m b/SignalMessaging/contacts/OWSSyncManager.m
index 725932b35..57e6a27c3 100644
--- a/SignalMessaging/contacts/OWSSyncManager.m
+++ b/SignalMessaging/contacts/OWSSyncManager.m
@@ -94,7 +94,8 @@ NSString *const kSyncManagerLastContactSyncKey = @"kTSStorageManagerOWSSyncManag
     return SSKEnvironment.shared.profileManager;
 }
 
-- (TSAccountManager *)tsAccountManager {
+- (TSAccountManager *)tsAccountManager
+{
     return TSAccountManager.sharedInstance;
 }
 
@@ -224,7 +225,8 @@ NSString *const kSyncManagerLastContactSyncKey = @"kTSStorageManagerOWSSyncManag
 
 #pragma mark - Local Sync
 
-- (AnyPromise *)syncLocalContact {
+- (AnyPromise *)syncLocalContact
+{
     NSString *localNumber = self.tsAccountManager.localNumber;
     SignalAccount *signalAccount = [[SignalAccount alloc] initWithRecipientId:localNumber];
     signalAccount.contact = [Contact new];
@@ -232,17 +234,19 @@ NSString *const kSyncManagerLastContactSyncKey = @"kTSStorageManagerOWSSyncManag
     return [self syncContactsForSignalAccounts:@[ signalAccount ]];
 }
 
-- (AnyPromise *)syncAllContacts {
+- (AnyPromise *)syncAllContacts
+{
     return [self syncContactsForSignalAccounts:self.contactsManager.signalAccounts];
 }
 
-- (AnyPromise *)syncContactsForSignalAccounts:(NSArray<SignalAccount *> *)signalAccounts {
+- (AnyPromise *)syncContactsForSignalAccounts:(NSArray<SignalAccount *> *)signalAccounts
+{
     OWSSyncContactsMessage *syncContactsMessage =
         [[OWSSyncContactsMessage alloc] initWithSignalAccounts:signalAccounts
                                                identityManager:self.identityManager
                                                 profileManager:self.profileManager];
     __block DataSource *dataSource;
-    [self.editingDatabaseConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+    [self.editingDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
         dataSource = [DataSourceValue
             dataSourceWithSyncMessageData:[syncContactsMessage
                                               buildPlainTextAttachmentDataWithTransaction:transaction]];
diff --git a/SignalMessaging/profiles/OWSProfileManager.m b/SignalMessaging/profiles/OWSProfileManager.m
index bdb7b148e..befff39e7 100644
--- a/SignalMessaging/profiles/OWSProfileManager.m
+++ b/SignalMessaging/profiles/OWSProfileManager.m
@@ -150,7 +150,8 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error);
     return SSKEnvironment.shared.blockingManager;
 }
 
-- (id<OWSSyncManagerProtocol>)syncManager {
+- (id<OWSSyncManagerProtocol>)syncManager
+{
     return SSKEnvironment.shared.syncManager;
 }
 
diff --git a/SignalMessaging/profiles/OWSUserProfile.m b/SignalMessaging/profiles/OWSUserProfile.m
index db7e82799..0a2ff90af 100644
--- a/SignalMessaging/profiles/OWSUserProfile.m
+++ b/SignalMessaging/profiles/OWSUserProfile.m
@@ -100,7 +100,8 @@ NSString *const kLocalProfileUniqueId = @"kLocalProfileUniqueId";
 
 #pragma mark - Dependencies
 
-- (id<OWSSyncManagerProtocol>)syncManager {
+- (id<OWSSyncManagerProtocol>)syncManager
+{
     return SSKEnvironment.shared.syncManager;
 }
 
diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m
index b511e98d4..97230fe21 100644
--- a/SignalServiceKit/src/Messages/OWSMessageManager.m
+++ b/SignalServiceKit/src/Messages/OWSMessageManager.m
@@ -138,7 +138,8 @@ NS_ASSUME_NONNULL_BEGIN
     return SSKEnvironment.shared.outgoingReceiptManager;
 }
 
-- (id<OWSSyncManagerProtocol>)syncManager {
+- (id<OWSSyncManagerProtocol>)syncManager
+{
     OWSAssertDebug(SSKEnvironment.shared.syncManager);
 
     return SSKEnvironment.shared.syncManager;