Respond to CR.

This commit is contained in:
Matthew Chen 2018-10-18 16:58:02 -04:00
parent 5809d026d9
commit 99d0495ec7
5 changed files with 19 additions and 10 deletions

View File

@ -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];
}

View File

@ -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]];

View File

@ -150,7 +150,8 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error);
return SSKEnvironment.shared.blockingManager;
}
- (id<OWSSyncManagerProtocol>)syncManager {
- (id<OWSSyncManagerProtocol>)syncManager
{
return SSKEnvironment.shared.syncManager;
}

View File

@ -100,7 +100,8 @@ NSString *const kLocalProfileUniqueId = @"kLocalProfileUniqueId";
#pragma mark - Dependencies
- (id<OWSSyncManagerProtocol>)syncManager {
- (id<OWSSyncManagerProtocol>)syncManager
{
return SSKEnvironment.shared.syncManager;
}

View File

@ -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;