Merge QA.

Author: Edward Smith

Branch-SDK/Branch-SDK/BNCConfig.m

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

Branch-SDK/Branch-SDK/Branch.m

@@ -115,6 +115,12 @@ + (BranchLink*) linkWithUniversalObject:(BranchUniversalObject*)universalObject
 
 #pragma mark - Branch
 
+typedef NS_ENUM(NSInteger, BNCInitStatus) {
+    BNCInitStatusUninitialized = 0,
+    BNCInitStatusInitializing,
+    BNCInitStatusInitialized
+};
+
 @interface Branch() <BranchDeepLinkingControllerCompletionDelegate, FABKit> {
     NSInteger _networkCount;
     BNCURLBlackList *_userURLBlackList;
@@ -127,7 +133,7 @@ @interface Branch() <BranchDeepLinkingControllerCompletionDelegate, FABKit> {
 @property (copy,   nonatomic) callbackWithBranchUniversalObject sessionInitWithBranchUniversalObjectCallback;
 @property (assign, atomic)    NSInteger networkCount;
 @property (assign, nonatomic) NSInteger asyncRequestCount;
-@property (assign, nonatomic) BOOL isInitialized;
+@property (assign, nonatomic) BNCInitStatus initializationStatus;
 @property (assign, nonatomic) BOOL shouldCallSessionInitCallback;
 @property (assign, nonatomic) BOOL shouldAutomaticallyDeepLink;
 @property (strong, nonatomic) BNCLinkCache *linkCache;
@@ -242,7 +248,7 @@ - (id)initWithInterface:(BNCServerInterface *)interface
     _preferenceHelper = preferenceHelper;
 
     _contentDiscoveryManager = [[BNCContentDiscoveryManager alloc] init];
-    _isInitialized = NO;
+    _initializationStatus = BNCInitStatusUninitialized;
     _shouldCallSessionInitCallback = YES;
     _processing_sema = dispatch_semaphore_create(1);
     _networkCount = 0;
@@ -452,7 +458,7 @@ - (void)validateSDKIntegration {
 }
 
 - (void)resetUserSession {
-    self.isInitialized = NO;
+    self.initializationStatus = BNCInitStatusUninitialized;
 }
 
 - (BOOL)isUserIdentified {
@@ -503,7 +509,7 @@ - (NSURL *)getUrlForOnboardingWithRedirectUrl:(NSString *)redirectUrl {
 
 - (void)resumeInit {
     self.preferenceHelper.shouldWaitForInit = NO;
-    if (self.isInitialized) {
+    if (self.initializationStatus == BNCInitStatusInitialized) {
         BNCLogError(@"User session has already been initialized, so resumeInit is aborting.");
     }
     else if (![self.requestQueue containsInstallOrOpen]) {
@@ -534,7 +540,7 @@ + (void) setTrackingDisabled:(BOOL)disabled {
             [BNCPreferenceHelper preferenceHelper].trackingDisabled = YES;
             Branch *branch = Branch.getInstance;
             [branch clearNetworkQueue];
-            branch.isInitialized = NO;
+            branch.initializationStatus = BNCInitStatusUninitialized;
             [branch.linkCache clear];
             // Release the lock in case it's locked:
             [BranchOpenRequest releaseOpenResponseLock];
@@ -614,7 +620,7 @@ - (void)initSessionWithLaunchOptions:(NSDictionary *)options
 
     // If the SDK is already initialized, this means that initSession is being called later in the app lifecycle
     // and that the developer is expecting to receive deep link parameters via the callback block immediately
-    if (self.isInitialized) {
+    if (self.initializationStatus == BNCInitStatusInitialized) {
         [self initUserSessionAndCallCallback:YES];
     }
 
@@ -720,15 +726,10 @@ - (BOOL)handleDeepLink:(NSURL *)url fromSelf:(BOOL)isFromSelf {
         self.preferenceHelper.blacklistURLOpen = YES;
         self.preferenceHelper.externalIntentURI = blackListPattern;
         self.preferenceHelper.referringURL = blackListPattern;
-        [self initUserSessionAndCallCallback:!self.isInitialized];
+        [self initUserSessionAndCallCallback:(self.initializationStatus != BNCInitStatusInitialized)];
         return NO;
     }
 
-    self.preferenceHelper.blacklistURLOpen = NO;
-    self.preferenceHelper.referringURL = nil;
-    self.preferenceHelper.externalIntentURI = nil;
-    self.preferenceHelper.universalLinkUrl = nil;
-
     NSString *scheme = [url scheme];
     if ([scheme isEqualToString:@"http"] || [scheme isEqualToString:@"https"]) {
         return [self handleUniversalDeepLink_private:url.absoluteString fromSelf:isFromSelf];
@@ -772,7 +773,7 @@ - (BOOL)handleSchemeDeepLink_private:(NSURL*)url fromSelf:(BOOL)isFromSelf {
             self.preferenceHelper.linkClickIdentifier = params[@"link_click_id"];
         }
     }
-    [self initUserSessionAndCallCallback:!self.isInitialized];
+    [self initUserSessionAndCallCallback:(self.initializationStatus != BNCInitStatusInitialized)];
     return handled;
 }
 
@@ -813,8 +814,10 @@ - (BOOL)handleUniversalDeepLink_private:(NSString*)urlString fromSelf:(BOOL)isFr
         [self resetUserSession];
     }
 
-    self.preferenceHelper.universalLinkUrl = urlString;
-    self.preferenceHelper.referringURL = urlString;
+    if (urlString.length) {
+        self.preferenceHelper.universalLinkUrl = urlString;
+        self.preferenceHelper.referringURL = urlString;
+    }
     self.preferenceHelper.shouldWaitForInit = NO;
     [self initUserSessionAndCallCallback:YES];
 
@@ -912,7 +915,7 @@ - (BOOL)isBranchLink: (NSString*)urlString {
 - (void)handlePushNotification:(NSDictionary *)userInfo {
     // look for a branch shortlink in the payload (shortlink because iOS7 only supports 256 bytes)
     NSString *urlStr = [userInfo objectForKey:BRANCH_PUSH_NOTIFICATION_PAYLOAD_KEY];
-    if (urlStr) {
+    if (urlStr.length) {
         // reusing this field, so as not to create yet another url slot on prefshelper
         self.preferenceHelper.universalLinkUrl = urlStr;
         self.preferenceHelper.referringURL = urlStr;
@@ -1032,7 +1035,7 @@ - (BOOL)checkAppleSearchAdsAttribution {
 
             self.preferenceHelper.shouldWaitForInit = NO;
             dispatch_async(dispatch_get_main_queue(), ^{
-                [self initUserSessionAndCallCallback:!self.isInitialized];
+                [self initUserSessionAndCallCallback:(self.initializationStatus != BNCInitStatusInitialized)];
             });
         }
     };
@@ -1128,7 +1131,7 @@ - (void)logout {
 
 
 - (void)logoutWithCallback:(callbackWithStatus)callback {
-    if (!self.isInitialized) {
+    if (self.initializationStatus == BNCInitStatusUninitialized) {
         NSError *error =
             (Branch.trackingDisabled)
             ? [NSError branchErrorWithCode:BNCTrackingDisabledError]
@@ -1788,7 +1791,7 @@ - (NSString *)generateShortUrl:(NSArray *)tags
                 linkData:linkData
                 linkCache:self.linkCache];
 
-        if (self.isInitialized && !self.preferenceHelper.trackingDisabled) {
+        if ((self.initializationStatus == BNCInitStatusInitialized) && !self.preferenceHelper.trackingDisabled) {
             BNCLogDebug(@"Creating a custom URL synchronously.");
             BNCServerResponse *serverResponse = [req makeRequest:self.serverInterface key:self.class.branchKey];
             shortURL = [req processResponse:serverResponse];
@@ -1910,7 +1913,7 @@ - (void)registerViewWithParams:(NSDictionary *)params andCallback:(callbackWithP
 
 - (void)applicationDidBecomeActive {
     if (!Branch.trackingDisabled) {
-        if (!self.isInitialized &&
+        if ((self.initializationStatus != BNCInitStatusInitialized) &&
             !self.preferenceHelper.shouldWaitForInit &&
             ![self.requestQueue containsInstallOrOpen]) {
             [self initUserSessionAndCallCallback:YES];
@@ -1930,9 +1933,9 @@ - (void)applicationWillResignActive {
 }
 
 - (void)callClose {
-    if (self.isInitialized) {
-        self.isInitialized = NO;
-
+    if (self.initializationStatus != BNCInitStatusUninitialized) {
+        self.initializationStatus = BNCInitStatusUninitialized;
+        
         BranchContentDiscoverer *contentDiscoverer = [BranchContentDiscoverer getInstance];
         if (contentDiscoverer) [contentDiscoverer stopDiscoveryTask];
 
@@ -2091,7 +2094,7 @@ - (void) clearNetworkQueue {
 #pragma mark - Session Initialization
 
 - (void)initSessionIfNeededAndNotInProgress {
-    if (!self.isInitialized &&
+    if (self.initializationStatus == BNCInitStatusUninitialized &&
         !self.preferenceHelper.shouldWaitForInit &&
         ![self.requestQueue containsInstallOrOpen]) {
         [self initUserSessionAndCallCallback:NO];
@@ -2122,7 +2125,7 @@ - (void)initUserSessionAndCallCallback:(BOOL)callCallback {
         }
     }
     // If the session is not yet initialized
-    if (!self.isInitialized) {
+    if (self.initializationStatus != BNCInitStatusInitialized) {
         [self initializeSession];
     }
     // If the session was initialized, but callCallback was specified, do so.
@@ -2184,6 +2187,7 @@ - (void)initializeSession {
 		[BranchOpenRequest setWaitNeededForOpenResponseLock];
 		BranchOpenRequest *req = [[clazz alloc] initWithCallback:initSessionCallback];
 		[self insertRequestAtFront:req];
+        self.initializationStatus = BNCInitStatusInitializing;
 		[self processNextQueueItem];
 	}
 }
@@ -2200,7 +2204,7 @@ - (BOOL) removeInstallOrOpen {
 
 - (void)handleInitSuccess {
 
-    self.isInitialized = YES;
+    self.initializationStatus = BNCInitStatusInitialized;
     NSDictionary *latestReferringParams = [self getLatestReferringParams];
 
     if ([latestReferringParams[@"_branch_validate"] isEqualToString:@"060514"]) {
@@ -2416,7 +2420,8 @@ -(void)presentSharingViewController: (UIViewController <BranchDeepLinkingControl
 }
 
 - (void)handleInitFailure:(NSError *)error {
-    self.isInitialized = NO;
+    self.initializationStatus = BNCInitStatusUninitialized;
+    
     if (self.shouldCallSessionInitCallback) {
         if (self.sessionInitWithParamsCallback) {
             self.sessionInitWithParamsCallback([[NSDictionary alloc] init], error);

Branch-SDK/Branch-SDK/Networking/Requests/BranchOpenRequest.m

@@ -232,16 +232,16 @@ - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
     }
 
     NSString *referringURL = nil;
-    if (preferenceHelper.universalLinkUrl) {
+    if (preferenceHelper.universalLinkUrl.length) {
         referringURL = preferenceHelper.universalLinkUrl;
     }
-    else if (preferenceHelper.externalIntentURI) {
+    else if (preferenceHelper.externalIntentURI.length) {
         referringURL = preferenceHelper.externalIntentURI;
     }
     else {
         NSDictionary *sessionDataDict = [BNCEncodingUtils decodeJsonStringToDictionary:sessionData];
         NSString *link = sessionDataDict[BRANCH_RESPONSE_KEY_BRANCH_REFERRING_LINK];
-        if (link) referringURL = link;
+        if (link.length) referringURL = link;
     }
 
     // Clear link identifiers so they don't get reused on the next open

Branch-TestBed/Framework-Info.plist

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

Branch.framework/Info.plist

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

Branch.framework/Versions/A/Branch

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Branch"
-  s.version          = "0.25.2"
+  s.version          = "0.25.3"
   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?

Branch.podspec

@@ -1,5 +1,12 @@
 Branch iOS SDK Change Log
 
+- v0.25.3
+  * _*Master Release*_ - August 13, 2018
+  * Fixed an occasional double app open from being sent to Branch.
+  * Warning: Fabric no longer distributes third party kits like Branch. If you used Fabric to
+    integrate and update the Branch SDK, use one of the other methods for integrating Branch
+    as described [here, in our online documentation.](https://docs.branch.io/pages/apps/ios/#install-branch)
+
 - v0.25.2
   * _*Master Release*_ - August 3, 2018
   * IDFA is no longer sent when in debug mode for v2/events. DEVEX-685

ChangeLog.md

@@ -29,9 +29,6 @@ - (BOOL)application:(UIApplication *)application
 didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     BNCLogSetDisplayLevel(BNCLogLevelAll);
 
-    // Set to YES for testing GDPR compliance.
-    // [Branch setTrackingDisabled:YES];
-
     #if 0
     // This simulates tracking opt-in, rather than tracking opt-out.
     if (![[NSUserDefaults standardUserDefaults] boolForKey:@"hasRunBefore"]) {

Examples/UITestBed/UITestBed/TBAppDelegate.m

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