SDK-562 add values to open/install

Author: echo-branch

Branch-SDK/Branch-SDK/BNCDeviceInfo.m

@@ -171,7 +171,7 @@ - (NSDictionary *)v2dictionary {
         [dictionary bnc_safeSetObject:self.locale forKey:@"locale"];
         [dictionary bnc_safeSetObject:self.country forKey:@"country"];
         [dictionary bnc_safeSetObject:self.language forKey:@"language"];
-        [dictionary bnc_safeSetObject:self.carrierName forKey:@"carrier_name"];
+        [dictionary bnc_safeSetObject:self.carrierName forKey:@"device_carrier"];
         [dictionary bnc_safeSetObject:[self connectionType] forKey:@"connection_type"];
         [dictionary bnc_safeSetObject:[BNCUserAgentCollector instance].userAgent forKey:@"user_agent"];
 

Branch-SDK/Branch-SDK/Networking/BNCServerInterface.m

@@ -919,19 +919,28 @@ - (void)updateDeviceInfoToMutableDictionary:(NSMutableDictionary *)dict {
 
         [self safeSetValue:deviceInfo.osName forKey:BRANCH_REQUEST_KEY_OS onDict:dict];
         [self safeSetValue:deviceInfo.osVersion forKey:BRANCH_REQUEST_KEY_OS_VERSION onDict:dict];
-        // environment
+        [self safeSetValue:deviceInfo.osBuildVersion forKey:@"build" onDict:dict];
+        [self safeSetValue:deviceInfo.extensionType forKey:@"environment" onDict:dict];
+        [self safeSetValue:deviceInfo.locale forKey:@"locale" onDict:dict];
         [self safeSetValue:deviceInfo.country forKey:@"country" onDict:dict];
         [self safeSetValue:deviceInfo.language forKey:@"language" onDict:dict];
         [self safeSetValue:deviceInfo.brandName forKey:BRANCH_REQUEST_KEY_BRAND onDict:dict];
-        // application version
         [self safeSetValue:deviceInfo.modelName forKey:BRANCH_REQUEST_KEY_MODEL onDict:dict];
-        // screen dpi
+        [self safeSetValue:deviceInfo.cpuType forKey:@"cpu_type" onDict:dict];
+        [self safeSetValue:deviceInfo.screenScale forKey:@"screen_dpi" onDict:dict];
         [self safeSetValue:deviceInfo.screenHeight forKey:BRANCH_REQUEST_KEY_SCREEN_HEIGHT onDict:dict];
         [self safeSetValue:deviceInfo.screenWidth forKey:BRANCH_REQUEST_KEY_SCREEN_WIDTH onDict:dict];
+        [self safeSetValue:deviceInfo.carrierName forKey:@"device_carrier" onDict:dict];
+        
         [self safeSetValue:[deviceInfo localIPAddress] forKey:@"local_ip" onDict:dict];
+        [self safeSetValue:[deviceInfo connectionType] forKey:@"connection_type" onDict:dict];
         [self safeSetValue:[deviceInfo userAgentString] forKey:@"user_agent" onDict:dict];
 
         [self safeSetValue:@(deviceInfo.isAdTrackingEnabled) forKey:BRANCH_REQUEST_KEY_AD_TRACKING_ENABLED onDict:dict];
+        
+        [self safeSetValue:deviceInfo.applicationVersion forKey:@"app_version" onDict:dict];
+        [self safeSetValue:deviceInfo.pluginName forKey:@"plugin_name" onDict:dict];
+        [self safeSetValue:deviceInfo.pluginVersion forKey:@"plugin_version" onDict:dict];
     }
 }
 

Branch-TestBed/Branch-TestBed.xcodeproj/xcshareddata/xcschemes/Branch-TestBed.xcscheme

@@ -77,11 +77,6 @@
                BlueprintName = "Branch-SDK-Tests"
                ReferencedContainer = "container:Branch-TestBed.xcodeproj">
             </BuildableReference>
-            <SkippedTests>
-               <Test
-                  Identifier = "BranchSDKFunctionalityTests">
-               </Test>
-            </SkippedTests>
             <DeviceAppData
                resolvedPath = "../Simulate-FirstRun.xcappdata">
             </DeviceAppData>