Merge branch 'staging' into SDK-562-Additional-fields-for-Tune-compatibility

echo-branch · echo-branch · commit ad293400d5b7 · 2019-12-05T12:45:38.000-08:00
diff --git a/Branch-SDK-Tests/BNCFacebookAppLinksTests.m b/Branch-SDK-Tests/BNCFacebookAppLinksTests.m
@@ -48,6 +48,7 @@ - (void)testFetchFacebookAppLink {
     [self.applinks registerFacebookDeepLinkingClass:[BNCFacebookMock new]];
     [self.applinks fetchFacebookAppLinkWithCompletion:^(NSURL * _Nullable appLink, NSError * _Nullable error) {
         XCTAssertTrue([[appLink absoluteString] isEqualToString:@"https://branch.io"]);
+        XCTAssertTrue([NSThread isMainThread]);
         [expectation fulfill];
     }];
     
@@ -56,4 +57,23 @@ - (void)testFetchFacebookAppLink {
     }];
 }
 
+// check if FBSDKAppLinkUtility.fetchDeferredAppLink is called on the main thread
+// https://developers.facebook.com/docs/reference/ios/current/class/FBSDKAppLinkUtility
+- (void)testFetchFacebookAppLink_BackgroundThead {
+    __block XCTestExpectation *expectation = [self expectationWithDescription:@""];
+    
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        [self.applinks registerFacebookDeepLinkingClass:[BNCFacebookMock new]];
+        [self.applinks fetchFacebookAppLinkWithCompletion:^(NSURL * _Nullable appLink, NSError * _Nullable error) {
+            XCTAssertTrue([[appLink absoluteString] isEqualToString:@"https://branch.io"]);
+            XCTAssertTrue([NSThread isMainThread]);
+            [expectation fulfill];
+        }];
+    });
+    
+    [self waitForExpectationsWithTimeout:2 handler:^(NSError * _Nullable error) {
+        NSLog(@"%@", error);
+    }];
+}
+
 @end
diff --git a/Branch-SDK-Tests/BNCFacebookMock.m b/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);
+        }
     }
 }
 
diff --git a/Branch-SDK-Tests/BranchDelegate.Test.m b/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
diff --git a/Branch-SDK/Branch-SDK/BNCConfig.m b/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";
diff --git a/Branch-SDK/Branch-SDK/BNCFacebookAppLinks.m b/Branch-SDK/Branch-SDK/BNCFacebookAppLinks.m
@@ -63,7 +63,9 @@ - (void)fetchFacebookAppLinkWithCompletion:(void (^_Nullable)(NSURL *__nullable
          }
      };
 
-     ((void (*)(id, SEL, void (^ __nullable)(NSURL *__nullable appLink, NSError * __nullable error)))[self.appLinkUtility methodForSelector:self.fetchDeferredAppLink])(self.appLinkUtility, self.fetchDeferredAppLink, completionBlock);
+    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
diff --git a/Branch-TestBed/Framework-Info.plist b/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>
diff --git a/Branch.framework/Info.plist b/Branch.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>
diff --git a/Branch.framework/Versions/A/Branch b/Branch.framework/Versions/A/Branch
diff --git a/Branch.podspec b/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?
diff --git a/ChangeLog.md b/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
diff --git a/carthage-files/Info.plist b/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>
diff --git a/checksum b/checksum
@@ -1,4 +1,4 @@
 #checksum for Branch-iOS-SDK found at https://s3-us-west-1.amazonaws.com/branchhost/Branch-iOS-SDK.zip
-879ae2a3fd32caa8fa88c273aed90f2f8794891d  Branch-iOS-SDK.zip
+531ad39bb5d2b172f869e06e87e0902a6124aeb0  Branch-iOS-SDK.zip
 #checksum for Branch-iOS-TestBed found at https://s3-us-west-1.amazonaws.com/branchhost/Branch-iOS-TestBed.zip
-47478e6688aed474375b0cb51b9b6b23288f9d09  Branch-iOS-TestBed.zip
+bab628e26fd142531a9618e763164a5cf8944f24  Branch-iOS-TestBed.zip
diff --git a/scripts/version b/scripts/version
@@ -31,7 +31,7 @@ Options:
 USAGE
 }
 
-version=0.30.0
+version=0.30.1
 
 if (( $# == 0 )); then
     echo $version

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,9 @@ - (void)fetchFacebookAppLinkWithCompletion:(void (^_Nullable)(NSURL *__nullable`
`63`	`63`	`}`
`64`	`64`	`};`
`65`	`65`
`66`		`- ((void ()(id, SEL, void (^ __nullable)(NSURL __nullable appLink, NSError * __nullable error)))[self.appLinkUtility methodForSelector:self.fetchDeferredAppLink])(self.appLinkUtility, self.fetchDeferredAppLink, completionBlock);`
	`66`	`+ dispatch_async(dispatch_get_main_queue(), ^{`
	`67`	`+ ((void ()(id, SEL, void (^ __nullable)(NSURL __nullable appLink, NSError * __nullable error)))[self.appLinkUtility methodForSelector:self.fetchDeferredAppLink])(self.appLinkUtility, self.fetchDeferredAppLink, completionBlock);`
	`68`	`+ });`
`67`	`69`	`}`
`68`	`70`
`69`	`71`	`@end`