oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Respond to CR.

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m
View file

@ -90,13 +90,15 @@ NS_ASSUME_NONNULL_BEGIN
return [OWSPrimaryStorage.sharedManager newDatabaseConnection]; return [OWSPrimaryStorage.sharedManager newDatabaseConnection];
} }
+ (id<OWSSyncManagerProtocol>)syncManager { + (id<OWSSyncManagerProtocol>)syncManager
{
OWSAssertDebug(SSKEnvironment.shared.syncManager); OWSAssertDebug(SSKEnvironment.shared.syncManager);
return SSKEnvironment.shared.syncManager; return SSKEnvironment.shared.syncManager;
} }
+ (void)sendContactsSyncMessage { + (void)sendContactsSyncMessage
{
[self.syncManager syncAllContacts]; [self.syncManager syncAllContacts];
} }

14
SignalMessaging/contacts/OWSSyncManager.m
View file

@ -94,7 +94,8 @@ NSString *const kSyncManagerLastContactSyncKey = @"kTSStorageManagerOWSSyncManag
return SSKEnvironment.shared.profileManager; return SSKEnvironment.shared.profileManager;
} }
- (TSAccountManager *)tsAccountManager { - (TSAccountManager *)tsAccountManager
{
return TSAccountManager.sharedInstance; return TSAccountManager.sharedInstance;
} }
@ -224,7 +225,8 @@ NSString *const kSyncManagerLastContactSyncKey = @"kTSStorageManagerOWSSyncManag
#pragma mark - Local Sync #pragma mark - Local Sync
- (AnyPromise *)syncLocalContact { - (AnyPromise *)syncLocalContact
{
NSString *localNumber = self.tsAccountManager.localNumber; NSString *localNumber = self.tsAccountManager.localNumber;
SignalAccount *signalAccount = [[SignalAccount alloc] initWithRecipientId:localNumber]; SignalAccount *signalAccount = [[SignalAccount alloc] initWithRecipientId:localNumber];
signalAccount.contact = [Contact new]; signalAccount.contact = [Contact new];
@ -232,17 +234,19 @@ NSString *const kSyncManagerLastContactSyncKey = @"kTSStorageManagerOWSSyncManag
return [self syncContactsForSignalAccounts:@[ signalAccount ]]; return [self syncContactsForSignalAccounts:@[ signalAccount ]];
} }
- (AnyPromise *)syncAllContacts { - (AnyPromise *)syncAllContacts
{
return [self syncContactsForSignalAccounts:self.contactsManager.signalAccounts]; return [self syncContactsForSignalAccounts:self.contactsManager.signalAccounts];
} }
- (AnyPromise *)syncContactsForSignalAccounts:(NSArray<SignalAccount *> *)signalAccounts { - (AnyPromise *)syncContactsForSignalAccounts:(NSArray<SignalAccount *> *)signalAccounts
{
OWSSyncContactsMessage *syncContactsMessage = OWSSyncContactsMessage *syncContactsMessage =
[[OWSSyncContactsMessage alloc] initWithSignalAccounts:signalAccounts [[OWSSyncContactsMessage alloc] initWithSignalAccounts:signalAccounts
identityManager:self.identityManager identityManager:self.identityManager
profileManager:self.profileManager]; profileManager:self.profileManager];
__block DataSource *dataSource; __block DataSource *dataSource;
[self.editingDatabaseConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { [self.editingDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
dataSource = [DataSourceValue dataSource = [DataSourceValue
dataSourceWithSyncMessageData:[syncContactsMessage dataSourceWithSyncMessageData:[syncContactsMessage
buildPlainTextAttachmentDataWithTransaction:transaction]]; buildPlainTextAttachmentDataWithTransaction:transaction]];

3
SignalMessaging/profiles/OWSProfileManager.m
View file

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

3
SignalMessaging/profiles/OWSUserProfile.m
View file

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

3
SignalServiceKit/src/Messages/OWSMessageManager.m
View file

@ -138,7 +138,8 @@ NS_ASSUME_NONNULL_BEGIN
return SSKEnvironment.shared.outgoingReceiptManager; return SSKEnvironment.shared.outgoingReceiptManager;
} }
- (id<OWSSyncManagerProtocol>)syncManager { - (id<OWSSyncManagerProtocol>)syncManager
{
OWSAssertDebug(SSKEnvironment.shared.syncManager); OWSAssertDebug(SSKEnvironment.shared.syncManager);
return SSKEnvironment.shared.syncManager; return SSKEnvironment.shared.syncManager;