Merge pull request #453 from BranchMetrics/hotfix-for-fb-exception

aaustin · web-flow · commit a7b1c9401f5a · 2016-09-15T15:13:42.000-07:00
hotfix for facebook shouldWaitForInit functionality
diff --git a/Branch-SDK/Branch-SDK/Branch.m b/Branch-SDK/Branch-SDK/Branch.m
@@ -410,8 +410,8 @@ - (BOOL)continueUserActivity:(NSUserActivity *)userActivity {
     //check to see if a browser activity needs to be handled
     if ([userActivity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb]) {
         self.preferenceHelper.universalLinkUrl = [userActivity.webpageURL absoluteString];
-        [self initUserSessionAndCallCallback:YES];
         self.preferenceHelper.shouldWaitForInit = NO;
+        [self initUserSessionAndCallCallback:YES];
         
         id branchUniversalLinkDomains = [self.preferenceHelper getBranchUniversalLinkDomains];
         if ([branchUniversalLinkDomains isKindOfClass:[NSString class]] && [[userActivity.webpageURL absoluteString] containsString:branchUniversalLinkDomains]) {
@@ -448,8 +448,8 @@ - (BOOL)continueUserActivity:(NSUserActivity *)userActivity {
         }
     }
     
-    [self initUserSessionAndCallCallback:YES];
     self.preferenceHelper.shouldWaitForInit = NO;
+    [self initUserSessionAndCallCallback:YES];
     
     return spotlightIdentifier != nil;
 }
@@ -1367,4 +1367,4 @@ + (NSString *)kitDisplayVersion {
 	return @"0.12.9";
 }
 
-@end
+@end

Original file line number	Diff line number	Diff line change
`@@ -410,8 +410,8 @@ - (BOOL)continueUserActivity:(NSUserActivity *)userActivity {`
`410`	`410`	`//check to see if a browser activity needs to be handled`
`411`	`411`	`if ([userActivity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb]) {`
`412`	`412`	`self.preferenceHelper.universalLinkUrl = [userActivity.webpageURL absoluteString];`
`413`		`- [self initUserSessionAndCallCallback:YES];`
`414`	`413`	`self.preferenceHelper.shouldWaitForInit = NO;`
	`414`	`+ [self initUserSessionAndCallCallback:YES];`
`415`	`415`
`416`	`416`	`id branchUniversalLinkDomains = [self.preferenceHelper getBranchUniversalLinkDomains];`
`417`	`417`	`if ([branchUniversalLinkDomains isKindOfClass:[NSString class]] && [[userActivity.webpageURL absoluteString] containsString:branchUniversalLinkDomains]) {`
`@@ -448,8 +448,8 @@ - (BOOL)continueUserActivity:(NSUserActivity *)userActivity {`
`448`	`448`	`}`
`449`	`449`	`}`
`450`	`450`
`451`		`- [self initUserSessionAndCallCallback:YES];`
`452`	`451`	`self.preferenceHelper.shouldWaitForInit = NO;`
	`452`	`+ [self initUserSessionAndCallCallback:YES];`
`453`	`453`
`454`	`454`	`return spotlightIdentifier != nil;`
`455`	`455`	`}`
`@@ -1367,4 +1367,4 @@ + (NSString *)kitDisplayVersion {`
`1367`	`1367`	`return @"0.12.9";`
`1368`	`1368`	`}`
`1369`	`1369`
`1370`		`-@end`
	`1370`	`+@end`