SDK-550 repurposed old update flag to indicate an app that migrates from Tune SDK to Branch SDK.

Author: echo-branch

Branch-SDK-Tests/BranchOpenRequestTests.m

@@ -93,7 +93,7 @@ - (void)testRequestBodyWithNoFingerprintID {
         @"lastest_update_time":         BNCWireFormatFromDate(installDate),
         @"first_install_time":          BNCWireFormatFromDate(installDate),
         @"previous_update_time":        BNCWireFormatFromDate(updateDate),
-        @"update":                      @1,
+        @"update":                      @0,
         @"apple_testflight":            @0
     }];
     if (!self.class.isApplication) expectedParams[@"ios_team_id"] = nil;
@@ -174,7 +174,7 @@ - (void)testRequestBodyWithFingerprintID {
         @"lastest_update_time":         BNCWireFormatFromDate(installDate),
         @"first_install_time":          BNCWireFormatFromDate(installDate),
         @"previous_update_time":        BNCWireFormatFromDate(updateDate),
-        @"update":                      @1,
+        @"update":                      @0,
         @"apple_testflight":            @0
     }];
     if (!self.class.isApplication) expectedParams[@"ios_team_id"] = nil;

Branch-SDK/Branch-SDK/BNCTuneUtility.m

@@ -12,12 +12,16 @@ @implementation BNCTuneUtility
 
 // INTENG-7695 Tune data indicates an app upgrading from Tune SDK to Branch SDK
 + (BOOL)isTuneDataPresent {
-    NSString *tuneMatIdKey = @"_TUNE_mat_id";
-    NSString *matId = [[NSUserDefaults standardUserDefaults] stringForKey:tuneMatIdKey];
-    if (matId && [matId length] > 0) {
-        return YES;
-    }
-    return NO;
+    __block BOOL isPresent = NO;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        NSString *tuneMatIdKey = @"_TUNE_mat_id";
+        NSString *matId = [[NSUserDefaults standardUserDefaults] stringForKey:tuneMatIdKey];
+        if (matId && [matId length] > 0) {
+            isPresent = YES;
+        }
+    });
+    return isPresent;
 }
 
 @end

Branch-SDK/Branch-SDK/Branch.m

@@ -42,7 +42,6 @@
 #import "BNCURLBlackList.h"
 #import "BNCUserAgentCollector.h"
 #import "BNCDeviceInfo.h"
-#import "BNCTuneUtility.h"
 #import <stdatomic.h>
 
 NSString * const BRANCH_FEATURE_TAG_SHARE = @"share";
@@ -2251,7 +2250,7 @@ - (void)initUserSessionAndCallCallback:(BOOL)callCallback {
 
 - (void)initializeSession {
 	Class clazz = [BranchInstallRequest class];
-	if (self.preferenceHelper.identityID || [BNCTuneUtility isTuneDataPresent]) {
+	if (self.preferenceHelper.identityID) {
 		clazz = [BranchOpenRequest class];
 	}
 

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

@@ -18,6 +18,7 @@
 #import "Branch.h"
 #import "BNCApplication.h"
 #import "BNCAppleReceipt.h"
+#import "BNCTuneUtility.h"
 
 @interface BranchOpenRequest ()
 @property (assign, nonatomic) BOOL isInstall;
@@ -99,42 +100,22 @@ - (void)makeRequest:(BNCServerInterface *)serverInterface key:(NSString *)key ca
 }
 
 typedef NS_ENUM(NSInteger, BNCUpdateState) {
-    BNCUpdateStateInstall       = 0,    // App was recently installed.
-    BNCUpdateStateNonUpdate     = 1,    // App was neither newly installed nor updated.
-    BNCUpdateStateUpdate        = 2,    // App was recently updated.
-
-//  BNCUpdateStateError         = 3,    // Error determining update state.
-//  BNCUpdateStateReinstall     = 4     // App was re-installed.
+// Deprecated states, however older SDKs still send them.  The server will ignores these values.
+//    BNCUpdateStateInstall       = 0,    // App was recently installed.
+//    BNCUpdateStateNonUpdate     = 1,    // App was neither newly installed nor updated.
+//    BNCUpdateStateUpdate        = 2,    // App was recently updated.
+//    BNCUpdateStateError         = 3,    // Error determining update state.
+//    BNCUpdateStateReinstall     = 4,    // App was re-installed.
+    
+    BNCUpdateStateUnknown = 0,       // App update status is unknown
+    BNCUpdateStateTuneMigration = 5  // App was migrated from Tune SDK to Branch SDK
 };
 
-+ (NSNumber*) appUpdateState {
-
-    BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper preferenceHelper];
-    BNCApplication *application = [BNCApplication currentApplication];
-    NSTimeInterval first_install_time   = application.firstInstallDate.timeIntervalSince1970;
-    NSTimeInterval latest_install_time  = application.currentInstallDate.timeIntervalSince1970;
-    NSTimeInterval latest_update_time   = application.currentBuildDate.timeIntervalSince1970;
-    NSTimeInterval previous_update_time = preferenceHelper.previousAppBuildDate.timeIntervalSince1970;
-    NSTimeInterval const kOneDay        = 1.0 * 24.0 * 60.0 * 60.0;
-
-    BNCUpdateState update_state = 0;
-    if (first_install_time <= 0.0 ||
-        latest_install_time <= 0.0 ||
-        latest_update_time <= 0.0 ||
-        previous_update_time > latest_update_time)
-        update_state = BNCUpdateStateNonUpdate; // Error: Send Non-update.
-    else
-    if ((latest_update_time - kOneDay) <= first_install_time && previous_update_time <= 0)
-        update_state = BNCUpdateStateInstall;
-    else
-    if (first_install_time < latest_install_time && previous_update_time <= 0)
-        update_state = BNCUpdateStateUpdate; // Re-install: Send Update.
-    else
-    if (latest_update_time > first_install_time && previous_update_time < latest_update_time)
-        update_state = BNCUpdateStateUpdate;
-    else
-        update_state = BNCUpdateStateNonUpdate;
-
++ (NSNumber *)appUpdateState {
+    BNCUpdateState update_state = BNCUpdateStateUnknown;
+    if ([BNCTuneUtility isTuneDataPresent]) {
+        update_state = BNCUpdateStateTuneMigration;
+    }
     return @(update_state);
 }