oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Respond to CR.

This commit is contained in:
Matthew Chen 2018-07-19 11:31:04 -04:00
parent 3aa28aee36
commit 39c7fd9f15
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SignalMessaging/contacts/OWSContactsManager.m
View File

@ -308,10 +308,10 @@ NSString *const OWSContactsManagerKeyNextFullIntersectionDate = @"OWSContactsMan
});
return;
} else if (isFullIntersection) {
DDLogInfo(@"%@ Doing full intersection with %zd contacts.", self.logTag, recipientIdsForIntersection.count);
DDLogInfo(@"%@ Doing full intersection with %zu contacts.", self.logTag, recipientIdsForIntersection.count);
} else {
DDLogInfo(
@"%@ Doing delta intersection with %zd contacts.", self.logTag, recipientIdsForIntersection.count);
@"%@ Doing delta intersection with %zu contacts.", self.logTag, recipientIdsForIntersection.count);
}
[self intersectContacts:recipientIdsForIntersection
@ -340,9 +340,9 @@ NSString *const OWSContactsManagerKeyNextFullIntersectionDate = @"OWSContactsMan
if (isFullIntersection) {
// Don't do a full intersection more often than once every 6 hours.
const NSTimeInterval kFullIntersectionRate = 6 * kHourInterval;
NSDate *nextFullIntersectionDate =
[NSDate dateWithTimeIntervalSince1970:[NSDate new].timeIntervalSince1970 + kFullIntersectionRate];
const NSTimeInterval kMinFullIntersectionInterval = 6 * kHourInterval;
NSDate *nextFullIntersectionDate = [NSDate
dateWithTimeIntervalSince1970:[NSDate new].timeIntervalSince1970 + kMinFullIntersectionInterval];
[transaction setDate:nextFullIntersectionDate
forKey:OWSContactsManagerKeyNextFullIntersectionDate
inCollection:OWSContactsManagerCollection];

2
SignalServiceKit/src/Contacts/SignalRecipient.m
View File

@ -3,9 +3,7 @@
//
#import "SignalRecipient.h"
#import "PhoneNumber.h"
#import "TSAccountManager.h"
#import "YapDatabaseTransaction+OWS.h"
#import <YapDatabase/YapDatabaseConnection.h>
NS_ASSUME_NONNULL_BEGIN