Updated enum and changed request format

Author: nsingh-branch

Branch-SDK-Automation-TestBed/src/main/java/io/branch/branchandroiddemo/BranchWrapper.java

@@ -260,24 +260,18 @@ public void setAttributionLevel(Intent intent){
         if (testDataStr != null) {
 
             TestData testDataObj = new TestData();
-            String level = testDataObj.getParamValue(testDataStr,"consumer_protection_attribution_level");
+            String level = testDataObj.getParamValue(testDataStr,"cpp_level");
 
             //Set the level based on the level value
-            if (Objects.equals(level, "0")) {
-                Branch.getInstance().setConsumerProtectionAttributionLevel(Defines.BranchAttributionLevel.FULL);
-            } else if (Objects.equals(level, "1")) {
-                Branch.getInstance().setConsumerProtectionAttributionLevel(Defines.BranchAttributionLevel.REDUCED);
-            } else if (Objects.equals(level, "2")) {
-                Branch.getInstance().setConsumerProtectionAttributionLevel(Defines.BranchAttributionLevel.MINIMAL);
-            } else if (Objects.equals(level, "3")) {
-                Branch.getInstance().setConsumerProtectionAttributionLevel(Defines.BranchAttributionLevel.NONE);
-            } else {
-                showLogWindow("Invalid consumer_protection_attribution_level", true, ctx, Constants.SET_ATTRIBUTION_LEVEL);
+            try {
+                Defines.BranchAttributionLevel attributionLevel = Defines.BranchAttributionLevel.valueOf(level.toUpperCase());
+                Branch.getInstance().setConsumerProtectionAttributionLevel(attributionLevel);
+            } catch (IllegalArgumentException e) {
+                showLogWindow("Invalid cpp_level", true, ctx, Constants.SET_ATTRIBUTION_LEVEL);
             }
 
-
         } else {
-            showLogWindow( "Test Data : Null" , true, ctx,Constants.SET_ATTRIBUTION_LEVEL);
+            showLogWindow( "Test Data: Null" , true, ctx,Constants.SET_ATTRIBUTION_LEVEL);
         }
     }
 }

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

@@ -225,7 +225,7 @@ public enum Jsonkey {
         DMA_Ad_User_Data("dma_ad_user_data"),
         Is_Meta_Click_Through("is_meta_ct"),
 
-        Consumer_Protection_Attribution_Level("consumer_protection_attribution_level");
+        Consumer_Protection_Attribution_Level("cpp_level");
 
         private final String key;
 

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

@@ -1438,11 +1438,11 @@ static void loadPartnerParams(JSONObject body, BranchPartnerParameters partnerPa
      * @return A {@link Defines.BranchAttributionLevel} value representing the attribution level set.
      */
     public Defines.BranchAttributionLevel getConsumerProtectionAttributionLevel() {
-        int levelInt = getInteger(KEY_CONSUMER_PROTECTION_ATTRIBUTION_LEVEL, -1);
-        if (levelInt == -1) {
-            return null;
+        String levelString = getString(KEY_CONSUMER_PROTECTION_ATTRIBUTION_LEVEL);
+        if (levelString.equals(NO_STRING_VALUE)) {
+            return Defines.BranchAttributionLevel.FULL;
         } else {
-            return Defines.BranchAttributionLevel.values()[levelInt];
+            return Defines.BranchAttributionLevel.valueOf(levelString);
         }
     }
 
@@ -1452,6 +1452,13 @@ public Defines.BranchAttributionLevel getConsumerProtectionAttributionLevel() {
      * @param preference A {@link Defines.BranchAttributionLevel} value containing the desired attribution level.
      */
     public void setConsumerProtectionAttributionLevel(Defines.BranchAttributionLevel preference) {
-        setInteger(KEY_CONSUMER_PROTECTION_ATTRIBUTION_LEVEL, preference.ordinal());
+        setString(KEY_CONSUMER_PROTECTION_ATTRIBUTION_LEVEL, preference.toString());
+    }
+
+    /**
+     * Returns true if Consumer Protection Attribution Level - KEY_CONSUMER_PROTECTION_ATTRIBUTION_LEVEL value exist in pref helper.
+     */
+    boolean isAttributionLevelInitialized() {
+        return hasPrefValue(KEY_CONSUMER_PROTECTION_ATTRIBUTION_LEVEL);
     }
 }

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

@@ -197,17 +197,23 @@ void addDMAParams() {
         }
     }
 
-    void updateConsumerProtectionAttributionLevel() {
-        try {
-            if (prefHelper_.getConsumerProtectionAttributionLevel() != null) {
-                params_.put(Defines.Jsonkey.Consumer_Protection_Attribution_Level.getKey(), prefHelper_.getConsumerProtectionAttributionLevel().ordinal());
+    private void addConsumerProtectionAttributionLevel() {
+        if (prefHelper_.isAttributionLevelInitialized()) {
+            try {
+                if (getBranchRemoteAPIVersion() == BRANCH_API_VERSION.V1) {
+                    params_.put(Defines.Jsonkey.Consumer_Protection_Attribution_Level.getKey(), prefHelper_.getConsumerProtectionAttributionLevel().toString());
+                } else {
+                    JSONObject userDataObj = params_.optJSONObject(Defines.Jsonkey.UserData.getKey());
+                    if (userDataObj != null) {
+                        userDataObj.put(Defines.Jsonkey.Consumer_Protection_Attribution_Level.getKey(), prefHelper_.getConsumerProtectionAttributionLevel().toString());
+                    }
+                }
+            } catch (JSONException e) {
+                BranchLogger.d(e.getMessage());
             }
-        } catch (JSONException e) {
-            BranchLogger.d(e.getMessage());
         }
     }
 
-
     /**
      * <p>Provides the path to server for this request.
      * see {@link Defines.RequestPath} <p>
@@ -634,7 +640,7 @@ void doFinalUpdateOnMainThread() {
         if (shouldAddDMAParams()) {
             addDMAParams();
         }
-        updateConsumerProtectionAttributionLevel();
+        addConsumerProtectionAttributionLevel();
     }
 
     void doFinalUpdateOnBackgroundThread() {