[release] 1.39.1

Author: branch-sdkteam

Branch-SDK/BNCConfig.m

@@ -11,4 +11,4 @@
 NSString * const BNC_API_BASE_URL    = @"https://api2.branch.io";
 NSString * const BNC_API_VERSION     = @"v1";
 NSString * const BNC_LINK_URL        = @"https://bnc.lt";
-NSString * const BNC_SDK_VERSION     = @"1.39.0";
+NSString * const BNC_SDK_VERSION     = @"1.39.1";

Branch-SDK/BNCDeviceInfo.h

@@ -35,6 +35,7 @@
 @property (nonatomic, copy, readwrite) NSString *advertiserId;
 @property (nonatomic, copy, readwrite) NSString *vendorId;
 @property (nonatomic, copy, readwrite) NSString *optedInStatus;
+@property (nonatomic, assign, readwrite) BOOL isFirstOptIn;
 @property (nonatomic, assign, readwrite) BOOL isAdTrackingEnabled;
 @property (nonatomic, assign, readwrite) BOOL unidentifiedDevice;
 - (NSString *)localIPAddress;

Branch-SDK/BNCDeviceInfo.m

@@ -147,6 +147,14 @@ - (NSString *)userAgentString {
 // IDFA should never be cached
 - (void)checkAdvertisingIdentifier {
     self.optedInStatus = [BNCSystemObserver attOptedInStatus];
+    
+    // indicate if this is first time we've seen the user opt in, this reduces work on the server
+    if ([self.optedInStatus isEqualToString:@"authorized"] && ![BNCPreferenceHelper preferenceHelper].hasOptedInBefore) {
+        self.isFirstOptIn = YES;
+    } else {
+        self.isFirstOptIn = NO;
+    }
+    
     self.isAdTrackingEnabled = [BNCSystemObserver adTrackingSafe];
     self.advertiserId = [BNCSystemObserver getAdId];
     BOOL ignoreIdfa = [BNCPreferenceHelper preferenceHelper].isDebug;

Branch-SDK/BNCPreferenceHelper.h

@@ -36,6 +36,7 @@ NSURL* /* _Nonnull */ BNCURLForBranchDirectory(void);
 @property (assign, nonatomic) BOOL checkedFacebookAppLinks;
 @property (assign, nonatomic) BOOL checkedAppleSearchAdAttribution;
 @property (nonatomic, assign, readwrite) BOOL appleAttributionTokenChecked;
+@property (nonatomic, assign, readwrite) BOOL hasOptedInBefore;
 @property (assign, nonatomic) NSInteger retryCount;
 @property (assign, nonatomic) NSTimeInterval retryInterval;
 @property (assign, nonatomic) NSTimeInterval timeout;

Branch-SDK/BNCPreferenceHelper.m

@@ -392,6 +392,14 @@ - (BOOL)appleAttributionTokenChecked {
     return [self readBoolFromDefaults:@"_appleAttributionTokenChecked"];
 }
 
+- (void)setHasOptedInBefore:(BOOL)hasOptedInBefore {
+    [self writeBoolToDefaults:@"_hasOptedInBefore" value:hasOptedInBefore];
+}
+
+- (BOOL)hasOptedInBefore {
+    return [self readBoolFromDefaults:@"_hasOptedInBefore"];
+}
+
 - (NSString*) lastSystemBuildVersion {
     if (!_lastSystemBuildVersion) {
         _lastSystemBuildVersion = [self readStringFromDefaults:@"_lastSystemBuildVersion"];

Branch-SDK/BNCServerInterface.m

@@ -16,6 +16,7 @@
 #import "BNCLog.h"
 #import "Branch.h"
 #import "NSString+Branch.h"
+#import "BNCApplication.h"
 
 @interface BNCServerInterface ()
 @property (strong) NSString *requestEndpoint;
@@ -528,6 +529,12 @@ - (void)updateDeviceInfoToMutableDictionary:(NSMutableDictionary *)dict {
         [self safeSetValue:[deviceInfo userAgentString] forKey:@"user_agent" onDict:dict];
 
         [self safeSetValue:[deviceInfo optedInStatus] forKey:BRANCH_REQUEST_KEY_OPTED_IN_STATUS onDict:dict];
+        
+        if ([self installDateIsRecent] && [deviceInfo isFirstOptIn]) {
+            [self safeSetValue:@(deviceInfo.isFirstOptIn) forKey:BRANCH_REQUEST_KEY_FIRST_OPT_IN onDict:dict];
+            [BNCPreferenceHelper preferenceHelper].hasOptedInBefore = YES;
+        }
+        
         [self safeSetValue:@(deviceInfo.isAdTrackingEnabled) forKey:BRANCH_REQUEST_KEY_AD_TRACKING_ENABLED onDict:dict];
 
         [self safeSetValue:deviceInfo.applicationVersion forKey:@"app_version" onDict:dict];
@@ -541,6 +548,20 @@ - (void)updateDeviceInfoToMutableDictionary:(NSMutableDictionary *)dict {
     }
 }
 
+// we do not need to send first_opt_in, if the install is older than 30 days
+- (BOOL)installDateIsRecent {
+    //NSTimeInterval maxTimeSinceInstall = 60.0;
+    NSTimeInterval maxTimeSinceInstall = 3600.0 * 24.0 * 30;
+    NSDate *now = [NSDate date];
+    NSDate *maxDate = [[BNCApplication currentApplication].currentInstallDate dateByAddingTimeInterval:maxTimeSinceInstall];
+    
+    if ([now compare:maxDate] == NSOrderedDescending) {
+        return NO;
+    } else {
+        return YES;
+    }
+}
+
 - (NSMutableDictionary*)updateDeviceInfoToParams:(NSDictionary *)params {
     NSMutableDictionary *extendedParams=[[NSMutableDictionary alloc] init];
     [extendedParams addEntriesFromDictionary:params];

Branch-SDK/BranchConstants.h

@@ -46,6 +46,7 @@ extern NSString * const BRANCH_REQUEST_KEY_IS_HARDWARE_ID_REAL;
 extern NSString * const BRANCH_REQUEST_KEY_IOS_VENDOR_ID;
 extern NSString * const BRANCH_REQUEST_KEY_AD_TRACKING_ENABLED;
 extern NSString * const BRANCH_REQUEST_KEY_OPTED_IN_STATUS;
+extern NSString * const BRANCH_REQUEST_KEY_FIRST_OPT_IN;
 extern NSString * const BRANCH_REQUEST_KEY_DEBUG;
 extern NSString * const BRANCH_REQUEST_KEY_BUNDLE_ID;
 extern NSString * const BRANCH_REQUEST_KEY_TEAM_ID;

Branch-SDK/BranchConstants.m

@@ -42,6 +42,7 @@
 NSString * const BRANCH_REQUEST_KEY_IOS_VENDOR_ID = @"ios_vendor_id";
 NSString * const BRANCH_REQUEST_KEY_AD_TRACKING_ENABLED = @"ad_tracking_enabled";
 NSString * const BRANCH_REQUEST_KEY_OPTED_IN_STATUS = @"opted_in_status";
+NSString * const BRANCH_REQUEST_KEY_FIRST_OPT_IN = @"first_opt_in";
 NSString * const BRANCH_REQUEST_KEY_DEBUG = @"debug";
 NSString * const BRANCH_REQUEST_KEY_BUNDLE_ID = @"ios_bundle_id";
 NSString * const BRANCH_REQUEST_KEY_TEAM_ID = @"ios_team_id";

Branch-TestBed/Framework-Info.plist

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

Branch.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Branch"
-  s.version          = "1.39.0"
+  s.version          = "1.39.1"
   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?
@@ -32,5 +32,5 @@ Use the Branch SDK (branch.io) to create and power the links that point back to
 	"Branch-SDK/BranchShareLink.{h,m}"
 
   s.frameworks = 'CoreServices', 'SystemConfiguration'
-  s.ios.frameworks = 'WebKit', 'iAd', 'CoreTelephony', 'AdServices'
+  s.ios.frameworks = 'WebKit', 'iAd', 'CoreTelephony'
 end