DEVEX-850 iOS 12 Background Networking Change (#881)

* Added new network error check and updated queue handling for continueUserActivity.
* Update unit test timing.

Author: E-B-Smith

Branch-SDK-Tests/BNCServerRequestQueueTests.m

@@ -154,7 +154,7 @@ - (void)testCloseRequestsArentPersisted {
                 archivedDataWithRootObject:[OCMArg checkWithBlock:^BOOL(NSArray *reqs) {
                     if ([reqs isKindOfClass:[NSArray class]]) {
                         XCTAssert(reqs.count == 0);
-                        BNCAfterSecondsPerformBlockOnMainThread(0.01, ^{
+                        BNCAfterSecondsPerformBlockOnMainThread(0.100, ^{
                             [self safelyFulfillExpectation:expectation];
                         });
                         return YES;
@@ -170,7 +170,7 @@ - (void)testCloseRequestsArentPersisted {
         // Wait for operation to occur    
         [self awaitExpectations];
         [archiverMock verify];
-        BNCSleepForTimeInterval(0.001); // Allow for mock class to be un-mocked.
+        BNCSleepForTimeInterval(0.500); // Allow for mock class to be un-mocked.
     }
 }
 
@@ -184,7 +184,7 @@ - (void)testDebugRequestsArentPersisted {
                 archivedDataWithRootObject:[OCMArg checkWithBlock:^BOOL(NSArray *reqs) {
                     if ([reqs isKindOfClass:[NSArray class]]) {
                         XCTAssert(reqs.count == 0);
-                        BNCAfterSecondsPerformBlockOnMainThread(0.01, ^{
+                        BNCAfterSecondsPerformBlockOnMainThread(0.100, ^{
                             [self safelyFulfillExpectation:expectation];
                         });
                         return YES;
@@ -198,7 +198,7 @@ - (void)testDebugRequestsArentPersisted {
         // Wait for operation to occur    
         [self awaitExpectations];
         [archiverMock verify];
-        BNCSleepForTimeInterval(0.001); // Allow for mock class to be un-mocked.
+        BNCSleepForTimeInterval(0.500); // Allow for mock class to be un-mocked.
     }
 }
 

Branch-SDK/Branch-SDK/Branch.m

@@ -848,14 +848,9 @@ - (BOOL)continueUserActivity:(NSUserActivity *)userActivity {
 
     // Check to see if a browser activity needs to be handled
     if ([userActivity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb]) {
-
         // If we're already in-progress cancel the last open and do this one.
-        BOOL isNewSession = NO;
-        if (![self removeInstallOrOpen]) {
-            isNewSession = YES;
-        }
-
-        return [self handleDeepLink:userActivity.webpageURL fromSelf:isNewSession];
+        [self removeInstallOrOpen];
+        return [self handleDeepLink:userActivity.webpageURL fromSelf:YES];
     }
 
     // Check to see if a spotlight activity needs to be handled

Branch-SDK/Branch-SDK/Networking/BNCServerInterface.m

@@ -551,7 +551,11 @@ - (void)genericHTTPRequest:(NSURLRequest *)request
             // indicating various parts of the HTTP post failed.
             // We should retry in those conditions in addition to the case where the server returns a 500
 
-            BOOL isRetryableStatusCode = status >= 500 || status < 0;
+            // Status 53 means the request was killed by the OS because we're still in the background.
+            // This started happening in iOS 12 / Xcode 10 production when we're called from continueUserActivity:
+            // but we're not fully out of the background yet.
+
+            BOOL isRetryableStatusCode = status >= 500 || status < 0 || status == 53;
 
             // Retry the request if appropriate
             if (retryNumber < self.preferenceHelper.retryCount && isRetryableStatusCode) {

Examples/UITestBed/UITestBed/TBAppDelegate.m

@@ -127,6 +127,7 @@ - (BOOL)application:(UIApplication *)application
            userActivity.webpageURL.absoluteString);
     // Required. Returns YES if Branch Universal Link, else returns NO.
     // Add `branch_universal_link_domains` to .plist (String or Array) for custom domain(s).
+    [[Branch getInstance] userCompletedAction:@"Open Universal Link"];
     [[Branch getInstance] continueUserActivity:userActivity];
 
     // Process non-Branch userActivities here...