From d57cbf2acda9c331258ae4ed61c4843a4c17bb13 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 18 Aug 2018 13:36:43 +0200 Subject: [PATCH 1/3] main thread operation init which creates background task // FREEBIE --- SignalServiceKit/src/Contacts/ContactsUpdater.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SignalServiceKit/src/Contacts/ContactsUpdater.m b/SignalServiceKit/src/Contacts/ContactsUpdater.m index 5e638e94e..82fa20fb5 100644 --- a/SignalServiceKit/src/Contacts/ContactsUpdater.m +++ b/SignalServiceKit/src/Contacts/ContactsUpdater.m @@ -81,10 +81,10 @@ NS_ASSUME_NONNULL_BEGIN success:(void (^)(NSSet *recipients))success failure:(void (^)(NSError *error))failure { - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ - OWSLegacyContactDiscoveryOperation *operation = - [[OWSLegacyContactDiscoveryOperation alloc] initWithRecipientIdsToLookup:recipientIdsToLookup.allObjects]; + OWSLegacyContactDiscoveryOperation *operation = + [[OWSLegacyContactDiscoveryOperation alloc] initWithRecipientIdsToLookup:recipientIdsToLookup.allObjects]; + dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ NSArray *operationAndDependencies = [operation.dependencies arrayByAddingObject:operation]; [self.contactIntersectionQueue addOperations:operationAndDependencies waitUntilFinished:YES]; From 191b0232bed855a3ab84ecd6f2220378c2938f3f Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 18 Aug 2018 13:37:25 +0200 Subject: [PATCH 2/3] SAE uses statusBarHeight via OWSNavigationController via OWSNavbar // FREEBIE --- SignalShareExtension/utils/ShareAppExtensionContext.m | 1 - 1 file changed, 1 deletion(-) diff --git a/SignalShareExtension/utils/ShareAppExtensionContext.m b/SignalShareExtension/utils/ShareAppExtensionContext.m index 6e58f2042..7dd97e76b 100644 --- a/SignalShareExtension/utils/ShareAppExtensionContext.m +++ b/SignalShareExtension/utils/ShareAppExtensionContext.m @@ -145,7 +145,6 @@ NS_ASSUME_NONNULL_BEGIN - (CGFloat)statusBarHeight { - OWSFail(@"%@ in %s unexpected for share extension", self.logTag, __PRETTY_FUNCTION__); return 20; } From c1df969a22c7b176ce65ffc03fb37702d4653dc4 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 18 Aug 2018 19:04:40 +0200 Subject: [PATCH 3/3] remove overzealous assert // FREEBIE --- Signal/src/util/AppUpdateNag.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/src/util/AppUpdateNag.swift b/Signal/src/util/AppUpdateNag.swift index 63152d418..2d1e0de1b 100644 --- a/Signal/src/util/AppUpdateNag.swift +++ b/Signal/src/util/AppUpdateNag.swift @@ -205,7 +205,7 @@ class AppStoreVersionService: NSObject { let task = URLSession.ephemeral.dataTask(with: lookupURL) { (data, _, error) in guard let data = data else { - owsFail("\(self.logTag) in \(#function) data was unexpectedly nil") + Logger.warn("\(self.logTag) in \(#function) data was unexpectedly nil") reject(OWSErrorMakeUnableToProcessServerResponseError()) return } @@ -214,7 +214,7 @@ class AppStoreVersionService: NSObject { let decoder = JSONDecoder() let resultSet = try decoder.decode(AppStoreLookupResultSet.self, from: data) guard let appStoreRecord = resultSet.results.first else { - owsFail("\(self.logTag) in \(#function) record was unexpectedly nil") + Logger.warn("\(self.logTag) in \(#function) record was unexpectedly nil") reject(OWSErrorMakeUnableToProcessServerResponseError()) return }