Merge branch 'master' of github.com:BranchMetrics/ios-branch-deep-linking into staging

Author: Edward Smith

Branch-SDK/Branch-SDK/BNCPreferenceHelper.h

@@ -53,6 +53,7 @@ NSURL* /* _Nonnull */ BNCURLForBranchDirectory(void);
 
 @property (strong, atomic) NSArray<NSString*> *URLBlackList;
 @property (assign, atomic) NSInteger URLBlackListVersion;
+@property (assign, atomic) BOOL blacklistURLOpen;
 
 @property (assign, atomic) BOOL trackingDisabled;
 - (void) clearTrackingInformation;

Branch-SDK/Branch-SDK/BNCPreferenceHelper.m

@@ -571,6 +571,19 @@ - (void) setURLBlackListVersion:(NSInteger)URLBlackListVersion {
     }
 }
 
+- (BOOL) blacklistURLOpen {
+    @synchronized(self) {
+        return [self readBoolFromDefaults:@"blacklistURLOpen"];
+    }
+}
+
+- (void) setBlacklistURLOpen:(BOOL)value {
+    @synchronized(self) {
+        [self writeBoolToDefaults:@"blacklistURLOpen" value:value];
+    }
+}
+
+
 - (BOOL) trackingDisabled {
     @synchronized(self) {
         NSNumber *b = (id) [self readObjectFromDefaults:@"trackingDisabled"];

Branch-SDK/Branch-SDK/Branch.m

@@ -717,10 +717,18 @@ - (BOOL)handleDeepLink:(NSURL *)url fromSelf:(BOOL)isFromSelf {
         blackListPattern = [_userURLBlackList blackListPatternMatchingURL:url];
     }
     if (blackListPattern) {
-        [self handleUniversalDeepLink_private:blackListPattern fromSelf:isFromSelf];
+        self.preferenceHelper.blacklistURLOpen = YES;
+        self.preferenceHelper.externalIntentURI = blackListPattern;
+        self.preferenceHelper.referringURL = blackListPattern;
+        [self initUserSessionAndCallCallback:!self.isInitialized];
         return NO;
     }
 
+    self.preferenceHelper.blacklistURLOpen = NO;
+    self.preferenceHelper.referringURL = nil;
+    self.preferenceHelper.externalIntentURI = nil;
+    self.preferenceHelper.universalLinkUrl = nil;
+
     NSString *scheme = [url scheme];
     if ([scheme isEqualToString:@"http"] || [scheme isEqualToString:@"https"]) {
         return [self handleUniversalDeepLink_private:url.absoluteString fromSelf:isFromSelf];

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

@@ -612,7 +612,6 @@ - (void)genericHTTPRequest:(NSURLRequest *)request
               (prefs.spotlightIdentifier.length > 0 ) ||
               (prefs.universalLinkUrl.length > 0))) {
             // Allow this network operation since it's an open/install to resolve a link.
-            NSLog(@"Yope!"); // EBS eDebug
         } else {
             [[BNCPreferenceHelper preferenceHelper] clearTrackingInformation];
             NSError *error = [NSError branchErrorWithCode:BNCTrackingDisabledError];

Branch-SDK/Branch-SDK/Networking/Requests/BranchOpenRequest.m

@@ -137,6 +137,16 @@ + (NSNumber*) appUpdateState {
 }
 
 - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
+    BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper preferenceHelper];
+    if (error && preferenceHelper.blacklistURLOpen) {
+        // Ignore this response from the server. Dummy up a response:
+        error = nil;
+        response.data = @{
+            BRANCH_RESPONSE_KEY_SESSION_DATA: @{
+                BRANCH_RESPONSE_KEY_CLICKED_BRANCH_LINK: @0
+            }
+        };
+    } else
     if (error) {
         [BranchOpenRequest releaseOpenResponseLock];
         if (self.callback) {
@@ -145,7 +155,6 @@ - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
         return;
     }
 
-    BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper preferenceHelper];
     NSDictionary *data = response.data;
 
     // Handle possibly mis-parsed identity.
@@ -243,6 +252,7 @@ - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
     preferenceHelper.externalIntentURI = nil;
     preferenceHelper.appleSearchAdNeedsSend = NO;
     preferenceHelper.referringURL = referringURL;
+    preferenceHelper.blacklistURLOpen = NO;
 
     NSString *string = BNCStringFromWireFormat(data[BRANCH_RESPONSE_KEY_BRANCH_IDENTITY]);
     if (string) preferenceHelper.identityID = string;

Branch-TestBed-Swift/TestBed-Swift/AppDelegate.swift

@@ -75,7 +75,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate, AdjustDelegate, AppsFlyer
 
             // Required. Initialize session. automaticallyDisplayDeepLinkController is optional (default is false).
 
-            branch.initSession(launchOptions: launchOptions, automaticallyDisplayDeepLinkController: false, deepLinkHandler: { params, error in
+            branch.initSession(
+                launchOptions: launchOptions,
+                automaticallyDisplayDeepLinkController: false,
+                deepLinkHandler: { params, error in
 
                 defer {
                     let notificationName = Notification.Name("BranchCallbackCompleted")
@@ -115,7 +118,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, AdjustDelegate, AppsFlyer
                     let adjust_creative = URLQueryItem(name: "adjust_creative", value: paramsDictionary[BRANCH_INIT_KEY_FEATURE] as? String)
                     let queryItems = [adjust_tracker,adjust_campaign,adjust_adgroup,adjust_creative]
                     adjustUrl?.queryItems = queryItems
-                    Adjust.appWillOpen(adjustUrl?.url as URL!)
+                    if let url = adjustUrl?.url {
+                        Adjust.appWillOpen(url)
+                    }
                 }
 
                 // Deeplinking logic for use when automaticallyDisplayDeepLinkController = false
@@ -200,12 +205,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate, AdjustDelegate, AppsFlyer
     }
 
     // Respond to Universal Links
-    func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([Any]?) -> Void) -> Bool {
+    func application(_
+        application: UIApplication,
+        continue userActivity: NSUserActivity,
+        restorationHandler: @escaping ([Any]?) -> Void
+    ) -> Bool {
         let branchHandled = Branch.getInstance().continue(userActivity)
         if (userActivity.activityType == NSUserActivityTypeBrowsingWeb) {
-            let url = userActivity.webpageURL
-            if(!branchHandled) {
-                Adjust.appWillOpen(url as URL!)
+            if let url = userActivity.webpageURL,
+               !branchHandled {
+                Adjust.appWillOpen(url)
             }
         }
 

Branch-TestBed/Branch-SDK-Tests/BNCURLBlackList.Test.m

@@ -23,14 +23,19 @@ @implementation BNCURLBlackListTest
 - (void) setUp {
     [BNCPreferenceHelper preferenceHelper].URLBlackList = nil;
     [BNCPreferenceHelper preferenceHelper].URLBlackListVersion = 0;
+    [BNCPreferenceHelper preferenceHelper].blacklistURLOpen = NO;
+}
+
+- (void) tearDown {
+    [BNCPreferenceHelper preferenceHelper].blacklistURLOpen = NO;
 }
 
 - (void)testListDownLoad {
     XCTestExpectation *expectation = [self expectationWithDescription:@"BlackList Download"];
     BNCURLBlackList *blackList = [BNCURLBlackList new];
     [blackList refreshBlackListFromServerWithCompletion:^ (NSError*error, NSArray*list) {
         XCTAssertNil(error);
-        XCTAssertTrue(list.count == 7);
+        XCTAssertTrue(list.count == 6);
         [expectation fulfill];
     }];
     [self awaitExpectations];

Branch-TestBed/Branch-TestBed-UITests/UITestBed/Info.plist

@@ -24,6 +24,7 @@
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>branchuitest</string>
+				<string>fb123</string>
 			</array>
 		</dict>
 	</array>

ChangeLog.md

@@ -1,6 +1,12 @@
 Branch iOS SDK Change Log
 
 - v0.24.2
+  * _*Master Release*_ - April 19, 2018
+  * Fixed a bug where a opening a blacklisted URI scheme would cause an HTTP status 400 for each
+    Branch open until the app was opened with a universal link (DEVEX-341).
+    - After opening a blacklisted scheme, the app would not open other schemes until a https URL was opened.
+    - Added code that clears the blacklisted URL after sending the regex pattern to the server.
+    - Removed an old NSLog from debugging.
   * Added `BNCProductCategoryAllCategories(void)` and `BNCCurrencyAllCurrencies(void)` convenience functions.
   * Updated Info.plist URI Filter and clarified documentation (DEVEX-343).
     - Updated our URI scheme filter that finds the URI scheme for the app.
@@ -9,10 +15,6 @@ Branch iOS SDK Change Log
   * Added code snippets that demonstrate Adjust reattribution in the Swift-TestBed demo app (ATAN-523).
   * Made sure that Foundation/Foundation.h is always imported first (DEVEX-333).
   * Fixed a crash bug in the Swift-TestBed example app (DEVEX-327).
-  * Fix blacklist open with URI scheme (DEVEX-341).
-    - After opening a blacklisted scheme, the app would not open other schemes until a https URL was opened.
-    - Added code that clears the blacklisted URL after sending the regex pattern to the server.
-    - Removed an old NSLog from debugging.
 
 - v0.24.1
   * _*Master Release*_ - April 5, 2018