From 94b95367f1913af9c27320c33be13ddd3d9cb5d6 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael.code@endoftheworl.de>
Date: Thu, 27 Apr 2017 16:18:11 -0400
Subject: [PATCH] Actually *use* the delay time to enqueu the retry
Also, use a consistent type (double) rather than a mishmash of float and
CGFloat.
// FREEBIE
---
Signal/src/contact/OWSContactsManager.m | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/Signal/src/contact/OWSContactsManager.m b/Signal/src/contact/OWSContactsManager.m
index b5bcb29ef..23c9a45d7 100644
--- a/Signal/src/contact/OWSContactsManager.m
+++ b/Signal/src/contact/OWSContactsManager.m
@@ -175,10 +175,10 @@ void onAddressBookChanged(ABAddressBookRef notifyAddressBook, CFDictionaryRef in
- (void)intersectContacts
{
- [self intersectContactsWithRetryDelay:1.f];
+ [self intersectContactsWithRetryDelay:1];
}
-- (void)intersectContactsWithRetryDelay:(CGFloat)retryDelaySeconds
+- (void)intersectContactsWithRetryDelay:(double)retryDelaySeconds
{
void (^success)() = ^{
DDLogInfo(@"%@ Successfully intersected contacts.", self.tag);
@@ -196,9 +196,10 @@ void onAddressBookChanged(ABAddressBookRef notifyAddressBook, CFDictionaryRef in
// Retry with exponential backoff.
//
// TODO: Abort if another contact intersection succeeds in the meantime.
- dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
- [self intersectContactsWithRetryDelay:retryDelaySeconds * 2.f];
- });
+ dispatch_after(
+ dispatch_time(DISPATCH_TIME_NOW, (int64_t)(retryDelaySeconds * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+ [self intersectContactsWithRetryDelay:retryDelaySeconds * 2];
+ });
};
[[ContactsUpdater sharedUpdater] updateSignalContactIntersectionWithABContacts:self.allContacts
success:success