Merge branch 'QA' of github.com:BranchMetrics/ios-branch-deep-linking into staging

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.21.15";
+NSString * const BNC_SDK_VERSION     = @"0.21.16";

Branch-SDK/Branch-SDK/BNCSystemObserver.m

@@ -214,24 +214,16 @@ + (BNCUpdateState) updateStateWithBuildDate:(NSDate*)buildDate
                            storedAppVersion:(NSString*)storedAppVersion
                           currentAppVersion:(NSString*)currentAppVersion {
 
-    if ([UIDevice currentDevice].systemVersion.floatValue > 10.3 &&
-        storedAppVersion.length <= 0) {
-        // iOS version greater than 10.2 and 10.3 since there were update problems there.
-        //
-        // Doesn't count re-installs or some enterprise distribution schemes.
-        // This solves the case where a user installs the app, doesn't run it,
-        // updates the app, then runs the app. These were being counted as updates
-        // rather than installs.
-        return BNCUpdateStateInstall;
-    }
-
     if (storedAppVersion) {
         if (currentAppVersion && [storedAppVersion isEqualToString:currentAppVersion])
             return BNCUpdateStateNonUpdate;
         else
             return BNCUpdateStateUpdate;
     }
 
+    // If there isn't a stored app version it might be because Branch is just starting to be used in
+    // this project.  So use the app dates to figure out if this is a new install or an update.
+
     if (buildDate && [buildDate timeIntervalSince1970] <= 0.0) {
         // Invalid buildDate.
         buildDate = nil;
@@ -241,15 +233,18 @@ + (BNCUpdateState) updateStateWithBuildDate:(NSDate*)buildDate
         appInstallDate = nil;
     }
 
-    if (!(buildDate && appInstallDate)) {
+    // If app dates can't be found it may be because iOS isn't reporting them.
+    if (buildDate == nil || appInstallDate == nil) {
+        BNCLogError(@"Please report this to Branch: Build date is %@ and install date is %@. iOS version %@.",
+            buildDate, appInstallDate, [UIDevice currentDevice].systemVersion);
         return BNCUpdateStateInstall;
     }
 
     if ([buildDate compare:appInstallDate] > 0) {
         return BNCUpdateStateUpdate;
     }
 
-    if ([appInstallDate timeIntervalSinceNow] > (-60.0 * 60.0 * 24.0)) {
+    if ([appInstallDate timeIntervalSinceNow] > (-7.0 * 24.0 * 60.0 * 60.0)) {
         return BNCUpdateStateInstall;
     }
 

Branch-TestBed/Framework-Info.plist

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

Branch.podspec

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

ChangeLog.md

@@ -1,6 +1,6 @@
 Branch iOS SDK Change Log
 
-- v0.21.15
+- v0.21.16
   * _*Master Release*_ - December 18, 2017
   * Fixed the BranchUniversalObject for v2-events & Updated the UITestBed. (#768)
   * Fix update / install tracking when app installed but not run for a while. (#763)

Examples/WebViewExample/Podfile.lock

@@ -1,7 +1,7 @@
 PODS:
-  - Branch (0.21.14):
-    - Branch/Core (= 0.21.14)
-  - Branch/Core (0.21.14)
+  - Branch (0.21.15):
+    - Branch/Core (= 0.21.15)
+  - Branch/Core (0.21.15)
   - Cartography (3.0.1)
   - MBProgressHUD (1.1.0)
 
@@ -15,7 +15,7 @@ EXTERNAL SOURCES:
     :path: ../..
 
 SPEC CHECKSUMS:
-  Branch: 1d09c85256236f067dfa96944709f1f011ec17c0
+  Branch: ef9a9e74484e135beb9aa759a3174845a35f1795
   Cartography: f8c899bb0f5cf20758644a8eea59a75e98a03a5d
   MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
 

carthage-files/Info.plist

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

scripts/version

@@ -31,7 +31,7 @@ Options:
 USAGE
 }
 
-version=0.21.15
+version=0.21.16
 
 if (( $# == 0 )); then
     echo $version