Merge pull request #504 from BranchMetrics/upgrade

Upgrade to Android SDK 2.19.4 & 0.25.5

Author: Aaron Lopez

plugin.xml

@@ -137,6 +137,8 @@ SOFTWARE.
     <source-file src="src/ios/dependencies/Branch-SDK/BNCStrongMatchHelper.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCSystemObserver.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCSystemObserver.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/BNCThreads.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/BNCThreads.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCURLBlackList.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCURLBlackList.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/Branch+Validator.h" />

src/android/dependencies/Branch.jar

@@ -49,4 +49,6 @@
 /// Returns a dictionary of device / identity pairs.
 @property (atomic, readonly) NSDictionary<NSString*, NSString*>*_Nonnull deviceKeyIdentityValueDictionary;
 
+/// The team identifier for the app.
+@property (atomic, readonly) NSString*_Nullable teamID;
 @end

src/ios/dependencies/Branch-SDK/BNCApplication.h

@@ -48,6 +48,14 @@ + (BNCApplication*) createCurrentApplication {
     application->_firstInstallDate = [BNCApplication firstInstallDate];
     application->_currentInstallDate = [BNCApplication currentInstallDate];
 
+    NSString*group =  [BNCKeyChain securityAccessGroup];
+    if (group) {
+        NSRange range = [group rangeOfString:@"."];
+        if (range.location != NSNotFound) {
+            application->_teamID = [[group substringToIndex:range.location] copy];
+        }
+    }
+
     return application;
 }
 
@@ -93,7 +101,7 @@ + (NSDate*) firstInstallBuildDate {
         forService:kBranchKeychainService
         key:kBranchKeychainFirstBuildKey
         cloudAccessGroup:nil];
-
+    if (error) BNCLogError(@"Keychain store: %@.", error);
     return firstBuildDate;
 }
 
@@ -128,7 +136,7 @@ + (NSDate*) firstInstallDate {
         forService:kBranchKeychainService
         key:kBranchKeychainFirstInstalldKey
         cloudAccessGroup:nil];
-
+    if (error) BNCLogError(@"Keychain store: %@.", error);
     return firstInstallDate;
 }
 
@@ -146,3 +154,16 @@ - (NSDictionary*) deviceKeyIdentityValueDictionary {
 }
 
 @end
+
+@implementation BNCApplication (BNCTest)
+
+- (void) setAppOriginalInstallDate:(NSDate*)originalInstallDate
+        firstInstallDate:(NSDate*)firstInstallDate
+        lastUpdateDate:(NSDate*)lastUpdateDate {
+    self->_currentInstallDate = firstInstallDate;        // latest_install_time
+    self->_firstInstallDate = originalInstallDate;       // first_install_time
+    self->_currentBuildDate = lastUpdateDate;            // lastest_update_time
+}
+
+@end
+

src/ios/dependencies/Branch-SDK/BNCApplication.m

@@ -578,7 +578,7 @@ - (void)makeRequest:(BNCServerInterface *)serverInterface
 	if (self.commerceDictionary)
 		params[@"commerce_data"] = self.commerceDictionary;
     if (preferenceHelper.limitFacebookTracking)
-        params[@"limit_facebook_tracking"] = CFBridgingRelease(kCFBooleanTrue);
+        params[@"limit_facebook_tracking"] = (__bridge NSNumber*) kCFBooleanTrue;
 
 	NSString *URL = [preferenceHelper getAPIURL:BRANCH_REQUEST_ENDPOINT_USER_COMPLETED_ACTION];
     [serverInterface postRequest:params

src/ios/dependencies/Branch-SDK/BNCCommerceEvent.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.24.2";
+NSString * const BNC_SDK_VERSION     = @"0.25.5";

src/ios/dependencies/Branch-SDK/BNCConfig.m

@@ -93,7 +93,7 @@ BOOL BNCDebuggerIsAttached() {
 
     uint count = 0;
     Ivar *ivars = class_copyIvarList(class, &count);
-    for (uint i = 0; i < count; ++i) {
+    for (uint i = 0; ivars && i < count; ++i) {
         const char* encoding = ivar_getTypeEncoding(ivars[i]);
         const char* ivarName = ivar_getName(ivars[i]);
         const void* ivarPtr = nil;
@@ -174,7 +174,7 @@ BOOL BNCDebuggerIsAttached() {
 
     count = 0;
     objc_property_t *properties = class_copyPropertyList(class, &count);
-    for (int i = 0; i < count; ++i)
+    for (int i = 0; properties && i < count; ++i)
         [result appendFormat:@"\tProperty name: '%s'.\n", property_getName(properties[i])];
     if (properties) free(properties);
 

src/ios/dependencies/Branch-SDK/BNCDebug.m

@@ -430,7 +430,11 @@ - (NSDictionary*) v2dictionary {
     addString(osVersion,            os_version);
     addString(extensionType,        environment);
     addString(vendorId,             idfv);
-    addString(adId,                 idfa);
+    if ([BNCPreferenceHelper preferenceHelper].isDebug) {
+        dictionary[@"unidentified_device"] = (__bridge NSNumber*) kCFBooleanTrue;
+    } else {
+        addString(adId,             idfa);
+    }
     addString(browserUserAgent,     user_agent);
     addString(country,              country);
     addString(language,             language);
@@ -446,7 +450,7 @@ - (NSDictionary*) v2dictionary {
     #include "BNCFieldDefines.h"
 
     if (!self.isAdTrackingEnabled)
-        dictionary[@"limit_ad_tracking"] = CFBridgingRelease(kCFBooleanTrue);
+        dictionary[@"limit_ad_tracking"] = (__bridge NSNumber*) kCFBooleanTrue;
 
     NSString *s = nil;
     BNCPreferenceHelper *preferences = [BNCPreferenceHelper preferenceHelper];
@@ -458,7 +462,7 @@ - (NSDictionary*) v2dictionary {
     if (s.length) dictionary[@"device_fingerprint_id"] = s;
 
     if (preferences.limitFacebookTracking)
-        dictionary[@"limit_facebook_tracking"] = CFBridgingRelease(kCFBooleanTrue);
+        dictionary[@"limit_facebook_tracking"] = (__bridge NSNumber*) kCFBooleanTrue;
 
     dictionary[@"sdk"] = @"ios";
     dictionary[@"sdk_version"] = BNC_SDK_VERSION;

src/ios/dependencies/Branch-SDK/BNCDeviceInfo.m

@@ -439,7 +439,7 @@ + (NSData *) dataFromHexString:(NSString*)string {
     int highValue = -1;
     const uint8_t *p = (const uint8_t*) [inputData bytes];
     for (NSUInteger i = 0; i < inputData.length; ++i) {
-        int value = -1;
+        int value;
         if (*p >= '0' && *p <= '9')
             value = *p - '0';
         else

src/ios/dependencies/Branch-SDK/BNCEncodingUtils.m

@@ -1,10 +1,12 @@
-//
-//  BNCError.h
-//  Branch-SDK
-//
-//  Created by Qinwei Gong on 11/17/14.
-//  Copyright (c) 2014 Branch Metrics. All rights reserved.
-//
+/**
+ @file          BNCError.h
+ @package       Branch-SDK
+ @brief         Branch errors.
+
+ @author        Qinwei Gong
+ @date          November 2014
+ @copyright     Copyright © 2014 Branch. All rights reserved.
+*/
 
 #if __has_feature(modules)
 @import Foundation;
@@ -40,4 +42,5 @@ typedef NS_ENUM(NSInteger, BNCErrorCode) {
 + (NSError*_Nonnull) branchErrorWithCode:(BNCErrorCode)errorCode localizedMessage:(NSString*_Nullable)message;
 @end
 
-void BNCForceNSErrorCategoryToLoad(void) __attribute__((constructor));
+void BNCForceNSErrorCategoryToLoad(void)
+    __attribute__((constructor));