Merge branch 'mkirk/overzealous-assert'

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
                 }

SignalServiceKit/src/Contacts/ContactsUpdater.m

@@ -81,10 +81,10 @@ NS_ASSUME_NONNULL_BEGIN
                            success:(void (^)(NSSet<SignalRecipient *> *recipients))success
                            failure:(void (^)(NSError *error))failure
 {
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+    OWSLegacyContactDiscoveryOperation *operation =
-        OWSLegacyContactDiscoveryOperation *operation =
+        [[OWSLegacyContactDiscoveryOperation alloc] initWithRecipientIdsToLookup:recipientIdsToLookup.allObjects];
-            [[OWSLegacyContactDiscoveryOperation alloc] initWithRecipientIdsToLookup:recipientIdsToLookup.allObjects];
 
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         NSArray<NSOperation *> *operationAndDependencies = [operation.dependencies arrayByAddingObject:operation];
         [self.contactIntersectionQueue addOperations:operationAndDependencies waitUntilFinished:YES];
 

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;
 }