Update ServerRequest.java

Author: nsingh-branch

Branch-SDK/src/main/java/io/branch/referral/ServerRequest.java

@@ -444,9 +444,11 @@ void updateGAdsParams() {
         int LATVal = DeviceInfo.getInstance().getSystemObserver().getLATVal();
         String gaid = DeviceInfo.getInstance().getSystemObserver().getAID();
         if (!TextUtils.isEmpty(gaid)) {
-            updateAdvertisingIdsObject(gaid);
-            // gaid is put in the request body below, calling to remove hardware id from request now
-            replaceHardwareIdOnValidAdvertisingId();
+            if (prefHelper_.getConsumerProtectionAttributionLevel() == Defines.BranchAttributionLevel.FULL || !prefHelper_.isAttributionLevelInitialized()) {
+                updateAdvertisingIdsObject(gaid);
+                // gaid is put in the request body below, calling to remove hardware id from request now
+                replaceHardwareIdOnValidAdvertisingId();
+            }
         }
         try {
             if (version == BRANCH_API_VERSION.V1) {
@@ -455,7 +457,9 @@ void updateGAdsParams() {
                     if (!SystemObserver.isHuaweiMobileServicesAvailable(context_)) {
                         // Fire OS overloads ad id (representing it as Google ad id at the top level),
                         // HUAWEI only reports ad id in the advertising_ids object
-                        params_.put(Defines.Jsonkey.GoogleAdvertisingID.getKey(), gaid);
+                        if (prefHelper_.getConsumerProtectionAttributionLevel() == Defines.BranchAttributionLevel.FULL || !prefHelper_.isAttributionLevelInitialized()) {
+                            params_.put(Defines.Jsonkey.GoogleAdvertisingID.getKey(), gaid);
+                        }
                     }
                     params_.remove(Defines.Jsonkey.UnidentifiedDevice.getKey());
                 } else if (!payloadContainsDeviceIdentifiers(params_) &&
@@ -470,7 +474,9 @@ void updateGAdsParams() {
                         if (!SystemObserver.isHuaweiMobileServicesAvailable(context_)) {
                             // Fire OS overloads ad id (representing it as Google ad id at the top level),
                             // HUAWEI only reports ad id in the advertising_ids object
-                            userDataObj.put(Defines.Jsonkey.AAID.getKey(), gaid);
+                            if (prefHelper_.getConsumerProtectionAttributionLevel() == Defines.BranchAttributionLevel.FULL || !prefHelper_.isAttributionLevelInitialized()) {
+                                userDataObj.put(Defines.Jsonkey.AAID.getKey(), gaid);
+                            }
                         }
                         userDataObj.remove(Defines.Jsonkey.UnidentifiedDevice.getKey());
                     } else if (!payloadContainsDeviceIdentifiers(userDataObj) &&
@@ -656,6 +662,7 @@ void doFinalUpdateOnBackgroundThread() {
         updateDisableAdNetworkCallouts();
         //Google ADs ID  and LAT value are updated using reflection. These method need background thread
         //So updating them for install and open on background thread.
+
         if (isGAdsParamsRequired()) {
             updateGAdsParams();
         }
@@ -749,11 +756,13 @@ public void onPreExecute() {
                 String externalIntentUri = prefHelper_.getExternalIntentUri();
                 utility.parseReferringURL(externalIntentUri);
 
-                JSONObject urlQueryParams = utility.getURLQueryParamsForRequest(this);
+                if (prefHelper_.getConsumerProtectionAttributionLevel() == Defines.BranchAttributionLevel.FULL || !prefHelper_.isAttributionLevelInitialized()) {
+                    JSONObject urlQueryParams = utility.getURLQueryParamsForRequest(this);
 
-                for (Iterator<String> it = urlQueryParams.keys(); it.hasNext(); ) {
-                    String key = it.next();
-                    this.params_.put(key, urlQueryParams.get(key));
+                    for (Iterator<String> it = urlQueryParams.keys(); it.hasNext(); ) {
+                        String key = it.next();
+                        this.params_.put(key, urlQueryParams.get(key));
+                    }
                 }
 
             } catch (Exception e) {