SDK-842 move location based on server team feedback. Need unit tests

Author: echo-branch

Branch-SDK/Branch-SDK/BNCDeviceInfo.m

@@ -149,6 +149,11 @@ - (NSDictionary *)v2dictionary {
     @synchronized (self) {
         [self checkAdvertisingIdentifier];
 
+        BOOL disableAdNetworkCallouts = [BNCPreferenceHelper preferenceHelper].disableAdNetworkCallouts;
+        if (disableAdNetworkCallouts) {
+            [dictionary setObject:[NSNumber numberWithBool:disableAdNetworkCallouts] forKey:@"disable_ad_network_callouts"];
+        }
+        
         if ([BNCPreferenceHelper preferenceHelper].isDebug) {
             dictionary[@"unidentified_device"] = @(YES);
         } else {

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

@@ -457,12 +457,6 @@ - (NSMutableDictionary *)prepareParamDict:(NSDictionary *)params
         fullParamDict[BRANCH_REQUEST_KEY_INSTRUMENTATION] = self.preferenceHelper.instrumentationDictionary;
     }
 
-    // TODO: follow up with server team to get format and value location correct
-    BOOL disableAdNetworkCallouts = self.preferenceHelper.disableAdNetworkCallouts;
-    if (disableAdNetworkCallouts) {
-        [fullParamDict setObject:[NSNumber numberWithInt:1] forKey:@"disable_ad_network_callouts"];
-    }
-    
     return fullParamDict;
 }
 
@@ -535,6 +529,11 @@ - (void)updateDeviceInfoToMutableDictionary:(NSMutableDictionary *)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];
+        
+        BOOL disableAdNetworkCallouts = self.preferenceHelper.disableAdNetworkCallouts;
+        if (disableAdNetworkCallouts) {
+            [dict setObject:[NSNumber numberWithBool:disableAdNetworkCallouts] forKey:@"disable_ad_network_callouts"];
+        }
     }
 }