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-16 17:45:31 -04:00
parent 275414cbda
commit 0add39c2a8
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Pods

@ -1 +1 @@
Subproject commit 04eb1e2b2925464ac89ba15cbcc664a630450242
Subproject commit 217e71e8943e33bc683a4977ca297f431afb02c8

12
SignalMessaging/contacts/OWSSyncManager.m
View file

@ -21,8 +21,8 @@
NS_ASSUME_NONNULL_BEGIN
NSString *const kOWSPrimaryStorageOWSSyncManagerCollection = @"kTSStorageManagerOWSSyncManagerCollection";
NSString *const kOWSPrimaryStorageOWSSyncManagerLastMessageKey = @"kTSStorageManagerOWSSyncManagerLastMessageKey";
NSString *const kSyncManagerCollection = @"kTSStorageManagerOWSSyncManagerCollection";
NSString *const kSyncManagerLastContactSyncKey = @"kTSStorageManagerOWSSyncManagerLastMessageKey";
@interface OWSSyncManager ()
@ -137,8 +137,8 @@ NSString *const kOWSPrimaryStorageOWSSyncManagerLastMessageKey = @"kTSStorageMan
__block NSData *_Nullable lastMessageData;
[self.editingDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
messageData = [syncContactsMessage buildPlainTextAttachmentDataWithTransaction:transaction];
lastMessageData = [transaction objectForKey:kOWSPrimaryStorageOWSSyncManagerLastMessageKey
inCollection:kOWSPrimaryStorageOWSSyncManagerCollection];
lastMessageData = [transaction objectForKey:kSyncManagerLastContactSyncKey
inCollection:kSyncManagerCollection];
}];
if (!messageData) {
@ -161,8 +161,8 @@ NSString *const kOWSPrimaryStorageOWSSyncManagerLastMessageKey = @"kTSStorageMan
OWSLogInfo(@"Successfully sent contacts sync message.");
[self.editingDatabaseConnection setObject:messageData
forKey:kOWSPrimaryStorageOWSSyncManagerLastMessageKey
inCollection:kOWSPrimaryStorageOWSSyncManagerCollection];
forKey:kSyncManagerLastContactSyncKey
inCollection:kSyncManagerCollection];
dispatch_async(self.serialQueue, ^{
self.isRequestInFlight = NO;