update iOS

aaustin · aaustin · commit 37bb1a2e4ff4 · 2016-09-20T22:01:09.000-07:00
diff --git a/src/ios/dependencies/Branch-SDK/BNCConfig.h b/src/ios/dependencies/Branch-SDK/BNCConfig.h
@@ -9,7 +9,7 @@
 #ifndef Branch_SDK_Config_h
 #define Branch_SDK_Config_h
 
-#define SDK_VERSION             @"0.12.10"
+#define SDK_VERSION             @"0.12.11"
 
 #define BNC_PROD_ENV
 //#define BNC_STAGE_ENV
diff --git a/src/ios/dependencies/Branch-SDK/BNCPreferenceHelper.h b/src/ios/dependencies/Branch-SDK/BNCPreferenceHelper.h
@@ -36,6 +36,7 @@
 @property (assign, nonatomic) NSTimeInterval timeout;
 @property (strong, nonatomic) NSString *externalIntentURI;
 @property (strong, nonatomic) NSMutableDictionary *savedAnalyticsData;
+@property (assign, nonatomic) NSInteger installRequestDelay;
 
 + (BNCPreferenceHelper *)preferenceHelper;
 
diff --git a/src/ios/dependencies/Branch-SDK/BNCStrongMatchHelper.m b/src/ios/dependencies/Branch-SDK/BNCStrongMatchHelper.m
@@ -135,7 +135,7 @@ - (void)presentSafariVCWithBranchKey:(NSString *)branchKey {
             [self.secondWindow makeKeyWindow];
             
             // Give enough time for Safari to load the request (optimized for 3G)
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                 [keyWindow makeKeyWindow];
                 
                 // Remove the window and release it's strong reference. This is important to ensure that
diff --git a/src/ios/dependencies/Branch-SDK/Branch.h b/src/ios/dependencies/Branch-SDK/Branch.h
@@ -448,7 +448,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  but that UL is not a Facebook UL. Some developers prefer not to modify
  `application:didFinishLaunchingWithOptions:` to always return `YES` and should use this method instead.
  */
-- (void)accountForFacebookSDKPreventingAppLaunch;
+- (void)accountForFacebookSDKPreventingAppLaunch __attribute__((deprecated(("Please ensure application:didFinishLaunchingWithOptions: always returns YES/true instead of using this method. It will be removed in a future release."))));
 
 - (void)suppressWarningLogs;
 
@@ -468,6 +468,8 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
 
 - (void)resumeInit;
 
+- (void)setInstallRequestDelay:(NSInteger)installRequestDelay;
+
 #pragma mark - Session Item methods
 
 ///--------------------
diff --git a/src/ios/dependencies/Branch-SDK/Branch.m b/src/ios/dependencies/Branch-SDK/Branch.m
@@ -271,6 +271,9 @@ - (void)resumeInit {
     }
 }
 
+- (void)setInstallRequestDelay:(NSInteger)installRequestDelay {
+    self.preferenceHelper.installRequestDelay = installRequestDelay;
+}
 
 #pragma mark - InitSession Permutation methods
 
@@ -336,14 +339,15 @@ - (void)initSessionWithLaunchOptions:(NSDictionary *)options isReferrable:(BOOL)
     }
     
     if ([BNCSystemObserver getOSVersion].integerValue >= 8) {
-        if (![options objectForKey:UIApplicationLaunchOptionsURLKey] && ![options objectForKey:UIApplicationLaunchOptionsUserActivityDictionaryKey]) {
+        if (![options.allKeys containsObject:UIApplicationLaunchOptionsURLKey] && ![options.allKeys containsObject:UIApplicationLaunchOptionsUserActivityDictionaryKey]) {
             // If Facebook SDK is present, call deferred app link check here
             if (![self checkFacebookAppLinks]) {
                 [self initUserSessionAndCallCallback:YES];
             }
         }
-        else if ([options objectForKey:UIApplicationLaunchOptionsUserActivityDictionaryKey]) {
+        else if ([options.allKeys containsObject:UIApplicationLaunchOptionsUserActivityDictionaryKey]) {
             if (self.accountForFacebookSDK) {
+                // does not work in Swift, because Objective-C to Swift interop is bad
                 id activity = [[options objectForKey:UIApplicationLaunchOptionsUserActivityDictionaryKey] objectForKey:@"UIApplicationLaunchOptionsUserActivityKey"];
                 if (activity && [activity isKindOfClass:[NSUserActivity class]]) {
                     [self continueUserActivity:activity];
@@ -353,7 +357,7 @@ - (void)initSessionWithLaunchOptions:(NSDictionary *)options isReferrable:(BOOL)
             self.preferenceHelper.shouldWaitForInit = YES;
         }
     }
-    else if (![options objectForKey:UIApplicationLaunchOptionsURLKey]) {
+    else if (![options.allKeys containsObject:UIApplicationLaunchOptionsURLKey]) {
         [self initUserSessionAndCallCallback:YES];
     }
 }
@@ -1364,7 +1368,7 @@ + (NSString *)bundleIdentifier {
 }
 
 + (NSString *)kitDisplayVersion {
-	return @"0.12.10";
+	return @"0.12.11";
 }
 
 @end
diff --git a/src/ios/dependencies/Branch-SDK/Requests/BranchInstallRequest.m b/src/ios/dependencies/Branch-SDK/Requests/BranchInstallRequest.m
@@ -36,7 +36,11 @@ - (void)makeRequest:(BNCServerInterface *)serverInterface key:(NSString *)key ca
     params[BRANCH_REQUEST_KEY_DEBUG] = @(preferenceHelper.isDebug);
     
     if ([[BNCStrongMatchHelper strongMatchHelper] shouldDelayInstallRequest]) {
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(750 * NSEC_PER_MSEC)), dispatch_get_main_queue(), ^{
+        NSInteger delay = 750;
+        if (preferenceHelper.installRequestDelay) {
+            delay = preferenceHelper.installRequestDelay;
+        }
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delay * NSEC_PER_MSEC)), dispatch_get_main_queue(), ^{
             [serverInterface postRequest:params url:[preferenceHelper getAPIURL:BRANCH_REQUEST_ENDPOINT_INSTALL] key:key callback:callback];
         });
     }
diff --git a/src/ios/dependencies/Branch.framework/Versions/A/Branch b/src/ios/dependencies/Branch.framework/Versions/A/Branch
diff --git a/src/ios/dependencies/Branch.framework/Versions/A/Headers/BNCConfig.h b/src/ios/dependencies/Branch.framework/Versions/A/Headers/BNCConfig.h
@@ -9,7 +9,7 @@
 #ifndef Branch_SDK_Config_h
 #define Branch_SDK_Config_h
 
-#define SDK_VERSION             @"0.12.10"
+#define SDK_VERSION             @"0.12.11"
 
 #define BNC_PROD_ENV
 //#define BNC_STAGE_ENV
diff --git a/src/ios/dependencies/Branch.framework/Versions/A/Headers/BNCPreferenceHelper.h b/src/ios/dependencies/Branch.framework/Versions/A/Headers/BNCPreferenceHelper.h
@@ -36,6 +36,7 @@
 @property (assign, nonatomic) NSTimeInterval timeout;
 @property (strong, nonatomic) NSString *externalIntentURI;
 @property (strong, nonatomic) NSMutableDictionary *savedAnalyticsData;
+@property (assign, nonatomic) NSInteger installRequestDelay;
 
 + (BNCPreferenceHelper *)preferenceHelper;
 
diff --git a/src/ios/dependencies/Branch.framework/Versions/A/Headers/Branch.h b/src/ios/dependencies/Branch.framework/Versions/A/Headers/Branch.h
@@ -448,7 +448,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  but that UL is not a Facebook UL. Some developers prefer not to modify
  `application:didFinishLaunchingWithOptions:` to always return `YES` and should use this method instead.
  */
-- (void)accountForFacebookSDKPreventingAppLaunch;
+- (void)accountForFacebookSDKPreventingAppLaunch __attribute__((deprecated(("Please ensure application:didFinishLaunchingWithOptions: always returns YES/true instead of using this method. It will be removed in a future release."))));
 
 - (void)suppressWarningLogs;
 
@@ -468,6 +468,8 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
 
 - (void)resumeInit;
 
+- (void)setInstallRequestDelay:(NSInteger)installRequestDelay;
+
 #pragma mark - Session Item methods
 
 ///--------------------

Original file line number	Diff line number	Diff line change
`@@ -271,6 +271,9 @@ - (void)resumeInit {`
`271`	`271`	`}`
`272`	`272`	`}`
`273`	`273`
	`274`	`+- (void)setInstallRequestDelay:(NSInteger)installRequestDelay {`
	`275`	`+ self.preferenceHelper.installRequestDelay = installRequestDelay;`
	`276`	`+}`
`274`	`277`
`275`	`278`	`#pragma mark - InitSession Permutation methods`
`276`	`279`
`@@ -336,14 +339,15 @@ - (void)initSessionWithLaunchOptions:(NSDictionary *)options isReferrable:(BOOL)`
`336`	`339`	`}`
`337`	`340`
`338`	`341`	`if ([BNCSystemObserver getOSVersion].integerValue >= 8) {`
`339`		`- if (![options objectForKey:UIApplicationLaunchOptionsURLKey] && ![options objectForKey:UIApplicationLaunchOptionsUserActivityDictionaryKey]) {`
	`342`	`+ if (![options.allKeys containsObject:UIApplicationLaunchOptionsURLKey] && ![options.allKeys containsObject:UIApplicationLaunchOptionsUserActivityDictionaryKey]) {`
`340`	`343`	`// If Facebook SDK is present, call deferred app link check here`
`341`	`344`	`if (![self checkFacebookAppLinks]) {`
`342`	`345`	`[self initUserSessionAndCallCallback:YES];`
`343`	`346`	`}`
`344`	`347`	`}`
`345`		`- else if ([options objectForKey:UIApplicationLaunchOptionsUserActivityDictionaryKey]) {`
	`348`	`+ else if ([options.allKeys containsObject:UIApplicationLaunchOptionsUserActivityDictionaryKey]) {`
`346`	`349`	`if (self.accountForFacebookSDK) {`
	`350`	`+ // does not work in Swift, because Objective-C to Swift interop is bad`
`347`	`351`	`id activity = [[options objectForKey:UIApplicationLaunchOptionsUserActivityDictionaryKey] objectForKey:@"UIApplicationLaunchOptionsUserActivityKey"];`
`348`	`352`	`if (activity && [activity isKindOfClass:[NSUserActivity class]]) {`
`349`	`353`	`[self continueUserActivity:activity];`
`@@ -353,7 +357,7 @@ - (void)initSessionWithLaunchOptions:(NSDictionary *)options isReferrable:(BOOL)`
`353`	`357`	`self.preferenceHelper.shouldWaitForInit = YES;`
`354`	`358`	`}`
`355`	`359`	`}`
`356`		`- else if (![options objectForKey:UIApplicationLaunchOptionsURLKey]) {`
	`360`	`+ else if (![options.allKeys containsObject:UIApplicationLaunchOptionsURLKey]) {`
`357`	`361`	`[self initUserSessionAndCallCallback:YES];`
`358`	`362`	`}`
`359`	`363`	`}`
`@@ -1364,7 +1368,7 @@ + (NSString *)bundleIdentifier {`
`1364`	`1368`	`}`
`1365`	`1369`
`1366`	`1370`	`+ (NSString *)kitDisplayVersion {`
`1367`		`- return @"0.12.10";`
	`1371`	`+ return @"0.12.11";`
`1368`	`1372`	`}`
`1369`	`1373`
`1370`	`1374`	`@end`