Merge pull request #348 from BranchMetrics/ios-vendor-id

send vendor id with each request

Author: aaustin

Branch-SDK/Branch-SDK/BNCDeviceInfo.h

@@ -19,6 +19,7 @@
 @property (nonatomic, strong) NSString *hardwareId;
 @property (nonatomic, strong) NSString *hardwareIdType;
 @property (nonatomic) BOOL isRealHardwareId;
+@property (nonatomic, strong) NSString *vendorId;
 @property (nonatomic, strong) NSString *brandName;
 @property (nonatomic, strong) NSString *modelName;
 @property (nonatomic, strong) NSString *osName;

Branch-SDK/Branch-SDK/BNCDeviceInfo.m

@@ -38,6 +38,7 @@ - (id)init {
             self.hardwareIdType = hardwareIdType;
         }
 
+        self.vendorId = [BNCSystemObserver getVendorId:preferenceHelper.isDebug];
         self.brandName = [BNCSystemObserver getBrand];
         self.modelName = [BNCSystemObserver getModel];
         self.osName = [BNCSystemObserver getOS];

Branch-SDK/Branch-SDK/BNCServerInterface.m

@@ -260,6 +260,7 @@ - (void)updateDeviceInfoToMutableDictionary:(NSMutableDictionary *)dict {
         dict[BRANCH_REQUEST_KEY_IS_HARDWARE_ID_REAL] = @(deviceInfo.isRealHardwareId);
     }
 
+    [self safeSetValue:deviceInfo.vendorId forKey:BRANCH_REQUEST_KEY_IOS_VENDOR_ID onDict:dict];
     [self safeSetValue:deviceInfo.brandName forKey:BRANCH_REQUEST_KEY_BRAND onDict:dict];
     [self safeSetValue:deviceInfo.modelName forKey:BRANCH_REQUEST_KEY_MODEL onDict:dict];
     [self safeSetValue:deviceInfo.osName forKey:BRANCH_REQUEST_KEY_OS onDict:dict];

Branch-SDK/Branch-SDK/BNCSystemObserver.h

@@ -11,6 +11,7 @@
 @interface BNCSystemObserver : NSObject
 
 + (NSString *)getUniqueHardwareId:(BOOL *)isReal isDebug:(BOOL)debug andType:(NSString **)type;
++ (NSString *)getVendorId:(BOOL)debug;
 + (NSString *)getDefaultUriScheme;
 + (NSString *)getAppVersion;
 + (NSString *)getBundleID;

Branch-SDK/Branch-SDK/BNCSystemObserver.m

@@ -44,6 +44,16 @@ + (NSString *)getUniqueHardwareId:(BOOL *)isReal isDebug:(BOOL)debug andType:(NS
     return uid;
 }
 
++ (NSString *)getVendorId:(BOOL)debug {
+    NSString *vendorId = nil;
+    
+    if (!debug && NSClassFromString(@"UIDevice")) {
+        vendorId = [[UIDevice currentDevice].identifierForVendor UUIDString];
+    }
+    
+    return vendorId;
+}
+
 + (BOOL)adTrackingSafe {
     Class ASIdentifierManagerClass = NSClassFromString(@"ASIdentifierManager");
     if (ASIdentifierManagerClass) {

Branch-SDK/Branch-SDK/BranchConstants.h

@@ -40,6 +40,7 @@ extern NSString * const BRANCH_REQUEST_KEY_APP_LIST;
 extern NSString * const BRANCH_REQUEST_KEY_HARDWARE_ID;
 extern NSString * const BRANCH_REQUEST_KEY_HARDWARE_ID_TYPE;
 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_IS_REFERRABLE;
 extern NSString * const BRANCH_REQUEST_KEY_DEBUG;

Branch-SDK/Branch-SDK/BranchConstants.m

@@ -40,6 +40,7 @@
 NSString * const BRANCH_REQUEST_KEY_HARDWARE_ID = @"hardware_id";
 NSString * const BRANCH_REQUEST_KEY_HARDWARE_ID_TYPE = @"hardware_id_type";
 NSString * const BRANCH_REQUEST_KEY_IS_HARDWARE_ID_REAL = @"is_hardware_id_real";
+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_IS_REFERRABLE = @"is_referrable";
 NSString * const BRANCH_REQUEST_KEY_DEBUG = @"debug";