Check if the init is really finished. (#868)

Author: E-B-Smith

Branch-SDK/Branch-SDK/Branch.m

@@ -2124,11 +2124,11 @@ - (void)initUserSessionAndCallCallback:(BOOL)callCallback {
         }
     }
     // If the session is not yet initialized
-    if (self.initializationStatus != BNCInitStatusInitialized) {
+    if (self.initializationStatus == BNCInitStatusUninitialized) {
         [self initializeSession];
     }
     // If the session was initialized, but callCallback was specified, do so.
-    else if (callCallback) {
+    else if (callCallback && self.initializationStatus == BNCInitStatusInitialized) {
         if (self.sessionInitWithParamsCallback) {
             self.sessionInitWithParamsCallback([self getLatestReferringParams], nil);
         }

Branch-TestBed/Branch-TestBed/AppDelegate.m

@@ -57,6 +57,7 @@ - (BOOL)application:(UIApplication *)application
      *    Required: Initialize Branch, passing a deep link handler block:
      */
 
+    [branch setIdentity:@"Bobby Branch"];
     [branch initSessionWithLaunchOptions:launchOptions
         andRegisterDeepLinkHandlerUsingBranchUniversalObject:
         ^ (BranchUniversalObject * _Nullable universalObject, BranchLinkProperties * _Nullable linkProperties, NSError * _Nullable error) {

Examples/UITestBed/UITestBed/TBAppDelegate.m

@@ -44,10 +44,10 @@ - (BOOL)application:(UIApplication *)application
     // [branch validateSDKIntegration];
 
     // Comment / un-comment to toggle debugging
-    //[branch setDebug];
+    [branch setDebug];
 
     // Optionally check for Apple Search Ads attribution:
-    [branch delayInitToCheckForSearchAds];
+    //[branch delayInitToCheckForSearchAds];
 
     // Turn this on to debug Apple Search Ads.  Should not be included for production.
     // [branch setAppleSearchAdsDebugMode];
@@ -58,7 +58,8 @@ - (BOOL)application:(UIApplication *)application
     BNCLogSetDisplayLevel(BNCLogLevelAll);
     [branch setWhiteListedSchemes:@[@"branchuitest"]];
 
-#if 0
+#if 1
+    // [branch setIdentity:@"Bobby Branch"];
     [branch initSessionWithLaunchOptions:launchOptions
         andRegisterDeepLinkHandler:^(NSDictionary * _Nullable params, NSError * _Nullable error) {
             [self handleBranchDeepLinkParameters:params error:error];
@@ -195,7 +196,7 @@ - (void)handleBranchDeepLinkParameters:(NSDictionary*)params error:(NSError*)err
             [[TBDetailViewController alloc] initWithData:params];
         dataViewController.title = @"Link Opened";
         dataViewController.message = params[@"~referring_link"];
-        if (!dataViewController.message)
+        if (!dataViewController.message.length)
             dataViewController.message = params[@"+non_branch_link"];
         if (dataViewController.message.length == 0)
             dataViewController.message = @"< No URL >";