Merge pull request #976 from BranchMetrics/staging

v0.30.1

Author: bklastaitis-branch

Branch-SDK-Tests/BNCFacebookAppLinksTests.m

@@ -9,19 +9,24 @@
 #import <XCTest/XCTest.h>
 #import "BNCFacebookMock.h"
 #import "BNCFacebookAppLinks.h"
+#import "Branch.h"
 
 @interface BNCFacebookAppLinks()
 - (BOOL)isDeepLinkingClassAvailable;
 @end
 
 @interface BNCFacebookAppLinksTests : XCTestCase
 @property (nonatomic, strong, readwrite) BNCFacebookAppLinks *applinks;
+@property (nonatomic, strong, readwrite) Branch *branch;
+@property (nonatomic, strong, readwrite) BNCPreferenceHelper *preferenceHelper;
 @end
 
 @implementation BNCFacebookAppLinksTests
 
 - (void)setUp {
+    self.branch = [Branch getInstance];
     self.applinks = [BNCFacebookAppLinks new];
+    self.preferenceHelper = [BNCPreferenceHelper preferenceHelper];
 }
 
 - (void)tearDown {
@@ -56,4 +61,32 @@ - (void)testFetchFacebookAppLink {
     }];
 }
 
+// check if FBSDKAppLinkUtility.fetchDeferredAppLink is called on the main thread
+// https://developers.facebook.com/docs/reference/ios/current/class/FBSDKAppLinkUtility
+- (void)testCheckFacebookAppLinks {
+    __block XCTestExpectation *expectation = [self expectationWithDescription:@""];
+    
+    [self.branch registerFacebookDeepLinkingClass:[BNCFacebookMock new]];
+    
+    // checkFacebookAppLinks is not public, so use reflection to call it
+    SEL selector = NSSelectorFromString(@"checkFacebookAppLinks");
+    ((void (*)(id, SEL))[self.branch methodForSelector:selector])(self.branch, selector);
+    
+    // wait 2 secs, then fulfill expectation, if checkFacebookAppLinks succeeded in setting
+    // BNCPreferenceHelper's property 'faceBookAppLink'
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        if ([self.preferenceHelper faceBookAppLink]) {
+            XCTAssertTrue([[self.preferenceHelper faceBookAppLink].absoluteString isEqualToString:@"https://branch.io"]);
+            [expectation fulfill];
+        } else {
+            XCTFail(@"BNCPreferenceHelper.faceBookAppLink is nil after 2 seconds");
+        }
+    });
+    
+    // wait 3 secs, then check if expectation's been fulfilled
+    [self waitForExpectationsWithTimeout:3 handler:^(NSError * _Nullable error) {
+        NSLog(@"%@", error);
+    }];
+}
+
 @end

Branch-SDK-Tests/BNCFacebookMock.m

@@ -7,13 +7,19 @@
 //
 
 #import "BNCFacebookMock.h"
+#import "NSError+Branch.h"
 
 @implementation BNCFacebookMock
 
 - (void)fetchDeferredAppLink:(void (^_Nullable)(NSURL *__nullable appLink, NSError * __nullable error))completion {
     if (completion) {
-        NSURL *url = [NSURL URLWithString:@"https://branch.io"];
-        completion(url, nil);
+        if (![NSThread isMainThread]) {
+            // fetchDeferredAppLink must be called from main thread
+            // https://developers.facebook.com/docs/reference/ios/current/class/FBSDKAppLinkUtility
+            completion(nil, [NSError branchErrorWithCode:BNCGeneralError localizedMessage:@"fetchDeferredAppLink must be called from main thread"]);
+        } else {
+            completion([NSURL URLWithString:@"https://branch.io"], nil);
+        }
     }
 }
 

Branch-SDK-Tests/BranchDelegate.Test.m

@@ -30,14 +30,6 @@ - (void) testNotificationsSuccess {
 
     self.expectFailure = NO;
     self.notificationOrder = 0;
-    self.branchWillOpenURLExpectation =
-        [self expectationWithDescription:@"branchWillOpenURLExpectation"];
-    self.branchWillOpenURLNotificationExpectation =
-        [self expectationWithDescription:@"branchWillOpenURLNotificationExpectation"];
-    self.branchDidOpenURLExpectation =
-        [self expectationWithDescription:@"branchDidOpenURLExpectation"];
-    self.branchDidOpenURLNotificationExpectation =
-        [self expectationWithDescription:@"branchDidOpenURLNotificationExpectation"];
 
     [[NSNotificationCenter defaultCenter]
         addObserver:self
@@ -125,14 +117,6 @@ - (void) testNotificationsFailure {
 
     self.expectFailure = YES;
     self.notificationOrder = 0;
-    self.branchWillOpenURLExpectation =
-        [self expectationWithDescription:@"branchWillOpenURLExpectation"];
-    self.branchWillOpenURLNotificationExpectation =
-        [self expectationWithDescription:@"branchWillOpenURLNotificationExpectation"];
-    self.branchDidOpenURLExpectation =
-        [self expectationWithDescription:@"branchDidOpenURLExpectation"];
-    self.branchDidOpenURLNotificationExpectation =
-        [self expectationWithDescription:@"branchDidOpenURLNotificationExpectation"];
 
     [[NSNotificationCenter defaultCenter]
         addObserver:self
@@ -329,4 +313,15 @@ - (void) branchDidStartSessionNotification:(NSNotification*)notification {
     [self.branchDidOpenURLNotificationExpectation fulfill];
 }
 
+- (void)setUp {
+    self.branchWillOpenURLExpectation =
+        [self expectationWithDescription:@"branchWillOpenURLExpectation"];
+    self.branchWillOpenURLNotificationExpectation =
+        [self expectationWithDescription:@"branchWillOpenURLNotificationExpectation"];
+    self.branchDidOpenURLExpectation =
+        [self expectationWithDescription:@"branchDidOpenURLExpectation"];
+    self.branchDidOpenURLNotificationExpectation =
+        [self expectationWithDescription:@"branchDidOpenURLNotificationExpectation"];
+}
+
 @end

Branch-SDK/Branch-SDK/BNCConfig.m

@@ -12,4 +12,4 @@
 BOOL       const BNC_API_PINNED      = NO;
 NSString * const BNC_API_VERSION     = @"v1";
 NSString * const BNC_LINK_URL        = @"https://bnc.lt";
-NSString * const BNC_SDK_VERSION     = @"0.30.0";
+NSString * const BNC_SDK_VERSION     = @"0.30.1";

Branch-SDK/Branch-SDK/BNCFacebookAppLinks.m

@@ -63,7 +63,9 @@ - (void)fetchFacebookAppLinkWithCompletion:(void (^_Nullable)(NSURL *__nullable
          }
      };
 
+    dispatch_async(dispatch_get_main_queue(), ^{
      ((void (*)(id, SEL, void (^ __nullable)(NSURL *__nullable appLink, NSError * __nullable error)))[self.appLinkUtility methodForSelector:self.fetchDeferredAppLink])(self.appLinkUtility, self.fetchDeferredAppLink, completionBlock);
+    });
  }
 
 @end

Branch-TestBed/Framework-Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.30.0</string>
+	<string>0.30.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.30.0</string>
+	<string>0.30.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>

Branch.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Branch"
-  s.version          = "0.30.0"
+  s.version          = "0.30.1"
   s.summary          = "Create an HTTP URL for any piece of content in your app"
   s.description      = <<-DESC
 - Want the highest possible conversions on your sharing feature?

ChangeLog.md

@@ -1,5 +1,9 @@
 Branch iOS SDK Change Log
 
+- v0.30.1
+* _*Master Release*_ - Dec 3, 2019
+  * SDK-679 Call FB SDK on the main thread
+
 - v0.30.0
 * _*Master Release*_ - Nov 13, 2019
   * SDK-513 update Apple Search Ads behavior and API

carthage-files/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.30.0</string>
+	<string>0.30.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.30.0</string>
+	<string>0.30.1</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

scripts/version

@@ -31,7 +31,7 @@ Options:
 USAGE
 }
 
-version=0.30.0
+version=0.30.1
 
 if (( $# == 0 )); then
     echo $version