From c0eba99d7c828dada85e47828cf93a8ac6a0dd6b Mon Sep 17 00:00:00 2001
From: turtledreams <deniztaygunerten@gmail.com>
Date: Mon, 17 Apr 2023 20:02:48 +0900
Subject: [PATCH 01/18] max

---
 CHANGELOG.md                                        | 3 +++
 sdk/src/main/java/ly/count/android/sdk/Countly.java | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36ff7ceb1..89486450f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 22.09.4
+* maxSegmentationValuesDefault is now 100 (from 30)
+
 ## 22.09.3
 * Added "previous event ID" logic for non-internal events
 
diff --git a/sdk/src/main/java/ly/count/android/sdk/Countly.java b/sdk/src/main/java/ly/count/android/sdk/Countly.java
index a32c39b2a..70dff7bed 100644
--- a/sdk/src/main/java/ly/count/android/sdk/Countly.java
+++ b/sdk/src/main/java/ly/count/android/sdk/Countly.java
@@ -122,7 +122,7 @@ public enum CountlyMessagingProvider {
     //SDK limit defaults
     final int maxKeyLengthDefault = 128;
     final int maxValueSizeDefault = 256;
-    final int maxSegmentationValuesDefault = 30;
+    final int maxSegmentationValuesDefault = 100;
     final int maxBreadcrumbCountDefault = 100;
     final int maxStackTraceLinesPerThreadDefault = 30;
     final int maxStackTraceLineLengthDefault = 200;

From 50b0753eb14663b6ebd5cbd470de238b21aee81a Mon Sep 17 00:00:00 2001
From: turtledreams <deniztaygunerten@gmail.com>
Date: Tue, 23 May 2023 21:43:49 +0900
Subject: [PATCH 02/18] gl hf

---
 .../demo/ActivityExampleRemoteConfig.java     |  30 ++
 .../layout/activity_example_remote_config.xml |  21 ++
 .../ly/count/android/sdk/ConnectionQueue.java |  13 +
 .../ly/count/android/sdk/CountlyStore.java    |   9 +
 .../count/android/sdk/ModuleRemoteConfig.java | 259 ++++++++++++++++++
 .../android/sdk/RequestQueueProvider.java     |   2 +
 .../ly/count/android/sdk/StorageProvider.java |   4 +
 7 files changed, 338 insertions(+)

diff --git a/app/src/main/java/ly/count/android/demo/ActivityExampleRemoteConfig.java b/app/src/main/java/ly/count/android/demo/ActivityExampleRemoteConfig.java
index 47e0e71c0..3bb5e4a03 100644
--- a/app/src/main/java/ly/count/android/demo/ActivityExampleRemoteConfig.java
+++ b/app/src/main/java/ly/count/android/demo/ActivityExampleRemoteConfig.java
@@ -131,6 +131,36 @@ public void onClickRemoteConfigPrintValues(View v) {
         t.show();
     }
 
+    // For fetching all variants with a button click
+    public void onClickFetchAllVariants(View v) {
+        Countly.sharedInstance().remoteConfig().testFetchAllVariants(new RemoteConfigCallback() {
+            @Override
+            public void callback(String error) {
+                if (error == null) {
+                    Toast.makeText(getApplicationContext(), "Fetch finished", Toast.LENGTH_SHORT).show();
+                } else {
+                    Toast.makeText(getApplicationContext(), "Error: " + error, Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+    }
+
+    // To get all variants from the storage and show them with a toast
+    public void onClickVariantsPrintValues(View v) {
+        Map<String, Object> values = Countly.sharedInstance().remoteConfig().getAllVariants();
+
+        Countly.sharedInstance().L.d("Get all variants: [" + values.toString() + "]");
+
+       Toast t = Toast.makeText(getApplicationContext(), "Stored Variant Values: [" + values.toString() + "]", Toast.LENGTH_LONG);
+        t.setGravity(Gravity.BOTTOM, 0, 0);
+        t.show();
+    }
+
+    // To clear all stored variants
+    public void onClickVariantsClearValues(View v) {
+        Countly.sharedInstance().remoteConfig().clearStoredVariants();
+    }
+
     @Override
     public void onStart() {
         super.onStart();
diff --git a/app/src/main/res/layout/activity_example_remote_config.xml b/app/src/main/res/layout/activity_example_remote_config.xml
index 6112959bb..bc3d45a4d 100644
--- a/app/src/main/res/layout/activity_example_remote_config.xml
+++ b/app/src/main/res/layout/activity_example_remote_config.xml
@@ -58,4 +58,25 @@
       android:onClick="onClickRemoteConfigPrintValues"
       android:text="Remote Config Print Stored Values"
       />
+  <Button
+      android:id="@+id/fetch_ab_variants"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:onClick="onClickFetchAllVariants"
+      android:text="Fetch All vARIANTS"
+      />
+  <Button
+      android:id="@+id/get_all_variants"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:onClick="onClickVariantsPrintValues"
+      android:text="get all variants"
+      />
+  <Button
+      android:id="@+id/clear_all_variants"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:onClick="onClickVariantsClearValues"
+      android:text="clear all stored variants"
+      />
 </LinearLayout>
\ No newline at end of file
diff --git a/sdk/src/main/java/ly/count/android/sdk/ConnectionQueue.java b/sdk/src/main/java/ly/count/android/sdk/ConnectionQueue.java
index 29cac1513..8e2daa1f2 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ConnectionQueue.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ConnectionQueue.java
@@ -711,6 +711,19 @@ public String prepareRemoteConfigRequest(@Nullable String keysInclude, @Nullable
         return data;
     }
 
+    /**
+     * To fetch all variants from the server. Something like this should be formed: method=ab_fetch_variants&app_key="APP_KEY"&device_id=DEVICE_ID
+     * API end point for this is /o/sdk
+     * @return
+     */
+    public String prepareFetchAllVariants() {
+        String data = "method=ab_fetch_variants"
+            + "&app_key=" + UtilsNetworking.urlEncodeString(baseInfoProvider.getAppKey())
+            + "&device_id=" + UtilsNetworking.urlEncodeString(deviceIdProvider_.getDeviceId());
+
+        return data;
+    }
+
     public String prepareRatingWidgetRequest(String widgetId) {
         String data = prepareCommonRequestData()
             + "&widget_id=" + UtilsNetworking.urlEncodeString(widgetId)
diff --git a/sdk/src/main/java/ly/count/android/sdk/CountlyStore.java b/sdk/src/main/java/ly/count/android/sdk/CountlyStore.java
index 367dd1913..b04e6126b 100644
--- a/sdk/src/main/java/ly/count/android/sdk/CountlyStore.java
+++ b/sdk/src/main/java/ly/count/android/sdk/CountlyStore.java
@@ -61,6 +61,7 @@ public class CountlyStore implements StorageProvider, EventQueueProvider {
     private static final String STAR_RATING_PREFERENCE = "STAR_RATING";
     private static final String CACHED_ADVERTISING_ID = "ADVERTISING_ID";
     private static final String REMOTE_CONFIG_VALUES = "REMOTE_CONFIG";
+    private static final String AB_VARIANT_VALUES = "AB_VARIANT_VALUES";
     private static final String STORAGE_SCHEMA_VERSION = "SCHEMA_VERSION";
     private static final String PREFERENCE_KEY_ID_ID = "ly.count.android.api.DeviceId.id";
     private static final String PREFERENCE_KEY_ID_TYPE = "ly.count.android.api.DeviceId.type";
@@ -441,6 +442,14 @@ public synchronized String getRemoteConfigValues() {
         return preferences_.getString(REMOTE_CONFIG_VALUES, "");
     }
 
+    public synchronized void setVariantValues(String values) {
+        preferences_.edit().putString(AB_VARIANT_VALUES, values).apply();
+    }
+
+    public synchronized String getVariantValues() {
+        return preferences_.getString(AB_VARIANT_VALUES, "");
+    }
+
     public synchronized void setCachedAdvertisingId(String advertisingId) {
         preferences_.edit().putString(CACHED_ADVERTISING_ID, advertisingId).apply();
     }
diff --git a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
index 1e43a7377..403e6afb4 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
@@ -124,6 +124,76 @@ public void callback(JSONObject checkResponse) {
         }
     }
 
+    /**
+     * Internal call for fetching all variants of A/B test experiments
+     *
+     * @param requestShouldBeDelayed this is set to true in case of fetching after a deviceId change
+     * @param callback called after the fetch is done
+     */
+    void testFetchAllVariantsInternal(final boolean requestShouldBeDelayed, @Nullable final RemoteConfigCallback callback) {
+        try {
+            L.d("[ModuleRemoteConfig] Fetching all A/B test variants, requestShouldBeDelayed:[" + requestShouldBeDelayed + "]");
+
+            // Device ID change related logic
+            if (deviceIdProvider.getDeviceId() == null) {
+                L.d("[ModuleRemoteConfig] Fetching all A/B test variants was aborted, deviceID is null");
+                if (callback != null) { // inform callback
+                    callback.callback("Can't complete Fetching all A/B test variants, device ID is null");
+                }
+                return;
+            }
+
+            // Temp ID related logic
+            if (deviceIdProvider.isTemporaryIdEnabled() || requestQueueProvider.queueContainsTemporaryIdItems()) {
+                L.d("[ModuleRemoteConfig] Fetching all A/B test variants was aborted, temporary device ID mode is set");
+                if (callback != null) { // inform callback
+                    callback.callback("Can't complete Fetching all A/B test variants, temporary device ID is set");
+                }
+                return;
+            }
+
+            String requestData = requestQueueProvider.prepareFetchAllVariants();
+            L.d("[ModuleRemoteConfig] RemoteConfig requestData:[" + requestData + "]");
+
+            ConnectionProcessor cp = requestQueueProvider.createConnectionProcessor();
+            final boolean networkingIsEnabled = cp.configProvider_.getNetworkingEnabled();
+
+            (new ImmediateRequestMaker()).doWork(requestData, "/o/sdk", cp, requestShouldBeDelayed, networkingIsEnabled, new ImmediateRequestMaker.InternalImmediateRequestCallback() {
+                @Override
+                public void callback(JSONObject checkResponse) {
+                    L.d("[ModuleRemoteConfig] Processing A/B test variants received response, received response is null:[" + (checkResponse == null) + "]");
+
+                    // In case of error
+                    if (checkResponse == null) {
+                        if (callback != null) {
+                            callback.callback("Encountered problem while trying to reach the server for A/B test variants, possibly no internet connection");
+                        }
+                        return;
+                    }
+
+                    String error = null;
+
+                    try {
+                        mergeCheckResponseIntoCurrentValuesWithVariants(checkResponse);
+                    } catch (Exception ex) {
+                        L.e("[ModuleRemoteConfig] testFetchAllVariantsInternal - execute, Encountered critical issue while trying to Fetching all A/B test variants from the server, [" + ex.toString() + "]");
+                        error = "Encountered critical issue while trying to Fetching all A/B test variants from the server, [" + ex.toString() + "]";
+                    }
+
+                    // let callback know that there were no errors so it can do its thing
+                    if (callback != null) {
+                        callback.callback(error);
+                    }
+                }
+            }, L);
+        } catch (Exception ex) {
+            L.e("[ModuleRemoteConfig] Encountered critical error while trying to fetch all A/B test variants. " + ex.toString());
+            if (callback != null) {
+                callback.callback("Encountered critical error while trying to fetch all A/B test variants");
+            }
+        }
+    }
+
     /**
      * Merge the values acquired from the server into the current values.
      * Clear if needed.
@@ -148,6 +218,29 @@ void mergeCheckResponseIntoCurrentValues(boolean clearOldValues, JSONObject chec
         L.d("[ModuleRemoteConfig] Finished remote config saving");
     }
 
+    /**
+     * Merge the variant values acquired from the server into the current values.
+     * Clear if needed.
+     *
+     * @throws Exception it throws an exception so that it is escalated upwards
+     */
+    void mergeCheckResponseIntoCurrentValuesWithVariants(JSONObject checkResponse) throws Exception {
+
+        //merge the new values into the current ones or erase values if they are gone
+        ABVariantStore variantContainer = loadConfigVariant();
+        variantContainer.mergeValues(checkResponse);
+
+        L.d("[ModuleRemoteConfig] Finished variant processing, starting saving");
+
+        saveConfig(variantContainer);
+
+        L.d("[ModuleRemoteConfig] Finished variant saving");
+    }
+
+    /*
+    * Decide which keys to use
+    * Useful if both 'keysExcept' and 'keysOnly' set
+    * */
     @NonNull String[] prepareKeysIncludeExclude(@Nullable final String[] keysOnly, @Nullable final String[] keysExcept) {
         String[] res = new String[2];//0 - include, 1 - exclude
 
@@ -185,6 +278,18 @@ Object getValue(String key) {
         }
     }
 
+    void saveConfig(ABVariantStore variantStore) throws Exception {
+        storageProvider.setVariantValues(variantStore.dataToString());
+    }
+
+    ABVariantStore loadConfigVariant() throws Exception {
+        String variantStoreString = storageProvider.getVariantValues();
+        ABVariantStore variantStore = ABVariantStore.dataFromString(variantStoreString);
+        return variantStore;
+    }
+
+
+
     void saveConfig(RemoteConfigValueStore rcvs) throws Exception {
         storageProvider.setRemoteConfigValues(rcvs.dataToString());
     }
@@ -203,6 +308,9 @@ RemoteConfigValueStore loadConfig() throws Exception {
     void clearValueStoreInternal() {
         storageProvider.setRemoteConfigValues("");
     }
+    void clearVariantStoreInternal() {
+        storageProvider.setVariantValues("");
+    }
 
     Map<String, Object> getAllRemoteConfigValuesInternal() {
         try {
@@ -214,6 +322,111 @@ Map<String, Object> getAllRemoteConfigValuesInternal() {
         }
     }
 
+    /**
+     * Gets all AB testing variants stored in the storage
+     * @return
+     */
+    Map<String, Object> getAllRemoteConfigVariantsInternal() {
+        try {
+            ABVariantStore stored = loadConfigVariant();
+            return stored.getAllValues();
+        } catch (Exception ex) {
+            Countly.sharedInstance().L.e("[ModuleRemoteConfig] getAllRemoteConfigVariantsInternal, Call failed:[" + ex.toString() + "]");
+            return null;
+        }
+    }
+
+    /**
+     * This class is used to do certain tasks on the AB variants in the storage or fetched from the server
+     */
+    static class ABVariantStore {
+        // create a new JSON object as a storage container
+        public JSONObject container = new JSONObject();
+
+        private ABVariantStore(JSONObject container) {
+            this.container = container;
+        }
+
+        public Object getVariant(String key) {
+            return container.opt(key);
+        }
+
+        /**
+         * Adds new values to the current storage instead of replacing it all
+         * @param newVariants - new variants fetched from the server
+         */
+        public void mergeValues(JSONObject newVariants) {
+            if (newVariants == null) {
+                return;
+            }
+
+            Iterator<String> iter = newVariants.keys();
+            while (iter.hasNext()) {
+                String key = iter.next();
+                try {
+                    Object value = newVariants.get(key);
+                    JSONArray existingVariants = container.optJSONArray(key);
+
+                    if (existingVariants != null) {
+                        // Merge with existing variants
+                        JSONArray mergedVariants = new JSONArray();
+                        for (int i = 0; i < existingVariants.length(); i++) {
+                            mergedVariants.put(existingVariants.getJSONObject(i));
+                        }
+                        mergedVariants.put(value);
+                        container.put(key, mergedVariants);
+                    } else {
+                        // Add new entry
+                        JSONArray newEntry = new JSONArray();
+                        newEntry.put(value);
+                        container.put(key, newEntry);
+                    }
+                } catch (Exception e) {
+                    Countly.sharedInstance().L.e("[ABVariantStore] Failed merging new variant values");
+                }
+            }
+        }
+
+        public Map<String, Object> getAllValues() {
+            Map<String, Object> ret = new HashMap<>();
+
+            Iterator<String> keys = container.keys();
+
+            while (keys.hasNext()) {
+                String key = keys.next();
+
+                try {
+                    Object value = container.get(key);
+                    ret.put(key, value);
+                } catch (Exception ex) {
+                    Countly.sharedInstance().L.e("[ABVariantStore] Got JSON exception while calling 'getAllValues': " + ex.toString());
+                }
+            }
+
+            return ret;
+        }
+
+        public static ABVariantStore dataFromString(String storageString) {
+            if (storageString == null || storageString.isEmpty()) {
+                return new ABVariantStore(new JSONObject());
+            }
+
+            JSONObject values;
+            try {
+                values = new JSONObject(storageString);
+            } catch (JSONException e) {
+                Countly.sharedInstance().L.e("[ABVariantStore] Couldn't decode ABVariantStore successfully: " + e.toString());
+                values = new JSONObject();
+            }
+            return new ABVariantStore(values);
+        }
+
+        public String dataToString() {
+            return container.toString();
+        }
+
+    }
+
     static class RemoteConfigValueStore {
         public JSONObject values = new JSONObject();
 
@@ -314,6 +527,12 @@ public void halt() {
         remoteConfigInterface = null;
     }
 
+    // ==================================================================
+    // ==================================================================
+    // INTERFACE
+    // ==================================================================
+    // ==================================================================
+
     public class RemoteConfig {
         /**
          * Clear all stored remote config_ values
@@ -326,6 +545,17 @@ public void clearStoredValues() {
             }
         }
 
+        /**
+         * Clear all stored Variant values
+         */
+        public void clearStoredVariants() {
+            synchronized (_cly) {
+                L.i("[RemoteConfig] Calling 'clearStoredVariants'");
+
+                clearVariantStoreInternal();
+            }
+        }
+
         public Map<String, Object> getAllValues() {
             synchronized (_cly) {
                 L.i("[RemoteConfig] Calling 'getAllValues'");
@@ -338,6 +568,35 @@ public Map<String, Object> getAllValues() {
             }
         }
 
+        public Map<String, Object> getAllVariants() {
+            synchronized (_cly) {
+                L.i("[RemoteConfig] Calling 'getAllVariants'");
+
+                if (!consentProvider.getConsent(Countly.CountlyFeatureNames.remoteConfig)) {
+                    return null;
+                }
+
+                return getAllRemoteConfigVariantsInternal();
+            }
+        }
+
+        /**
+         * Fetches all variants of A/B testing experiments
+         * @param callback
+         */
+        public void testFetchAllVariants(RemoteConfigCallback callback) {
+            synchronized (_cly) {
+                L.i("[RemoteConfig] Calling 'testFetchAllVariants'");
+
+                if (!consentProvider.getConsent(Countly.CountlyFeatureNames.remoteConfig)) {
+                    return;
+                }
+
+                testFetchAllVariantsInternal(false, callback);
+                // TODO: requestShouldBeDelayed necessary?
+            }
+        }
+
         /**
          * Get the stored value for the provided remote config_ key
          *
diff --git a/sdk/src/main/java/ly/count/android/sdk/RequestQueueProvider.java b/sdk/src/main/java/ly/count/android/sdk/RequestQueueProvider.java
index 29eb4c14f..dedeffb70 100644
--- a/sdk/src/main/java/ly/count/android/sdk/RequestQueueProvider.java
+++ b/sdk/src/main/java/ly/count/android/sdk/RequestQueueProvider.java
@@ -52,6 +52,8 @@ interface RequestQueueProvider {
 
     String prepareRemoteConfigRequest(@Nullable String keysInclude, @Nullable String keysExclude, @NonNull String preparedMetrics);
 
+    String prepareFetchAllVariants();
+
     String prepareRatingWidgetRequest(String widgetId);
 
     String prepareFeedbackListRequest();
diff --git a/sdk/src/main/java/ly/count/android/sdk/StorageProvider.java b/sdk/src/main/java/ly/count/android/sdk/StorageProvider.java
index 41989b9b3..0756831d7 100644
--- a/sdk/src/main/java/ly/count/android/sdk/StorageProvider.java
+++ b/sdk/src/main/java/ly/count/android/sdk/StorageProvider.java
@@ -49,6 +49,10 @@ interface StorageProvider {
 
     String getRemoteConfigValues();//not integrated
 
+    void setVariantValues(String values);
+
+    String getVariantValues();
+
     void esWriteCacheToStorage(@Nullable ExplicitStorageCallback callback);//required for explicit storage
 
     void setServerConfig(String config);

From b3d8333d183e1598a900eeb1f90b4f1201ea690f Mon Sep 17 00:00:00 2001
From: turtledreams <deniztaygunerten@gmail.com>
Date: Tue, 23 May 2023 21:49:25 +0900
Subject: [PATCH 03/18] formatting

---
 .../android/demo/ActivityExampleRemoteConfig.java   |  2 +-
 .../java/ly/count/android/sdk/ConnectionQueue.java  |  1 +
 .../ly/count/android/sdk/ModuleRemoteConfig.java    | 13 +++++++------
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/ly/count/android/demo/ActivityExampleRemoteConfig.java b/app/src/main/java/ly/count/android/demo/ActivityExampleRemoteConfig.java
index 3bb5e4a03..433c49c56 100644
--- a/app/src/main/java/ly/count/android/demo/ActivityExampleRemoteConfig.java
+++ b/app/src/main/java/ly/count/android/demo/ActivityExampleRemoteConfig.java
@@ -151,7 +151,7 @@ public void onClickVariantsPrintValues(View v) {
 
         Countly.sharedInstance().L.d("Get all variants: [" + values.toString() + "]");
 
-       Toast t = Toast.makeText(getApplicationContext(), "Stored Variant Values: [" + values.toString() + "]", Toast.LENGTH_LONG);
+        Toast t = Toast.makeText(getApplicationContext(), "Stored Variant Values: [" + values.toString() + "]", Toast.LENGTH_LONG);
         t.setGravity(Gravity.BOTTOM, 0, 0);
         t.show();
     }
diff --git a/sdk/src/main/java/ly/count/android/sdk/ConnectionQueue.java b/sdk/src/main/java/ly/count/android/sdk/ConnectionQueue.java
index 8e2daa1f2..f0690f230 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ConnectionQueue.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ConnectionQueue.java
@@ -714,6 +714,7 @@ public String prepareRemoteConfigRequest(@Nullable String keysInclude, @Nullable
     /**
      * To fetch all variants from the server. Something like this should be formed: method=ab_fetch_variants&app_key="APP_KEY"&device_id=DEVICE_ID
      * API end point for this is /o/sdk
+     *
      * @return
      */
     public String prepareFetchAllVariants() {
diff --git a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
index 403e6afb4..c23034c51 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
@@ -238,9 +238,9 @@ void mergeCheckResponseIntoCurrentValuesWithVariants(JSONObject checkResponse) t
     }
 
     /*
-    * Decide which keys to use
-    * Useful if both 'keysExcept' and 'keysOnly' set
-    * */
+     * Decide which keys to use
+     * Useful if both 'keysExcept' and 'keysOnly' set
+     * */
     @NonNull String[] prepareKeysIncludeExclude(@Nullable final String[] keysOnly, @Nullable final String[] keysExcept) {
         String[] res = new String[2];//0 - include, 1 - exclude
 
@@ -288,8 +288,6 @@ ABVariantStore loadConfigVariant() throws Exception {
         return variantStore;
     }
 
-
-
     void saveConfig(RemoteConfigValueStore rcvs) throws Exception {
         storageProvider.setRemoteConfigValues(rcvs.dataToString());
     }
@@ -308,6 +306,7 @@ RemoteConfigValueStore loadConfig() throws Exception {
     void clearValueStoreInternal() {
         storageProvider.setRemoteConfigValues("");
     }
+
     void clearVariantStoreInternal() {
         storageProvider.setVariantValues("");
     }
@@ -324,6 +323,7 @@ Map<String, Object> getAllRemoteConfigValuesInternal() {
 
     /**
      * Gets all AB testing variants stored in the storage
+     *
      * @return
      */
     Map<String, Object> getAllRemoteConfigVariantsInternal() {
@@ -353,6 +353,7 @@ public Object getVariant(String key) {
 
         /**
          * Adds new values to the current storage instead of replacing it all
+         *
          * @param newVariants - new variants fetched from the server
          */
         public void mergeValues(JSONObject newVariants) {
@@ -424,7 +425,6 @@ public static ABVariantStore dataFromString(String storageString) {
         public String dataToString() {
             return container.toString();
         }
-
     }
 
     static class RemoteConfigValueStore {
@@ -582,6 +582,7 @@ public Map<String, Object> getAllVariants() {
 
         /**
          * Fetches all variants of A/B testing experiments
+         *
          * @param callback
          */
         public void testFetchAllVariants(RemoteConfigCallback callback) {

From c4e380a40ccb8b2052088753023ca41f771c3148 Mon Sep 17 00:00:00 2001
From: turtledreams <deniztaygunerten@gmail.com>
Date: Wed, 24 May 2023 16:06:27 +0900
Subject: [PATCH 04/18] removed persistence and clear all

---
 .../demo/ActivityExampleRemoteConfig.java     |  5 -----
 .../layout/activity_example_remote_config.xml |  7 ------
 .../ly/count/android/sdk/CountlyStore.java    |  9 --------
 .../count/android/sdk/ModuleRemoteConfig.java | 22 ++++---------------
 .../ly/count/android/sdk/StorageProvider.java |  4 ----
 5 files changed, 4 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/ly/count/android/demo/ActivityExampleRemoteConfig.java b/app/src/main/java/ly/count/android/demo/ActivityExampleRemoteConfig.java
index 433c49c56..4442fafe1 100644
--- a/app/src/main/java/ly/count/android/demo/ActivityExampleRemoteConfig.java
+++ b/app/src/main/java/ly/count/android/demo/ActivityExampleRemoteConfig.java
@@ -156,11 +156,6 @@ public void onClickVariantsPrintValues(View v) {
         t.show();
     }
 
-    // To clear all stored variants
-    public void onClickVariantsClearValues(View v) {
-        Countly.sharedInstance().remoteConfig().clearStoredVariants();
-    }
-
     @Override
     public void onStart() {
         super.onStart();
diff --git a/app/src/main/res/layout/activity_example_remote_config.xml b/app/src/main/res/layout/activity_example_remote_config.xml
index bc3d45a4d..fc3df55fb 100644
--- a/app/src/main/res/layout/activity_example_remote_config.xml
+++ b/app/src/main/res/layout/activity_example_remote_config.xml
@@ -72,11 +72,4 @@
       android:onClick="onClickVariantsPrintValues"
       android:text="get all variants"
       />
-  <Button
-      android:id="@+id/clear_all_variants"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:onClick="onClickVariantsClearValues"
-      android:text="clear all stored variants"
-      />
 </LinearLayout>
\ No newline at end of file
diff --git a/sdk/src/main/java/ly/count/android/sdk/CountlyStore.java b/sdk/src/main/java/ly/count/android/sdk/CountlyStore.java
index b04e6126b..367dd1913 100644
--- a/sdk/src/main/java/ly/count/android/sdk/CountlyStore.java
+++ b/sdk/src/main/java/ly/count/android/sdk/CountlyStore.java
@@ -61,7 +61,6 @@ public class CountlyStore implements StorageProvider, EventQueueProvider {
     private static final String STAR_RATING_PREFERENCE = "STAR_RATING";
     private static final String CACHED_ADVERTISING_ID = "ADVERTISING_ID";
     private static final String REMOTE_CONFIG_VALUES = "REMOTE_CONFIG";
-    private static final String AB_VARIANT_VALUES = "AB_VARIANT_VALUES";
     private static final String STORAGE_SCHEMA_VERSION = "SCHEMA_VERSION";
     private static final String PREFERENCE_KEY_ID_ID = "ly.count.android.api.DeviceId.id";
     private static final String PREFERENCE_KEY_ID_TYPE = "ly.count.android.api.DeviceId.type";
@@ -442,14 +441,6 @@ public synchronized String getRemoteConfigValues() {
         return preferences_.getString(REMOTE_CONFIG_VALUES, "");
     }
 
-    public synchronized void setVariantValues(String values) {
-        preferences_.edit().putString(AB_VARIANT_VALUES, values).apply();
-    }
-
-    public synchronized String getVariantValues() {
-        return preferences_.getString(AB_VARIANT_VALUES, "");
-    }
-
     public synchronized void setCachedAdvertisingId(String advertisingId) {
         preferences_.edit().putString(CACHED_ADVERTISING_ID, advertisingId).apply();
     }
diff --git a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
index c23034c51..d3b6d57d3 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
@@ -11,7 +11,7 @@
 
 public class ModuleRemoteConfig extends ModuleBase {
     boolean updateRemoteConfigAfterIdChange = false;
-
+    String variantMemContainer; // Stores the fetched A/B test variants
     RemoteConfig remoteConfigInterface = null;
 
     //if set to true, it will automatically download remote configs on module startup
@@ -228,6 +228,7 @@ void mergeCheckResponseIntoCurrentValuesWithVariants(JSONObject checkResponse) t
 
         //merge the new values into the current ones or erase values if they are gone
         ABVariantStore variantContainer = loadConfigVariant();
+        variantContainer.container = new JSONObject();
         variantContainer.mergeValues(checkResponse);
 
         L.d("[ModuleRemoteConfig] Finished variant processing, starting saving");
@@ -279,11 +280,11 @@ Object getValue(String key) {
     }
 
     void saveConfig(ABVariantStore variantStore) throws Exception {
-        storageProvider.setVariantValues(variantStore.dataToString());
+        variantMemContainer = variantStore.dataToString();
     }
 
     ABVariantStore loadConfigVariant() throws Exception {
-        String variantStoreString = storageProvider.getVariantValues();
+        String variantStoreString = variantMemContainer;
         ABVariantStore variantStore = ABVariantStore.dataFromString(variantStoreString);
         return variantStore;
     }
@@ -307,10 +308,6 @@ void clearValueStoreInternal() {
         storageProvider.setRemoteConfigValues("");
     }
 
-    void clearVariantStoreInternal() {
-        storageProvider.setVariantValues("");
-    }
-
     Map<String, Object> getAllRemoteConfigValuesInternal() {
         try {
             RemoteConfigValueStore rcvs = loadConfig();
@@ -545,17 +542,6 @@ public void clearStoredValues() {
             }
         }
 
-        /**
-         * Clear all stored Variant values
-         */
-        public void clearStoredVariants() {
-            synchronized (_cly) {
-                L.i("[RemoteConfig] Calling 'clearStoredVariants'");
-
-                clearVariantStoreInternal();
-            }
-        }
-
         public Map<String, Object> getAllValues() {
             synchronized (_cly) {
                 L.i("[RemoteConfig] Calling 'getAllValues'");
diff --git a/sdk/src/main/java/ly/count/android/sdk/StorageProvider.java b/sdk/src/main/java/ly/count/android/sdk/StorageProvider.java
index 0756831d7..41989b9b3 100644
--- a/sdk/src/main/java/ly/count/android/sdk/StorageProvider.java
+++ b/sdk/src/main/java/ly/count/android/sdk/StorageProvider.java
@@ -49,10 +49,6 @@ interface StorageProvider {
 
     String getRemoteConfigValues();//not integrated
 
-    void setVariantValues(String values);
-
-    String getVariantValues();
-
     void esWriteCacheToStorage(@Nullable ExplicitStorageCallback callback);//required for explicit storage
 
     void setServerConfig(String config);

From 1788658a8eeb1532b93976e5e792d4706dbd0937 Mon Sep 17 00:00:00 2001
From: turtledreams <deniztaygunerten@gmail.com>
Date: Wed, 24 May 2023 18:49:58 +0900
Subject: [PATCH 05/18] refactor and enroll_ab

---
 .../demo/ActivityExampleRemoteConfig.java     |  43 +-
 .../layout/activity_example_remote_config.xml |   7 +
 .../ly/count/android/sdk/ConnectionQueue.java |  10 +
 .../count/android/sdk/ModuleRemoteConfig.java | 386 +++++++-----------
 .../android/sdk/RequestQueueProvider.java     |   4 +-
 5 files changed, 218 insertions(+), 232 deletions(-)

diff --git a/app/src/main/java/ly/count/android/demo/ActivityExampleRemoteConfig.java b/app/src/main/java/ly/count/android/demo/ActivityExampleRemoteConfig.java
index 4442fafe1..8ad766cc7 100644
--- a/app/src/main/java/ly/count/android/demo/ActivityExampleRemoteConfig.java
+++ b/app/src/main/java/ly/count/android/demo/ActivityExampleRemoteConfig.java
@@ -7,6 +7,7 @@
 import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
+import java.util.Iterator;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -147,7 +148,7 @@ public void callback(String error) {
 
     // To get all variants from the storage and show them with a toast
     public void onClickVariantsPrintValues(View v) {
-        Map<String, Object> values = Countly.sharedInstance().remoteConfig().getAllVariants();
+        JSONObject values = Countly.sharedInstance().remoteConfig().getAllVariants();
 
         Countly.sharedInstance().L.d("Get all variants: [" + values.toString() + "]");
 
@@ -156,6 +157,46 @@ public void onClickVariantsPrintValues(View v) {
         t.show();
     }
 
+    public void onClickEnrollVariant(View v) {
+        JSONObject values = Countly.sharedInstance().remoteConfig().getAllVariants();
+        Countly.sharedInstance().L.d("Get all variants: [" + values.toString() + "]");
+
+
+        String[] result = null;
+
+        Iterator<String> keys = values.keys();
+        while (keys.hasNext()) {
+            String key = keys.next();
+            Object value = values.opt(key);
+
+            if (value instanceof JSONArray) {
+                JSONArray jsonArray = (JSONArray) value;
+                if (jsonArray.length() > 0 && jsonArray.opt(0) instanceof JSONObject) {
+                    JSONObject jsonObject = jsonArray.optJSONObject(0);
+                    String name = jsonObject.optString("name");
+                    String variant = jsonObject.optString("value");
+
+                    if (!name.isEmpty() && !variant.isEmpty()) {
+                        result = new String[]{key, variant};
+                        break;
+                    }
+                }
+            }
+        }
+
+
+        Countly.sharedInstance().remoteConfig().testEnrollIntoVariant(result, new RemoteConfigCallback() {
+            @Override
+            public void callback(String error) {
+                if (error == null) {
+                    Toast.makeText(getApplicationContext(), "Fetch finished", Toast.LENGTH_SHORT).show();
+                } else {
+                    Toast.makeText(getApplicationContext(), "Error: " + error, Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+    }
+
     @Override
     public void onStart() {
         super.onStart();
diff --git a/app/src/main/res/layout/activity_example_remote_config.xml b/app/src/main/res/layout/activity_example_remote_config.xml
index fc3df55fb..e86dce8ba 100644
--- a/app/src/main/res/layout/activity_example_remote_config.xml
+++ b/app/src/main/res/layout/activity_example_remote_config.xml
@@ -72,4 +72,11 @@
       android:onClick="onClickVariantsPrintValues"
       android:text="get all variants"
       />
+  <Button
+      android:id="@+id/enroll_variant"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:onClick="onClickEnrollVariant"
+      android:text="Enroll first variant"
+      />
 </LinearLayout>
\ No newline at end of file
diff --git a/sdk/src/main/java/ly/count/android/sdk/ConnectionQueue.java b/sdk/src/main/java/ly/count/android/sdk/ConnectionQueue.java
index f0690f230..d68e56793 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ConnectionQueue.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ConnectionQueue.java
@@ -725,6 +725,16 @@ public String prepareFetchAllVariants() {
         return data;
     }
 
+    public String prepareEnrollVariant(String[] keyAndVariant){
+        String data = "method=ab_enroll_variant"
+            + "&app_key=" + UtilsNetworking.urlEncodeString(baseInfoProvider.getAppKey())
+            + "&device_id=" + UtilsNetworking.urlEncodeString(deviceIdProvider_.getDeviceId())
+            + "&key=" + UtilsNetworking.urlEncodeString(keyAndVariant[0])
+            + "&variant=" + UtilsNetworking.urlEncodeString(keyAndVariant[1]);
+
+        return data;
+    }
+
     public String prepareRatingWidgetRequest(String widgetId) {
         String data = prepareCommonRequestData()
             + "&widget_id=" + UtilsNetworking.urlEncodeString(widgetId)
diff --git a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
index d3b6d57d3..a3408bc98 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
@@ -1,5 +1,6 @@
 package ly.count.android.sdk;
 
+import android.text.TextUtils;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import java.util.HashMap;
@@ -11,7 +12,7 @@
 
 public class ModuleRemoteConfig extends ModuleBase {
     boolean updateRemoteConfigAfterIdChange = false;
-    String variantMemContainer; // Stores the fetched A/B test variants
+    JSONObject variantContainer; // Stores the fetched A/B test variants
     RemoteConfig remoteConfigInterface = null;
 
     //if set to true, it will automatically download remote configs on module startup
@@ -47,6 +48,91 @@ public void callback(String error) {
         remoteConfigInterface = new RemoteConfig();
     }
 
+    /**
+     * Checks if device ID is null and cancels the process if necessary
+     *
+     * @param message - unique message indicating where this check was done
+     * @param callback - callback to report if device ID is null
+     */
+    void checkDeviceId(String message, @Nullable final RemoteConfigCallback callback) {
+        if (deviceIdProvider.getDeviceId() == null) {
+            //device ID is null, abort
+            L.d("[ModuleRemoteConfig] " + message + " was aborted, deviceID is null");
+            if (callback != null) {
+                callback.callback("Can't complete " + message + ", device ID is null");
+            }
+            return;
+        }
+    }
+
+    /**
+     * Checks if temp ID mode is on and cancels the process if necessary
+     *
+     * @param message - unique message indicating where this check was done
+     * @param callback - callback to report if we are in temp ID mode
+     */
+    void checkTempId(String message, @Nullable final RemoteConfigCallback callback) {
+        if (deviceIdProvider.isTemporaryIdEnabled() || requestQueueProvider.queueContainsTemporaryIdItems()) {
+            //temporary id mode enabled, abort
+            L.d("[ModuleRemoteConfig] " + message + " was aborted, temporary device ID mode is set");
+            if (callback != null) {
+                callback.callback("Can't complete " + message + ", temporary device ID is set");
+            }
+            return;
+        }
+    }
+
+    /**
+     * Callback to be used in 'makeRequest'
+     */
+    public interface SuccessOperation {
+        void execute(JSONObject checkResponse) throws Exception;
+    }
+
+    /**
+     * Uses ImmediateRequestMaker to make a request at 'o/sdk' for a given request data. Also executes the given function
+     * TODO: should be able to provide API end point too
+     *
+     * @param message - unique message to show where we make the request
+     * @param requestData - data to send (things after '?')
+     * @param requestShouldBeDelayed - if a delay necessary in case of ID change
+     * @param callback - Provided callback to relay info
+     * @param successOperation - Things to do if response was valid
+     */
+    void makeRequest(String message, String requestData, boolean requestShouldBeDelayed, @Nullable final RemoteConfigCallback callback, @Nullable SuccessOperation successOperation) {
+        L.d("[ModuleRemoteConfig] " + message + " requestData:[" + requestData + "]");
+
+        ConnectionProcessor cp = requestQueueProvider.createConnectionProcessor();
+        final boolean networkingIsEnabled = cp.configProvider_.getNetworkingEnabled();
+
+        (new ImmediateRequestMaker()).doWork(requestData, "/o/sdk", cp, requestShouldBeDelayed, networkingIsEnabled, new ImmediateRequestMaker.InternalImmediateRequestCallback() {
+            @Override
+            public void callback(JSONObject checkResponse) {
+                L.d("[ModuleRemoteConfig] Processing " + message + " received response, received response is null:[" + (checkResponse == null) + "]");
+                if (checkResponse == null) {
+                    if (callback != null) {
+                        callback.callback("Encountered problem while trying to reach the server, possibly no internet connection");
+                    }
+                    return;
+                }
+
+                String error = null;
+                try {
+                    if (successOperation != null) {
+                        successOperation.execute(checkResponse);
+                    }
+                } catch (Exception ex) {
+                    L.e("[ModuleRemoteConfig] " + message + " - execute, Encountered critical issue:[" + ex.toString() + "]");
+                    error = "Encountered critical issue:[" + ex.toString() + "]";
+                }
+
+                if (callback != null) {
+                    callback.callback(error);
+                }
+            }
+        }, L);
+    }
+
     /**
      * Internal call for updating remote config keys
      *
@@ -59,63 +145,22 @@ void updateRemoteConfigValues(@Nullable final String[] keysOnly, @Nullable final
         try {
             L.d("[ModuleRemoteConfig] Updating remote config values, requestShouldBeDelayed:[" + requestShouldBeDelayed + "]");
 
-            if (deviceIdProvider.getDeviceId() == null) {
-                //device ID is null, abort
-                L.d("[ModuleRemoteConfig] RemoteConfig value update was aborted, deviceID is null");
-
-                if (callback != null) {
-                    callback.callback("Can't complete call, device ID is null");
-                }
+            // checks
+            checkDeviceId("RemoteConfig value update", callback);
+            checkTempId("RemoteConfig value update", callback);
 
-                return;
-            }
-
-            if (deviceIdProvider.isTemporaryIdEnabled() || requestQueueProvider.queueContainsTemporaryIdItems()) {
-                //temporary id mode enabled, abort
-                L.d("[ModuleRemoteConfig] RemoteConfig value update was aborted, temporary device ID mode is set");
-
-                if (callback != null) {
-                    callback.callback("Can't complete call, temporary device ID is set");
-                }
-
-                return;
-            }
-
-            //prepare metrics
+            //prepare metrics and request data
             String preparedMetrics = deviceInfo.getMetrics(_cly.context_, deviceInfo, metricOverride);
-
             String[] preparedKeys = prepareKeysIncludeExclude(keysOnly, keysExcept);
             String requestData = requestQueueProvider.prepareRemoteConfigRequest(preparedKeys[0], preparedKeys[1], preparedMetrics);
-            L.d("[ModuleRemoteConfig] RemoteConfig requestData:[" + requestData + "]");
-
-            ConnectionProcessor cp = requestQueueProvider.createConnectionProcessor();
-            final boolean networkingIsEnabled = cp.configProvider_.getNetworkingEnabled();
-
-            (new ImmediateRequestMaker()).doWork(requestData, "/o/sdk", cp, requestShouldBeDelayed, networkingIsEnabled, new ImmediateRequestMaker.InternalImmediateRequestCallback() {
-                @Override
-                public void callback(JSONObject checkResponse) {
-                    L.d("[ModuleRemoteConfig] Processing remote config received response, received response is null:[" + (checkResponse == null) + "]");
-                    if (checkResponse == null) {
-                        if (callback != null) {
-                            callback.callback("Encountered problem while trying to reach the server, possibly no internet connection");
-                        }
-                        return;
-                    }
-
-                    String error = null;
-                    try {
-                        boolean clearOldValues = keysExcept == null && keysOnly == null;
-                        mergeCheckResponseIntoCurrentValues(clearOldValues, checkResponse);
-                    } catch (Exception ex) {
-                        L.e("[ModuleRemoteConfig] updateRemoteConfigValues - execute, Encountered critical issue while trying to download remote config information from the server, [" + ex.toString() + "]");
-                        error = "Encountered critical issue while trying to download remote config information from the server, [" + ex.toString() + "]";
-                    }
 
-                    if (callback != null) {
-                        callback.callback(error);
-                    }
+            // Make immediate request
+            makeRequest("Remote Config", requestData, false, callback, new SuccessOperation() {
+                @Override public void execute(JSONObject checkResponse) throws Exception {
+                    boolean clearOldValues = keysExcept == null && keysOnly == null;
+                    mergeCheckResponseIntoCurrentValues(clearOldValues, checkResponse);
                 }
-            }, L);
+            });
         } catch (Exception ex) {
             L.e("[ModuleRemoteConfig] Encountered critical error while trying to perform a remote config update. " + ex.toString());
             if (callback != null) {
@@ -134,62 +179,47 @@ void testFetchAllVariantsInternal(final boolean requestShouldBeDelayed, @Nullabl
         try {
             L.d("[ModuleRemoteConfig] Fetching all A/B test variants, requestShouldBeDelayed:[" + requestShouldBeDelayed + "]");
 
-            // Device ID change related logic
-            if (deviceIdProvider.getDeviceId() == null) {
-                L.d("[ModuleRemoteConfig] Fetching all A/B test variants was aborted, deviceID is null");
-                if (callback != null) { // inform callback
-                    callback.callback("Can't complete Fetching all A/B test variants, device ID is null");
-                }
-                return;
-            }
+            checkDeviceId("Fetching all A/B test variants", callback);
+            checkTempId("Fetching all A/B test variants", callback);
+
+            // prepare request data
+            String requestData = requestQueueProvider.prepareFetchAllVariants();
 
-            // Temp ID related logic
-            if (deviceIdProvider.isTemporaryIdEnabled() || requestQueueProvider.queueContainsTemporaryIdItems()) {
-                L.d("[ModuleRemoteConfig] Fetching all A/B test variants was aborted, temporary device ID mode is set");
-                if (callback != null) { // inform callback
-                    callback.callback("Can't complete Fetching all A/B test variants, temporary device ID is set");
+            // Make immediate request
+            makeRequest("Fetching all A/B test variants", requestData, false, callback, new SuccessOperation() {
+                @Override public void execute(JSONObject checkResponse) throws Exception {
+                    variantContainer = checkResponse;
                 }
-                return;
+            });
+        } catch (Exception ex) {
+            L.e("[ModuleRemoteConfig] Encountered critical error while trying to fetch all A/B test variants. " + ex.toString());
+            if (callback != null) {
+                callback.callback("Encountered critical error while trying to fetch all A/B test variants");
             }
+        }
+    }
 
-            String requestData = requestQueueProvider.prepareFetchAllVariants();
-            L.d("[ModuleRemoteConfig] RemoteConfig requestData:[" + requestData + "]");
-
-            ConnectionProcessor cp = requestQueueProvider.createConnectionProcessor();
-            final boolean networkingIsEnabled = cp.configProvider_.getNetworkingEnabled();
-
-            (new ImmediateRequestMaker()).doWork(requestData, "/o/sdk", cp, requestShouldBeDelayed, networkingIsEnabled, new ImmediateRequestMaker.InternalImmediateRequestCallback() {
-                @Override
-                public void callback(JSONObject checkResponse) {
-                    L.d("[ModuleRemoteConfig] Processing A/B test variants received response, received response is null:[" + (checkResponse == null) + "]");
-
-                    // In case of error
-                    if (checkResponse == null) {
-                        if (callback != null) {
-                            callback.callback("Encountered problem while trying to reach the server for A/B test variants, possibly no internet connection");
-                        }
-                        return;
-                    }
+    void testEnrollIntoVariantInternal(@NonNull final String[] keyAndVariant, @Nullable final RemoteConfigCallback callback) {
+        try {
+            L.d("[ModuleRemoteConfig] Enrolling A/B test variants, Key/Variant pairs:[" + keyAndVariant.toString() + "]");
 
-                    String error = null;
+            checkDeviceId("Enrolling to A/B test variants", callback);
 
-                    try {
-                        mergeCheckResponseIntoCurrentValuesWithVariants(checkResponse);
-                    } catch (Exception ex) {
-                        L.e("[ModuleRemoteConfig] testFetchAllVariantsInternal - execute, Encountered critical issue while trying to Fetching all A/B test variants from the server, [" + ex.toString() + "]");
-                        error = "Encountered critical issue while trying to Fetching all A/B test variants from the server, [" + ex.toString() + "]";
-                    }
+            // checkKeyAndVariant
+            if (!(keyAndVariant.length >= 2) || TextUtils.isEmpty(keyAndVariant[0]) || TextUtils.isEmpty(keyAndVariant[1])) {
+                L.w("[ModuleRemoteConfig] Enrolling A/B test variants, Key/Variant pair is invalid. Aborting.");
+                return;
+            }
 
-                    // let callback know that there were no errors so it can do its thing
-                    if (callback != null) {
-                        callback.callback(error);
-                    }
-                }
-            }, L);
+            // prepare request data
+            String requestData = requestQueueProvider.prepareEnrollVariant(keyAndVariant);
+
+            // Make immediate request
+            makeRequest("Enrolling to A/B test variants", requestData, false, callback, null);
         } catch (Exception ex) {
-            L.e("[ModuleRemoteConfig] Encountered critical error while trying to fetch all A/B test variants. " + ex.toString());
+            L.e("[ModuleRemoteConfig] Encountered critical error while trying to enroll A/B test variants. " + ex.toString());
             if (callback != null) {
-                callback.callback("Encountered critical error while trying to fetch all A/B test variants");
+                callback.callback("Encountered critical error while trying to enroll A/B test variants");
             }
         }
     }
@@ -218,26 +248,6 @@ void mergeCheckResponseIntoCurrentValues(boolean clearOldValues, JSONObject chec
         L.d("[ModuleRemoteConfig] Finished remote config saving");
     }
 
-    /**
-     * Merge the variant values acquired from the server into the current values.
-     * Clear if needed.
-     *
-     * @throws Exception it throws an exception so that it is escalated upwards
-     */
-    void mergeCheckResponseIntoCurrentValuesWithVariants(JSONObject checkResponse) throws Exception {
-
-        //merge the new values into the current ones or erase values if they are gone
-        ABVariantStore variantContainer = loadConfigVariant();
-        variantContainer.container = new JSONObject();
-        variantContainer.mergeValues(checkResponse);
-
-        L.d("[ModuleRemoteConfig] Finished variant processing, starting saving");
-
-        saveConfig(variantContainer);
-
-        L.d("[ModuleRemoteConfig] Finished variant saving");
-    }
-
     /*
      * Decide which keys to use
      * Useful if both 'keysExcept' and 'keysOnly' set
@@ -279,16 +289,6 @@ Object getValue(String key) {
         }
     }
 
-    void saveConfig(ABVariantStore variantStore) throws Exception {
-        variantMemContainer = variantStore.dataToString();
-    }
-
-    ABVariantStore loadConfigVariant() throws Exception {
-        String variantStoreString = variantMemContainer;
-        ABVariantStore variantStore = ABVariantStore.dataFromString(variantStoreString);
-        return variantStore;
-    }
-
     void saveConfig(RemoteConfigValueStore rcvs) throws Exception {
         storageProvider.setRemoteConfigValues(rcvs.dataToString());
     }
@@ -319,109 +319,12 @@ Map<String, Object> getAllRemoteConfigValuesInternal() {
     }
 
     /**
-     * Gets all AB testing variants stored in the storage
+     * Gets all AB testing variants stored in the memory
      *
      * @return
      */
-    Map<String, Object> getAllRemoteConfigVariantsInternal() {
-        try {
-            ABVariantStore stored = loadConfigVariant();
-            return stored.getAllValues();
-        } catch (Exception ex) {
-            Countly.sharedInstance().L.e("[ModuleRemoteConfig] getAllRemoteConfigVariantsInternal, Call failed:[" + ex.toString() + "]");
-            return null;
-        }
-    }
-
-    /**
-     * This class is used to do certain tasks on the AB variants in the storage or fetched from the server
-     */
-    static class ABVariantStore {
-        // create a new JSON object as a storage container
-        public JSONObject container = new JSONObject();
-
-        private ABVariantStore(JSONObject container) {
-            this.container = container;
-        }
-
-        public Object getVariant(String key) {
-            return container.opt(key);
-        }
-
-        /**
-         * Adds new values to the current storage instead of replacing it all
-         *
-         * @param newVariants - new variants fetched from the server
-         */
-        public void mergeValues(JSONObject newVariants) {
-            if (newVariants == null) {
-                return;
-            }
-
-            Iterator<String> iter = newVariants.keys();
-            while (iter.hasNext()) {
-                String key = iter.next();
-                try {
-                    Object value = newVariants.get(key);
-                    JSONArray existingVariants = container.optJSONArray(key);
-
-                    if (existingVariants != null) {
-                        // Merge with existing variants
-                        JSONArray mergedVariants = new JSONArray();
-                        for (int i = 0; i < existingVariants.length(); i++) {
-                            mergedVariants.put(existingVariants.getJSONObject(i));
-                        }
-                        mergedVariants.put(value);
-                        container.put(key, mergedVariants);
-                    } else {
-                        // Add new entry
-                        JSONArray newEntry = new JSONArray();
-                        newEntry.put(value);
-                        container.put(key, newEntry);
-                    }
-                } catch (Exception e) {
-                    Countly.sharedInstance().L.e("[ABVariantStore] Failed merging new variant values");
-                }
-            }
-        }
-
-        public Map<String, Object> getAllValues() {
-            Map<String, Object> ret = new HashMap<>();
-
-            Iterator<String> keys = container.keys();
-
-            while (keys.hasNext()) {
-                String key = keys.next();
-
-                try {
-                    Object value = container.get(key);
-                    ret.put(key, value);
-                } catch (Exception ex) {
-                    Countly.sharedInstance().L.e("[ABVariantStore] Got JSON exception while calling 'getAllValues': " + ex.toString());
-                }
-            }
-
-            return ret;
-        }
-
-        public static ABVariantStore dataFromString(String storageString) {
-            if (storageString == null || storageString.isEmpty()) {
-                return new ABVariantStore(new JSONObject());
-            }
-
-            JSONObject values;
-            try {
-                values = new JSONObject(storageString);
-            } catch (JSONException e) {
-                Countly.sharedInstance().L.e("[ABVariantStore] Couldn't decode ABVariantStore successfully: " + e.toString());
-                values = new JSONObject();
-            }
-            return new ABVariantStore(values);
-        }
-
-        public String dataToString() {
-            return container.toString();
-        }
+    JSONObject getAllRemoteConfigVariantsInternal() {
+        return variantContainer;
     }
 
     static class RemoteConfigValueStore {
@@ -554,7 +457,7 @@ public Map<String, Object> getAllValues() {
             }
         }
 
-        public Map<String, Object> getAllVariants() {
+        public JSONObject getAllVariants() {
             synchronized (_cly) {
                 L.i("[RemoteConfig] Calling 'getAllVariants'");
 
@@ -584,6 +487,29 @@ public void testFetchAllVariants(RemoteConfigCallback callback) {
             }
         }
 
+        /**
+         * Enrolls user for a specific variant of A/B testing experiment
+         *
+         * @param keysAndVariant - An array of String, first value should be the key and the second the variant name
+         * @param callback
+         */
+        public void testEnrollIntoVariant(String[] keysAndVariant, RemoteConfigCallback callback) {
+            synchronized (_cly) {
+                L.i("[RemoteConfig] Calling 'testEnrollIntoVariant'");
+
+                if (!consentProvider.getConsent(Countly.CountlyFeatureNames.remoteConfig)) {
+                    return;
+                }
+
+                if (keysAndVariant == null) {
+                    L.w("[RemoteConfig] testEnrollIntoVariant, passed 'keysAndVariant' array is null. Aborting.");
+                    return;
+                }
+
+                testEnrollIntoVariantInternal(keysAndVariant, callback);
+            }
+        }
+
         /**
          * Get the stored value for the provided remote config_ key
          *
diff --git a/sdk/src/main/java/ly/count/android/sdk/RequestQueueProvider.java b/sdk/src/main/java/ly/count/android/sdk/RequestQueueProvider.java
index dedeffb70..7ccec1e0a 100644
--- a/sdk/src/main/java/ly/count/android/sdk/RequestQueueProvider.java
+++ b/sdk/src/main/java/ly/count/android/sdk/RequestQueueProvider.java
@@ -52,7 +52,9 @@ interface RequestQueueProvider {
 
     String prepareRemoteConfigRequest(@Nullable String keysInclude, @Nullable String keysExclude, @NonNull String preparedMetrics);
 
-    String prepareFetchAllVariants();
+    String prepareFetchAllVariants(); // for fetching all A/B test variants
+
+    String prepareEnrollVariant(String[] keyAndVariant); // for enrolling to an A/B test variant
 
     String prepareRatingWidgetRequest(String widgetId);
 

From d91a66c28335a23e1a25ce197e305fe34961b41c Mon Sep 17 00:00:00 2001
From: turtledreams <deniztaygunerten@gmail.com>
Date: Wed, 24 May 2023 19:47:52 +0900
Subject: [PATCH 06/18] rerolled some things

---
 .../count/android/sdk/ModuleRemoteConfig.java | 230 ++++++++++--------
 1 file changed, 127 insertions(+), 103 deletions(-)

diff --git a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
index a3408bc98..e3abc19e5 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
@@ -48,91 +48,6 @@ public void callback(String error) {
         remoteConfigInterface = new RemoteConfig();
     }
 
-    /**
-     * Checks if device ID is null and cancels the process if necessary
-     *
-     * @param message - unique message indicating where this check was done
-     * @param callback - callback to report if device ID is null
-     */
-    void checkDeviceId(String message, @Nullable final RemoteConfigCallback callback) {
-        if (deviceIdProvider.getDeviceId() == null) {
-            //device ID is null, abort
-            L.d("[ModuleRemoteConfig] " + message + " was aborted, deviceID is null");
-            if (callback != null) {
-                callback.callback("Can't complete " + message + ", device ID is null");
-            }
-            return;
-        }
-    }
-
-    /**
-     * Checks if temp ID mode is on and cancels the process if necessary
-     *
-     * @param message - unique message indicating where this check was done
-     * @param callback - callback to report if we are in temp ID mode
-     */
-    void checkTempId(String message, @Nullable final RemoteConfigCallback callback) {
-        if (deviceIdProvider.isTemporaryIdEnabled() || requestQueueProvider.queueContainsTemporaryIdItems()) {
-            //temporary id mode enabled, abort
-            L.d("[ModuleRemoteConfig] " + message + " was aborted, temporary device ID mode is set");
-            if (callback != null) {
-                callback.callback("Can't complete " + message + ", temporary device ID is set");
-            }
-            return;
-        }
-    }
-
-    /**
-     * Callback to be used in 'makeRequest'
-     */
-    public interface SuccessOperation {
-        void execute(JSONObject checkResponse) throws Exception;
-    }
-
-    /**
-     * Uses ImmediateRequestMaker to make a request at 'o/sdk' for a given request data. Also executes the given function
-     * TODO: should be able to provide API end point too
-     *
-     * @param message - unique message to show where we make the request
-     * @param requestData - data to send (things after '?')
-     * @param requestShouldBeDelayed - if a delay necessary in case of ID change
-     * @param callback - Provided callback to relay info
-     * @param successOperation - Things to do if response was valid
-     */
-    void makeRequest(String message, String requestData, boolean requestShouldBeDelayed, @Nullable final RemoteConfigCallback callback, @Nullable SuccessOperation successOperation) {
-        L.d("[ModuleRemoteConfig] " + message + " requestData:[" + requestData + "]");
-
-        ConnectionProcessor cp = requestQueueProvider.createConnectionProcessor();
-        final boolean networkingIsEnabled = cp.configProvider_.getNetworkingEnabled();
-
-        (new ImmediateRequestMaker()).doWork(requestData, "/o/sdk", cp, requestShouldBeDelayed, networkingIsEnabled, new ImmediateRequestMaker.InternalImmediateRequestCallback() {
-            @Override
-            public void callback(JSONObject checkResponse) {
-                L.d("[ModuleRemoteConfig] Processing " + message + " received response, received response is null:[" + (checkResponse == null) + "]");
-                if (checkResponse == null) {
-                    if (callback != null) {
-                        callback.callback("Encountered problem while trying to reach the server, possibly no internet connection");
-                    }
-                    return;
-                }
-
-                String error = null;
-                try {
-                    if (successOperation != null) {
-                        successOperation.execute(checkResponse);
-                    }
-                } catch (Exception ex) {
-                    L.e("[ModuleRemoteConfig] " + message + " - execute, Encountered critical issue:[" + ex.toString() + "]");
-                    error = "Encountered critical issue:[" + ex.toString() + "]";
-                }
-
-                if (callback != null) {
-                    callback.callback(error);
-                }
-            }
-        }, L);
-    }
-
     /**
      * Internal call for updating remote config keys
      *
@@ -146,21 +61,58 @@ void updateRemoteConfigValues(@Nullable final String[] keysOnly, @Nullable final
             L.d("[ModuleRemoteConfig] Updating remote config values, requestShouldBeDelayed:[" + requestShouldBeDelayed + "]");
 
             // checks
-            checkDeviceId("RemoteConfig value update", callback);
-            checkTempId("RemoteConfig value update", callback);
+            if (deviceIdProvider.getDeviceId() == null) {
+                //device ID is null, abort
+                L.d("[ModuleRemoteConfig] RemoteConfig value update was aborted, deviceID is null");
+                if (callback != null) {
+                    callback.callback("Can't complete call, device ID is null");
+                }
+                return;
+            }
+
+            if (deviceIdProvider.isTemporaryIdEnabled() || requestQueueProvider.queueContainsTemporaryIdItems()) {
+                //temporary id mode enabled, abort
+                L.d("[ModuleRemoteConfig] RemoteConfig value update was aborted, temporary device ID mode is set");
+                if (callback != null) {
+                    callback.callback("Can't complete call, temporary device ID is set");
+                }
+                return;
+            }
 
             //prepare metrics and request data
             String preparedMetrics = deviceInfo.getMetrics(_cly.context_, deviceInfo, metricOverride);
             String[] preparedKeys = prepareKeysIncludeExclude(keysOnly, keysExcept);
             String requestData = requestQueueProvider.prepareRemoteConfigRequest(preparedKeys[0], preparedKeys[1], preparedMetrics);
+            L.d("[ModuleRemoteConfig] RemoteConfig requestData:[" + requestData + "]");
+
+            ConnectionProcessor cp = requestQueueProvider.createConnectionProcessor();
+            final boolean networkingIsEnabled = cp.configProvider_.getNetworkingEnabled();
+
+            (new ImmediateRequestMaker()).doWork(requestData, "/o/sdk", cp, requestShouldBeDelayed, networkingIsEnabled, new ImmediateRequestMaker.InternalImmediateRequestCallback() {
+                @Override
+                public void callback(JSONObject checkResponse) {
+                    L.d("[ModuleRemoteConfig] Processing remote config received response, received response is null:[" + (checkResponse == null) + "]");
+                    if (checkResponse == null) {
+                        if (callback != null) {
+                            callback.callback("Encountered problem while trying to reach the server, possibly no internet connection");
+                        }
+                        return;
+                    }
 
-            // Make immediate request
-            makeRequest("Remote Config", requestData, false, callback, new SuccessOperation() {
-                @Override public void execute(JSONObject checkResponse) throws Exception {
-                    boolean clearOldValues = keysExcept == null && keysOnly == null;
-                    mergeCheckResponseIntoCurrentValues(clearOldValues, checkResponse);
+                    String error = null;
+                    try {
+                        boolean clearOldValues = keysExcept == null && keysOnly == null;
+                        mergeCheckResponseIntoCurrentValues(clearOldValues, checkResponse);
+                    } catch (Exception ex) {
+                        L.e("[ModuleRemoteConfig] updateRemoteConfigValues - execute, Encountered critical issue while trying to download remote config information from the server, [" + ex.toString() + "]");
+                        error = "Encountered critical issue while trying to download remote config information from the server, [" + ex.toString() + "]";
+                    }
+
+                    if (callback != null) {
+                        callback.callback(error);
+                    }
                 }
-            });
+            }, L);
         } catch (Exception ex) {
             L.e("[ModuleRemoteConfig] Encountered critical error while trying to perform a remote config update. " + ex.toString());
             if (callback != null) {
@@ -179,18 +131,56 @@ void testFetchAllVariantsInternal(final boolean requestShouldBeDelayed, @Nullabl
         try {
             L.d("[ModuleRemoteConfig] Fetching all A/B test variants, requestShouldBeDelayed:[" + requestShouldBeDelayed + "]");
 
-            checkDeviceId("Fetching all A/B test variants", callback);
-            checkTempId("Fetching all A/B test variants", callback);
+            if (deviceIdProvider.getDeviceId() == null) {
+                //device ID is null, abort
+                L.d("[ModuleRemoteConfig] Fetching all A/B test variants was aborted, deviceID is null");
+                if (callback != null) {
+                    callback.callback("Can't complete Fetching all A/B test variants, device ID is null");
+                }
+                return;
+            }
+
+            if (deviceIdProvider.isTemporaryIdEnabled() || requestQueueProvider.queueContainsTemporaryIdItems()) {
+                //temporary id mode enabled, abort
+                L.d("[ModuleRemoteConfig] Fetching all A/B test variants was aborted, temporary device ID mode is set");
+                if (callback != null) {
+                    callback.callback("Can't complete Fetching all A/B test variants, temporary device ID is set");
+                }
+                return;
+            }
 
             // prepare request data
             String requestData = requestQueueProvider.prepareFetchAllVariants();
 
-            // Make immediate request
-            makeRequest("Fetching all A/B test variants", requestData, false, callback, new SuccessOperation() {
-                @Override public void execute(JSONObject checkResponse) throws Exception {
-                    variantContainer = checkResponse;
+            L.d("[ModuleRemoteConfig] Fetching all A/B test variants requestData:[" + requestData + "]");
+
+            ConnectionProcessor cp = requestQueueProvider.createConnectionProcessor();
+            final boolean networkingIsEnabled = cp.configProvider_.getNetworkingEnabled();
+
+            (new ImmediateRequestMaker()).doWork(requestData, "/o/sdk", cp, requestShouldBeDelayed, networkingIsEnabled, new ImmediateRequestMaker.InternalImmediateRequestCallback() {
+                @Override
+                public void callback(JSONObject checkResponse) {
+                    L.d("[ModuleRemoteConfig] Processing Fetching all A/B test variants received response, received response is null:[" + (checkResponse == null) + "]");
+                    if (checkResponse == null) {
+                        if (callback != null) {
+                            callback.callback("Encountered problem while trying to reach the server, possibly no internet connection");
+                        }
+                        return;
+                    }
+
+                    String error = null;
+                    try {
+                        variantContainer = checkResponse;
+                    } catch (Exception ex) {
+                        L.e("[ModuleRemoteConfig] testFetchAllVariantsInternal - execute, Encountered critical issue while trying to fetch all A/B test variants from the server, [" + ex.toString() + "]");
+                        error = "Encountered critical issue while trying to fetch all A/B test variants from the server, [" + ex.toString() + "]";
+                    }
+
+                    if (callback != null) {
+                        callback.callback(error);
+                    }
                 }
-            });
+            }, L);
         } catch (Exception ex) {
             L.e("[ModuleRemoteConfig] Encountered critical error while trying to fetch all A/B test variants. " + ex.toString());
             if (callback != null) {
@@ -203,7 +193,14 @@ void testEnrollIntoVariantInternal(@NonNull final String[] keyAndVariant, @Nulla
         try {
             L.d("[ModuleRemoteConfig] Enrolling A/B test variants, Key/Variant pairs:[" + keyAndVariant.toString() + "]");
 
-            checkDeviceId("Enrolling to A/B test variants", callback);
+            if (deviceIdProvider.getDeviceId() == null) {
+                //device ID is null, abort
+                L.d("[ModuleRemoteConfig] Enrolling A/B test variants was aborted, deviceID is null");
+                if (callback != null) {
+                    callback.callback("Can't complete Enrolling A/B test variants, device ID is null");
+                }
+                return;
+            }
 
             // checkKeyAndVariant
             if (!(keyAndVariant.length >= 2) || TextUtils.isEmpty(keyAndVariant[0]) || TextUtils.isEmpty(keyAndVariant[1])) {
@@ -214,8 +211,35 @@ void testEnrollIntoVariantInternal(@NonNull final String[] keyAndVariant, @Nulla
             // prepare request data
             String requestData = requestQueueProvider.prepareEnrollVariant(keyAndVariant);
 
-            // Make immediate request
-            makeRequest("Enrolling to A/B test variants", requestData, false, callback, null);
+            L.d("[ModuleRemoteConfig] Enrolling A/B test variants requestData:[" + requestData + "]");
+
+            ConnectionProcessor cp = requestQueueProvider.createConnectionProcessor();
+            final boolean networkingIsEnabled = cp.configProvider_.getNetworkingEnabled();
+
+            (new ImmediateRequestMaker()).doWork(requestData, "/o/sdk", cp, false, networkingIsEnabled, new ImmediateRequestMaker.InternalImmediateRequestCallback() {
+                @Override
+                public void callback(JSONObject checkResponse) {
+                    L.d("[ModuleRemoteConfig] Processing Fetching all A/B test variants received response, received response is null:[" + (checkResponse == null) + "]");
+                    if (checkResponse == null) {
+                        if (callback != null) {
+                            callback.callback("Encountered problem while trying to reach the server, possibly no internet connection");
+                        }
+                        return;
+                    }
+
+                    String error = null;
+                    try {
+                        // TODO: DO sth?
+                    } catch (Exception ex) {
+                        L.e("[ModuleRemoteConfig] testFetchAllVariantsInternal - execute, Encountered critical issue while trying to enroll all A/B test variants from the server, [" + ex.toString() + "]");
+                        error = "Encountered critical issue while trying to enroll all A/B test variants from the server, [" + ex.toString() + "]";
+                    }
+
+                    if (callback != null) {
+                        callback.callback(error);
+                    }
+                }
+            }, L);
         } catch (Exception ex) {
             L.e("[ModuleRemoteConfig] Encountered critical error while trying to enroll A/B test variants. " + ex.toString());
             if (callback != null) {

From ef5359ce1db3e7430415f5e86f8b48843fab6779 Mon Sep 17 00:00:00 2001
From: turtledreams <deniztaygunerten@gmail.com>
Date: Wed, 24 May 2023 21:08:17 +0900
Subject: [PATCH 07/18] new activity

---
 app/src/main/AndroidManifest.xml              |   4 +
 .../demo/ActivityExampleRemoteConfig.java     |  66 -----------
 .../android/demo/ActivityExampleTests.java    | 110 ++++++++++++++++++
 .../ly/count/android/demo/MainActivity.java   |   4 +
 .../layout/activity_example_remote_config.xml |  21 ----
 .../res/layout/activity_example_tests.xml     |  43 +++++++
 app/src/main/res/layout/activity_main.xml     |   8 ++
 7 files changed, 169 insertions(+), 87 deletions(-)
 create mode 100644 app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
 create mode 100644 app/src/main/res/layout/activity_example_tests.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 150952acd..8d3334961 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -95,6 +95,10 @@
         android:label="@string/activity_name_feedback"
         android:configChanges="orientation|screenSize"></activity>
 
+    <activity
+        android:name=".ActivityExampleTests"
+        android:exported="false" />
+
     <activity
         android:name=".ActivityExampleDeepLinkA"
         android:label="Deep link A"
diff --git a/app/src/main/java/ly/count/android/demo/ActivityExampleRemoteConfig.java b/app/src/main/java/ly/count/android/demo/ActivityExampleRemoteConfig.java
index 8ad766cc7..47e0e71c0 100644
--- a/app/src/main/java/ly/count/android/demo/ActivityExampleRemoteConfig.java
+++ b/app/src/main/java/ly/count/android/demo/ActivityExampleRemoteConfig.java
@@ -7,7 +7,6 @@
 import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
-import java.util.Iterator;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -132,71 +131,6 @@ public void onClickRemoteConfigPrintValues(View v) {
         t.show();
     }
 
-    // For fetching all variants with a button click
-    public void onClickFetchAllVariants(View v) {
-        Countly.sharedInstance().remoteConfig().testFetchAllVariants(new RemoteConfigCallback() {
-            @Override
-            public void callback(String error) {
-                if (error == null) {
-                    Toast.makeText(getApplicationContext(), "Fetch finished", Toast.LENGTH_SHORT).show();
-                } else {
-                    Toast.makeText(getApplicationContext(), "Error: " + error, Toast.LENGTH_SHORT).show();
-                }
-            }
-        });
-    }
-
-    // To get all variants from the storage and show them with a toast
-    public void onClickVariantsPrintValues(View v) {
-        JSONObject values = Countly.sharedInstance().remoteConfig().getAllVariants();
-
-        Countly.sharedInstance().L.d("Get all variants: [" + values.toString() + "]");
-
-        Toast t = Toast.makeText(getApplicationContext(), "Stored Variant Values: [" + values.toString() + "]", Toast.LENGTH_LONG);
-        t.setGravity(Gravity.BOTTOM, 0, 0);
-        t.show();
-    }
-
-    public void onClickEnrollVariant(View v) {
-        JSONObject values = Countly.sharedInstance().remoteConfig().getAllVariants();
-        Countly.sharedInstance().L.d("Get all variants: [" + values.toString() + "]");
-
-
-        String[] result = null;
-
-        Iterator<String> keys = values.keys();
-        while (keys.hasNext()) {
-            String key = keys.next();
-            Object value = values.opt(key);
-
-            if (value instanceof JSONArray) {
-                JSONArray jsonArray = (JSONArray) value;
-                if (jsonArray.length() > 0 && jsonArray.opt(0) instanceof JSONObject) {
-                    JSONObject jsonObject = jsonArray.optJSONObject(0);
-                    String name = jsonObject.optString("name");
-                    String variant = jsonObject.optString("value");
-
-                    if (!name.isEmpty() && !variant.isEmpty()) {
-                        result = new String[]{key, variant};
-                        break;
-                    }
-                }
-            }
-        }
-
-
-        Countly.sharedInstance().remoteConfig().testEnrollIntoVariant(result, new RemoteConfigCallback() {
-            @Override
-            public void callback(String error) {
-                if (error == null) {
-                    Toast.makeText(getApplicationContext(), "Fetch finished", Toast.LENGTH_SHORT).show();
-                } else {
-                    Toast.makeText(getApplicationContext(), "Error: " + error, Toast.LENGTH_SHORT).show();
-                }
-            }
-        });
-    }
-
     @Override
     public void onStart() {
         super.onStart();
diff --git a/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java b/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
new file mode 100644
index 000000000..d272dd1b6
--- /dev/null
+++ b/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
@@ -0,0 +1,110 @@
+package ly.count.android.demo;
+
+import android.content.res.Configuration;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
+import android.os.Bundle;
+import java.util.Iterator;
+import ly.count.android.sdk.Countly;
+import ly.count.android.sdk.RemoteConfigCallback;
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+public class ActivityExampleTests extends AppCompatActivity {
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_example_tests);
+    }
+
+    // For fetching all variants with a button click
+    public void onClickFetchAllVariants(View v) {
+        Countly.sharedInstance().remoteConfig().testFetchAllVariants(new RemoteConfigCallback() {
+            @Override
+            public void callback(String error) {
+                if (error == null) {
+                    Toast.makeText(getApplicationContext(), "Fetch finished", Toast.LENGTH_SHORT).show();
+                } else {
+                    Toast.makeText(getApplicationContext(), "Error: " + error, Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+    }
+
+    // To get all variants from the storage and show them with a toast
+    public void onClickVariantsPrintValues(View v) {
+        JSONObject values = Countly.sharedInstance().remoteConfig().getAllVariants();
+        if(values== null) {
+            Countly.sharedInstance().L.w("No variants present");
+            return;
+        }
+        Countly.sharedInstance().L.d("Get all variants: [" + values.toString() + "]");
+
+        Toast t = Toast.makeText(getApplicationContext(), "Stored Variant Values: [" + values.toString() + "]", Toast.LENGTH_LONG);
+        t.setGravity(Gravity.BOTTOM, 0, 0);
+        t.show();
+    }
+
+    public void onClickEnrollVariant(View v) {
+        JSONObject values = Countly.sharedInstance().remoteConfig().getAllVariants();
+        if(values== null) {
+            Countly.sharedInstance().L.w("No variants present");
+            return;
+        }
+        Countly.sharedInstance().L.d("Get all variants: [" + values.toString() + "]");
+
+        String[] result = null;
+
+        Iterator<String> keys = values.keys();
+        while (keys.hasNext()) {
+            String key = keys.next();
+            Object value = values.opt(key);
+
+            if (value instanceof JSONArray) {
+                JSONArray jsonArray = (JSONArray) value;
+                if (jsonArray.length() > 0 && jsonArray.opt(0) instanceof JSONObject) {
+                    JSONObject jsonObject = jsonArray.optJSONObject(0);
+                    String name = jsonObject.optString("name");
+                    String variant = jsonObject.optString("value");
+
+                    if (!name.isEmpty() && !variant.isEmpty()) {
+                        result = new String[] { key, variant };
+                        break;
+                    }
+                }
+            }
+        }
+
+        Countly.sharedInstance().remoteConfig().testEnrollIntoVariant(result, new RemoteConfigCallback() {
+            @Override
+            public void callback(String error) {
+                if (error == null) {
+                    Toast.makeText(getApplicationContext(), "Fetch finished", Toast.LENGTH_SHORT).show();
+                } else {
+                    Toast.makeText(getApplicationContext(), "Error: " + error, Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        Countly.sharedInstance().onStart(this);
+    }
+
+    @Override
+    public void onStop() {
+        Countly.sharedInstance().onStop();
+        super.onStop();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        Countly.sharedInstance().onConfigurationChanged(newConfig);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ly/count/android/demo/MainActivity.java b/app/src/main/java/ly/count/android/demo/MainActivity.java
index f50c5e24d..b08355fe4 100644
--- a/app/src/main/java/ly/count/android/demo/MainActivity.java
+++ b/app/src/main/java/ly/count/android/demo/MainActivity.java
@@ -130,6 +130,10 @@ public void onClickButtonRemoteConfig(View v) {
         startActivity(new Intent(this, ActivityExampleRemoteConfig.class));
     }
 
+    public void onClickButtonTests(View v) {
+        startActivity(new Intent(this, ActivityExampleTests.class));
+    }
+
     public void onClickButtonDeviceId(View v) {
         startActivity(new Intent(this, ActivityExampleDeviceId.class));
     }
diff --git a/app/src/main/res/layout/activity_example_remote_config.xml b/app/src/main/res/layout/activity_example_remote_config.xml
index e86dce8ba..6112959bb 100644
--- a/app/src/main/res/layout/activity_example_remote_config.xml
+++ b/app/src/main/res/layout/activity_example_remote_config.xml
@@ -58,25 +58,4 @@
       android:onClick="onClickRemoteConfigPrintValues"
       android:text="Remote Config Print Stored Values"
       />
-  <Button
-      android:id="@+id/fetch_ab_variants"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:onClick="onClickFetchAllVariants"
-      android:text="Fetch All vARIANTS"
-      />
-  <Button
-      android:id="@+id/get_all_variants"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:onClick="onClickVariantsPrintValues"
-      android:text="get all variants"
-      />
-  <Button
-      android:id="@+id/enroll_variant"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:onClick="onClickEnrollVariant"
-      android:text="Enroll first variant"
-      />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_example_tests.xml b/app/src/main/res/layout/activity_example_tests.xml
new file mode 100644
index 000000000..c91a77b26
--- /dev/null
+++ b/app/src/main/res/layout/activity_example_tests.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ActivityExampleTests"
+    >
+
+  <LinearLayout
+      android:layout_width="409dp"
+      android:layout_height="729dp"
+      android:gravity="center_vertical"
+      android:orientation="vertical"
+      android:padding="@dimen/activity_horizontal_margin"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      >
+    <Button
+        android:id="@+id/enroll_variant"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:onClick="onClickEnrollVariant"
+        android:text="Enroll first variant"
+        />
+    <Button
+        android:id="@+id/get_all_variants"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:onClick="onClickVariantsPrintValues"
+        android:text="get all variants"
+        />
+    <Button
+        android:id="@+id/fetch_ab_variants"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:onClick="onClickFetchAllVariants"
+        android:text="Fetch All vARIANTS"
+        />
+  </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2d4b6172c..850992544 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -99,5 +99,13 @@
         android:onClick="onClickButtonOthers"
         />
 
+    <Button
+        android:id="@+id/tests_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:onClick="onClickButtonTests"
+        android:text="Tests"
+        />
+
   </LinearLayout>
 </RelativeLayout>

From af306e6121cff4d982fa0f279de9b03097ac5b35 Mon Sep 17 00:00:00 2001
From: turtledreams <deniztaygunerten@gmail.com>
Date: Wed, 24 May 2023 21:24:11 +0900
Subject: [PATCH 08/18] array to string parameters

---
 .../android/demo/ActivityExampleTests.java    |  2 +-
 .../ly/count/android/sdk/ConnectionQueue.java |  6 +++---
 .../count/android/sdk/ModuleRemoteConfig.java | 21 ++++++++++---------
 .../android/sdk/RequestQueueProvider.java     |  2 +-
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java b/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
index d272dd1b6..d93cac142 100644
--- a/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
+++ b/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
@@ -78,7 +78,7 @@ public void onClickEnrollVariant(View v) {
             }
         }
 
-        Countly.sharedInstance().remoteConfig().testEnrollIntoVariant(result, new RemoteConfigCallback() {
+        Countly.sharedInstance().remoteConfig().testEnrollIntoVariant(result[0], result[1], new RemoteConfigCallback() {
             @Override
             public void callback(String error) {
                 if (error == null) {
diff --git a/sdk/src/main/java/ly/count/android/sdk/ConnectionQueue.java b/sdk/src/main/java/ly/count/android/sdk/ConnectionQueue.java
index d68e56793..b1969ab11 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ConnectionQueue.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ConnectionQueue.java
@@ -725,12 +725,12 @@ public String prepareFetchAllVariants() {
         return data;
     }
 
-    public String prepareEnrollVariant(String[] keyAndVariant){
+    public String prepareEnrollVariant(String key, String variant){
         String data = "method=ab_enroll_variant"
             + "&app_key=" + UtilsNetworking.urlEncodeString(baseInfoProvider.getAppKey())
             + "&device_id=" + UtilsNetworking.urlEncodeString(deviceIdProvider_.getDeviceId())
-            + "&key=" + UtilsNetworking.urlEncodeString(keyAndVariant[0])
-            + "&variant=" + UtilsNetworking.urlEncodeString(keyAndVariant[1]);
+            + "&key=" + UtilsNetworking.urlEncodeString(key)
+            + "&variant=" + UtilsNetworking.urlEncodeString(variant);
 
         return data;
     }
diff --git a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
index e3abc19e5..0414ba1e1 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
@@ -189,9 +189,9 @@ public void callback(JSONObject checkResponse) {
         }
     }
 
-    void testEnrollIntoVariantInternal(@NonNull final String[] keyAndVariant, @Nullable final RemoteConfigCallback callback) {
+    void testEnrollIntoVariantInternal(@NonNull final String key, @NonNull final String variant, @Nullable final RemoteConfigCallback callback) {
         try {
-            L.d("[ModuleRemoteConfig] Enrolling A/B test variants, Key/Variant pairs:[" + keyAndVariant.toString() + "]");
+            L.d("[ModuleRemoteConfig] Enrolling A/B test variants, Key/Variant pairs:[" + key + "][" + variant + "]");
 
             if (deviceIdProvider.getDeviceId() == null) {
                 //device ID is null, abort
@@ -202,14 +202,14 @@ void testEnrollIntoVariantInternal(@NonNull final String[] keyAndVariant, @Nulla
                 return;
             }
 
-            // checkKeyAndVariant
-            if (!(keyAndVariant.length >= 2) || TextUtils.isEmpty(keyAndVariant[0]) || TextUtils.isEmpty(keyAndVariant[1])) {
+            // check Key and Variant
+            if (TextUtils.isEmpty(key) || TextUtils.isEmpty(variant)) {
                 L.w("[ModuleRemoteConfig] Enrolling A/B test variants, Key/Variant pair is invalid. Aborting.");
                 return;
             }
 
             // prepare request data
-            String requestData = requestQueueProvider.prepareEnrollVariant(keyAndVariant);
+            String requestData = requestQueueProvider.prepareEnrollVariant(key, variant);
 
             L.d("[ModuleRemoteConfig] Enrolling A/B test variants requestData:[" + requestData + "]");
 
@@ -514,10 +514,11 @@ public void testFetchAllVariants(RemoteConfigCallback callback) {
         /**
          * Enrolls user for a specific variant of A/B testing experiment
          *
-         * @param keysAndVariant - An array of String, first value should be the key and the second the variant name
+         * @param key - key value retrieved from the fetched variants
+         * @param variant - name of the variant for the key to enroll
          * @param callback
          */
-        public void testEnrollIntoVariant(String[] keysAndVariant, RemoteConfigCallback callback) {
+        public void testEnrollIntoVariant(String key, String variant, RemoteConfigCallback callback) {
             synchronized (_cly) {
                 L.i("[RemoteConfig] Calling 'testEnrollIntoVariant'");
 
@@ -525,12 +526,12 @@ public void testEnrollIntoVariant(String[] keysAndVariant, RemoteConfigCallback
                     return;
                 }
 
-                if (keysAndVariant == null) {
-                    L.w("[RemoteConfig] testEnrollIntoVariant, passed 'keysAndVariant' array is null. Aborting.");
+                if (key == null || variant == null) {
+                    L.w("[RemoteConfig] testEnrollIntoVariant, passed key or variant is null. Aborting.");
                     return;
                 }
 
-                testEnrollIntoVariantInternal(keysAndVariant, callback);
+                testEnrollIntoVariantInternal(key, variant, callback);
             }
         }
 
diff --git a/sdk/src/main/java/ly/count/android/sdk/RequestQueueProvider.java b/sdk/src/main/java/ly/count/android/sdk/RequestQueueProvider.java
index 7ccec1e0a..97745689b 100644
--- a/sdk/src/main/java/ly/count/android/sdk/RequestQueueProvider.java
+++ b/sdk/src/main/java/ly/count/android/sdk/RequestQueueProvider.java
@@ -54,7 +54,7 @@ interface RequestQueueProvider {
 
     String prepareFetchAllVariants(); // for fetching all A/B test variants
 
-    String prepareEnrollVariant(String[] keyAndVariant); // for enrolling to an A/B test variant
+    String prepareEnrollVariant(String key, String Variant); // for enrolling to an A/B test variant
 
     String prepareRatingWidgetRequest(String widgetId);
 

From d736f1131919a71c7b1d57fbb01bb3a922fd1fbf Mon Sep 17 00:00:00 2001
From: turtledreams <deniztaygunerten@gmail.com>
Date: Wed, 24 May 2023 22:16:02 +0900
Subject: [PATCH 09/18] talked changes but poor enums and no result handling

---
 .../android/demo/ActivityExampleTests.java    |  23 ++--
 .../java/ly/count/android/sdk/Countly.java    |  11 ++
 .../count/android/sdk/ModuleRemoteConfig.java | 102 ++++++++++--------
 .../sdk/RemoteConfigVariantCallback.java      |  11 ++
 4 files changed, 91 insertions(+), 56 deletions(-)
 create mode 100644 sdk/src/main/java/ly/count/android/sdk/RemoteConfigVariantCallback.java

diff --git a/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java b/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
index d93cac142..43f5eea3b 100644
--- a/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
+++ b/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
@@ -8,7 +8,7 @@
 import android.os.Bundle;
 import java.util.Iterator;
 import ly.count.android.sdk.Countly;
-import ly.count.android.sdk.RemoteConfigCallback;
+import ly.count.android.sdk.RemoteConfigVariantCallback;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -22,13 +22,13 @@ public void onCreate(Bundle savedInstanceState) {
 
     // For fetching all variants with a button click
     public void onClickFetchAllVariants(View v) {
-        Countly.sharedInstance().remoteConfig().testFetchAllVariants(new RemoteConfigCallback() {
+        Countly.sharedInstance().remoteConfig().testFetchAllVariants(new RemoteConfigVariantCallback() {
             @Override
-            public void callback(String error) {
-                if (error == null) {
+            public void callback(Enum result) {
+                if (result == Countly.RCVariantEnums.RESULT_SUCCESS) {
                     Toast.makeText(getApplicationContext(), "Fetch finished", Toast.LENGTH_SHORT).show();
                 } else {
-                    Toast.makeText(getApplicationContext(), "Error: " + error, Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getApplicationContext(), "Error: " + result, Toast.LENGTH_SHORT).show();
                 }
             }
         });
@@ -37,7 +37,7 @@ public void callback(String error) {
     // To get all variants from the storage and show them with a toast
     public void onClickVariantsPrintValues(View v) {
         JSONObject values = Countly.sharedInstance().remoteConfig().getAllVariants();
-        if(values== null) {
+        if (values == null) {
             Countly.sharedInstance().L.w("No variants present");
             return;
         }
@@ -50,7 +50,7 @@ public void onClickVariantsPrintValues(View v) {
 
     public void onClickEnrollVariant(View v) {
         JSONObject values = Countly.sharedInstance().remoteConfig().getAllVariants();
-        if(values== null) {
+        if (values == null) {
             Countly.sharedInstance().L.w("No variants present");
             return;
         }
@@ -71,6 +71,7 @@ public void onClickEnrollVariant(View v) {
                     String variant = jsonObject.optString("value");
 
                     if (!name.isEmpty() && !variant.isEmpty()) {
+                        // TODO: change this after API is fixed
                         result = new String[] { key, variant };
                         break;
                     }
@@ -78,13 +79,13 @@ public void onClickEnrollVariant(View v) {
             }
         }
 
-        Countly.sharedInstance().remoteConfig().testEnrollIntoVariant(result[0], result[1], new RemoteConfigCallback() {
+        Countly.sharedInstance().remoteConfig().testEnrollIntoVariant(result[0], result[1], new RemoteConfigVariantCallback() {
             @Override
-            public void callback(String error) {
-                if (error == null) {
+            public void callback(Enum result) {
+                if (result == Countly.RCVariantEnums.RESULT_SUCCESS) {
                     Toast.makeText(getApplicationContext(), "Fetch finished", Toast.LENGTH_SHORT).show();
                 } else {
-                    Toast.makeText(getApplicationContext(), "Error: " + error, Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getApplicationContext(), "Error: " + result, Toast.LENGTH_SHORT).show();
                 }
             }
         });
diff --git a/sdk/src/main/java/ly/count/android/sdk/Countly.java b/sdk/src/main/java/ly/count/android/sdk/Countly.java
index 818474852..8200ba5e8 100644
--- a/sdk/src/main/java/ly/count/android/sdk/Countly.java
+++ b/sdk/src/main/java/ly/count/android/sdk/Countly.java
@@ -119,6 +119,17 @@ public enum CountlyMessagingProvider {
         HMS,    // Huawei
     }
 
+    /**
+     * Enum used throughout Countly for relaying result of A/B test variants fetch
+     * TODO: Make it proper with correct enums and variety
+     */
+    public enum RCVariantEnums {
+        SERVER_NOT_REACHABLE,
+        RESULT_SUCCESS,
+        TEMP_OR_DEVICE_ID_ISSUE,
+        CRITICAL_ERROR,
+    }
+
     //SDK limit defaults
     final int maxKeyLengthDefault = 128;
     final int maxValueSizeDefault = 256;
diff --git a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
index 0414ba1e1..0a6560b94 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
@@ -124,27 +124,16 @@ public void callback(JSONObject checkResponse) {
     /**
      * Internal call for fetching all variants of A/B test experiments
      *
-     * @param requestShouldBeDelayed this is set to true in case of fetching after a deviceId change
      * @param callback called after the fetch is done
      */
-    void testFetchAllVariantsInternal(final boolean requestShouldBeDelayed, @Nullable final RemoteConfigCallback callback) {
+    void testFetchAllVariantsInternal(@Nullable final RemoteConfigVariantCallback callback) {
         try {
-            L.d("[ModuleRemoteConfig] Fetching all A/B test variants, requestShouldBeDelayed:[" + requestShouldBeDelayed + "]");
+            L.d("[ModuleRemoteConfig] Fetching all A/B test variants");
 
-            if (deviceIdProvider.getDeviceId() == null) {
-                //device ID is null, abort
-                L.d("[ModuleRemoteConfig] Fetching all A/B test variants was aborted, deviceID is null");
-                if (callback != null) {
-                    callback.callback("Can't complete Fetching all A/B test variants, device ID is null");
-                }
-                return;
-            }
-
-            if (deviceIdProvider.isTemporaryIdEnabled() || requestQueueProvider.queueContainsTemporaryIdItems()) {
-                //temporary id mode enabled, abort
-                L.d("[ModuleRemoteConfig] Fetching all A/B test variants was aborted, temporary device ID mode is set");
+            if (deviceIdProvider.isTemporaryIdEnabled() || requestQueueProvider.queueContainsTemporaryIdItems() || deviceIdProvider.getDeviceId() == null) {
+                L.d("[ModuleRemoteConfig] Fetching all A/B test variants was aborted, temporary device ID mode is set or device ID is null.");
                 if (callback != null) {
-                    callback.callback("Can't complete Fetching all A/B test variants, temporary device ID is set");
+                    callback.callback(Countly.RCVariantEnums.TEMP_OR_DEVICE_ID_ISSUE);
                 }
                 return;
             }
@@ -157,17 +146,16 @@ void testFetchAllVariantsInternal(final boolean requestShouldBeDelayed, @Nullabl
             ConnectionProcessor cp = requestQueueProvider.createConnectionProcessor();
             final boolean networkingIsEnabled = cp.configProvider_.getNetworkingEnabled();
 
-            (new ImmediateRequestMaker()).doWork(requestData, "/o/sdk", cp, requestShouldBeDelayed, networkingIsEnabled, new ImmediateRequestMaker.InternalImmediateRequestCallback() {
+            (new ImmediateRequestMaker()).doWork(requestData, "/o/sdk", cp, false, networkingIsEnabled, new ImmediateRequestMaker.InternalImmediateRequestCallback() {
                 @Override
                 public void callback(JSONObject checkResponse) {
                     L.d("[ModuleRemoteConfig] Processing Fetching all A/B test variants received response, received response is null:[" + (checkResponse == null) + "]");
                     if (checkResponse == null) {
-                        if (callback != null) {
-                            callback.callback("Encountered problem while trying to reach the server, possibly no internet connection");
-                        }
+                        callback.callback(Countly.RCVariantEnums.SERVER_NOT_REACHABLE);
                         return;
                     }
 
+                    // TODO: wrt checkResponse handle enums here
                     String error = null;
                     try {
                         variantContainer = checkResponse;
@@ -176,28 +164,23 @@ public void callback(JSONObject checkResponse) {
                         error = "Encountered critical issue while trying to fetch all A/B test variants from the server, [" + ex.toString() + "]";
                     }
 
-                    if (callback != null) {
-                        callback.callback(error);
-                    }
+                    callback.callback(Countly.RCVariantEnums.RESULT_SUCCESS);
                 }
             }, L);
         } catch (Exception ex) {
             L.e("[ModuleRemoteConfig] Encountered critical error while trying to fetch all A/B test variants. " + ex.toString());
-            if (callback != null) {
-                callback.callback("Encountered critical error while trying to fetch all A/B test variants");
-            }
+            callback.callback(Countly.RCVariantEnums.CRITICAL_ERROR);
         }
     }
 
-    void testEnrollIntoVariantInternal(@NonNull final String key, @NonNull final String variant, @Nullable final RemoteConfigCallback callback) {
+    void testEnrollIntoVariantInternal(@NonNull final String key, @NonNull final String variant, @Nullable final RemoteConfigVariantCallback callback) {
         try {
             L.d("[ModuleRemoteConfig] Enrolling A/B test variants, Key/Variant pairs:[" + key + "][" + variant + "]");
 
-            if (deviceIdProvider.getDeviceId() == null) {
-                //device ID is null, abort
-                L.d("[ModuleRemoteConfig] Enrolling A/B test variants was aborted, deviceID is null");
+            if (deviceIdProvider.isTemporaryIdEnabled() || requestQueueProvider.queueContainsTemporaryIdItems() || deviceIdProvider.getDeviceId() == null) {
+                L.d("[ModuleRemoteConfig] Enrolling A/B test variants was aborted, temporary device ID mode is set or device ID is null.");
                 if (callback != null) {
-                    callback.callback("Can't complete Enrolling A/B test variants, device ID is null");
+                    callback.callback(Countly.RCVariantEnums.TEMP_OR_DEVICE_ID_ISSUE);
                 }
                 return;
             }
@@ -221,30 +204,36 @@ void testEnrollIntoVariantInternal(@NonNull final String key, @NonNull final Str
                 public void callback(JSONObject checkResponse) {
                     L.d("[ModuleRemoteConfig] Processing Fetching all A/B test variants received response, received response is null:[" + (checkResponse == null) + "]");
                     if (checkResponse == null) {
-                        if (callback != null) {
-                            callback.callback("Encountered problem while trying to reach the server, possibly no internet connection");
-                        }
+                        callback.callback(Countly.RCVariantEnums.SERVER_NOT_REACHABLE);
                         return;
                     }
 
+                    // TODO: wrt checkResponse handle enums here
                     String error = null;
                     try {
-                        // TODO: DO sth?
+                        if (remoteConfigAutomaticUpdateEnabled) {
+                            // TODO: Check consent here? Should not call directly?
+                            updateRemoteConfigValues(null, null, false, new RemoteConfigCallback() {
+                                @Override public void callback(String error) {
+                                    if (error != null) {
+                                        L.d("[ModuleRemoteConfig] Updated remote config after enrolling to a variant");
+                                    } else {
+                                        L.e("[ModuleRemoteConfig] Attempt to update the remote config after enrolling to a variant failed:" + error.toString());
+                                    }
+                                }
+                            });
+                        }
                     } catch (Exception ex) {
                         L.e("[ModuleRemoteConfig] testFetchAllVariantsInternal - execute, Encountered critical issue while trying to enroll all A/B test variants from the server, [" + ex.toString() + "]");
                         error = "Encountered critical issue while trying to enroll all A/B test variants from the server, [" + ex.toString() + "]";
                     }
 
-                    if (callback != null) {
-                        callback.callback(error);
-                    }
+                    callback.callback(Countly.RCVariantEnums.RESULT_SUCCESS);
                 }
             }, L);
         } catch (Exception ex) {
             L.e("[ModuleRemoteConfig] Encountered critical error while trying to enroll A/B test variants. " + ex.toString());
-            if (callback != null) {
-                callback.callback("Encountered critical error while trying to enroll A/B test variants");
-            }
+            callback.callback(Countly.RCVariantEnums.CRITICAL_ERROR);
         }
     }
 
@@ -498,7 +487,7 @@ public JSONObject getAllVariants() {
          *
          * @param callback
          */
-        public void testFetchAllVariants(RemoteConfigCallback callback) {
+        public void testFetchAllVariants(RemoteConfigVariantCallback callback) {
             synchronized (_cly) {
                 L.i("[RemoteConfig] Calling 'testFetchAllVariants'");
 
@@ -506,8 +495,19 @@ public void testFetchAllVariants(RemoteConfigCallback callback) {
                     return;
                 }
 
-                testFetchAllVariantsInternal(false, callback);
-                // TODO: requestShouldBeDelayed necessary?
+                if (callback == null) {
+                    callback = new RemoteConfigVariantCallback() {
+                        @Override public void callback(Enum result) {
+                            if (result == Countly.RCVariantEnums.RESULT_SUCCESS) {
+                                L.i("[RemoteConfig] Fetched all variants successfully");
+                            } else {
+                                L.e("[RemoteConfig] Fetching all variants failed" + result);
+                            }
+                        }
+                    };
+                }
+
+                testFetchAllVariantsInternal(callback);
             }
         }
 
@@ -518,7 +518,7 @@ public void testFetchAllVariants(RemoteConfigCallback callback) {
          * @param variant - name of the variant for the key to enroll
          * @param callback
          */
-        public void testEnrollIntoVariant(String key, String variant, RemoteConfigCallback callback) {
+        public void testEnrollIntoVariant(String key, String variant, RemoteConfigVariantCallback callback) {
             synchronized (_cly) {
                 L.i("[RemoteConfig] Calling 'testEnrollIntoVariant'");
 
@@ -531,6 +531,18 @@ public void testEnrollIntoVariant(String key, String variant, RemoteConfigCallba
                     return;
                 }
 
+                if (callback == null) {
+                    callback = new RemoteConfigVariantCallback() {
+                        @Override public void callback(Enum result) {
+                            if (result == Countly.RCVariantEnums.RESULT_SUCCESS) {
+                                L.i("[RemoteConfig] Enrolled to the variant successfully");
+                            } else {
+                                L.e("[RemoteConfig] Enrolling to the variant failed" + result);
+                            }
+                        }
+                    };
+                }
+
                 testEnrollIntoVariantInternal(key, variant, callback);
             }
         }
diff --git a/sdk/src/main/java/ly/count/android/sdk/RemoteConfigVariantCallback.java b/sdk/src/main/java/ly/count/android/sdk/RemoteConfigVariantCallback.java
new file mode 100644
index 000000000..571fe3b5a
--- /dev/null
+++ b/sdk/src/main/java/ly/count/android/sdk/RemoteConfigVariantCallback.java
@@ -0,0 +1,11 @@
+package ly.count.android.sdk;
+
+public interface RemoteConfigVariantCallback {
+
+    /**
+     * Called after fetching A/B test variants
+     *
+     * @param result provides an enum for the result of fetch request
+     */
+    void callback(Enum result);
+}

From 716d716a291490e8e86c397bcb75bbafa8e476e6 Mon Sep 17 00:00:00 2001
From: turtledreams <deniztaygunerten@gmail.com>
Date: Thu, 25 May 2023 21:08:53 +0900
Subject: [PATCH 10/18] tests

---
 .../android/demo/ActivityExampleTests.java    |  57 +++----
 .../sdk/RemoteConfigVariantControlTests.java  | 155 ++++++++++++++++++
 .../java/ly/count/android/sdk/Countly.java    |  11 --
 .../android/sdk/ImmediateRequestResponse.java |  13 ++
 .../count/android/sdk/ModuleRemoteConfig.java | 127 +++++++-------
 5 files changed, 263 insertions(+), 100 deletions(-)
 create mode 100644 sdk/src/androidTest/java/ly/count/android/sdk/RemoteConfigVariantControlTests.java
 create mode 100644 sdk/src/main/java/ly/count/android/sdk/ImmediateRequestResponse.java

diff --git a/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java b/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
index 43f5eea3b..e66cfe2ff 100644
--- a/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
+++ b/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
@@ -6,11 +6,11 @@
 import android.widget.Toast;
 import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
-import java.util.Iterator;
+import java.util.Arrays;
+import java.util.Map;
 import ly.count.android.sdk.Countly;
+import ly.count.android.sdk.ImmediateRequestResponse;
 import ly.count.android.sdk.RemoteConfigVariantCallback;
-import org.json.JSONArray;
-import org.json.JSONObject;
 
 public class ActivityExampleTests extends AppCompatActivity {
 
@@ -25,7 +25,7 @@ public void onClickFetchAllVariants(View v) {
         Countly.sharedInstance().remoteConfig().testFetchAllVariants(new RemoteConfigVariantCallback() {
             @Override
             public void callback(Enum result) {
-                if (result == Countly.RCVariantEnums.RESULT_SUCCESS) {
+                if (result == ImmediateRequestResponse.SUCCESS) {
                     Toast.makeText(getApplicationContext(), "Fetch finished", Toast.LENGTH_SHORT).show();
                 } else {
                     Toast.makeText(getApplicationContext(), "Error: " + result, Toast.LENGTH_SHORT).show();
@@ -36,53 +36,48 @@ public void callback(Enum result) {
 
     // To get all variants from the storage and show them with a toast
     public void onClickVariantsPrintValues(View v) {
-        JSONObject values = Countly.sharedInstance().remoteConfig().getAllVariants();
+        Map<String, String[]> values = Countly.sharedInstance().remoteConfig().getAllVariants();
         if (values == null) {
             Countly.sharedInstance().L.w("No variants present");
             return;
         }
-        Countly.sharedInstance().L.d("Get all variants: [" + values.toString() + "]");
+        Countly.sharedInstance().L.d("Get all variants: " + values);
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("Stored Variant Values:\n");
+        for (Map.Entry<String, String[]> entry : values.entrySet()) {
+            String key = entry.getKey();
+            String[] variants = entry.getValue();
+            sb.append(key).append(": ").append(Arrays.toString(variants)).append("\n");
+        }
 
-        Toast t = Toast.makeText(getApplicationContext(), "Stored Variant Values: [" + values.toString() + "]", Toast.LENGTH_LONG);
+        Toast t = Toast.makeText(getApplicationContext(), sb.toString(), Toast.LENGTH_LONG);
         t.setGravity(Gravity.BOTTOM, 0, 0);
         t.show();
     }
 
+
     public void onClickEnrollVariant(View v) {
-        JSONObject values = Countly.sharedInstance().remoteConfig().getAllVariants();
+        Map<String,String[]> values = Countly.sharedInstance().remoteConfig().getAllVariants();
         if (values == null) {
             Countly.sharedInstance().L.w("No variants present");
             return;
         }
         Countly.sharedInstance().L.d("Get all variants: [" + values.toString() + "]");
 
-        String[] result = null;
-
-        Iterator<String> keys = values.keys();
-        while (keys.hasNext()) {
-            String key = keys.next();
-            Object value = values.opt(key);
-
-            if (value instanceof JSONArray) {
-                JSONArray jsonArray = (JSONArray) value;
-                if (jsonArray.length() > 0 && jsonArray.opt(0) instanceof JSONObject) {
-                    JSONObject jsonObject = jsonArray.optJSONObject(0);
-                    String name = jsonObject.optString("name");
-                    String variant = jsonObject.optString("value");
-
-                    if (!name.isEmpty() && !variant.isEmpty()) {
-                        // TODO: change this after API is fixed
-                        result = new String[] { key, variant };
-                        break;
-                    }
-                }
-            }
+        // Get the first key and variant
+        String key = null;
+        String variant = null;
+        for (Map.Entry<String, String[]> entry : values.entrySet()) {
+            key = entry.getKey();
+            variant = entry.getValue()[0]; // first variant
+            break; // Get only the first key-value pair
         }
 
-        Countly.sharedInstance().remoteConfig().testEnrollIntoVariant(result[0], result[1], new RemoteConfigVariantCallback() {
+        Countly.sharedInstance().remoteConfig().testEnrollIntoVariant(key, variant, new RemoteConfigVariantCallback() {
             @Override
             public void callback(Enum result) {
-                if (result == Countly.RCVariantEnums.RESULT_SUCCESS) {
+                if (result == ImmediateRequestResponse.SUCCESS) {
                     Toast.makeText(getApplicationContext(), "Fetch finished", Toast.LENGTH_SHORT).show();
                 } else {
                     Toast.makeText(getApplicationContext(), "Error: " + result, Toast.LENGTH_SHORT).show();
diff --git a/sdk/src/androidTest/java/ly/count/android/sdk/RemoteConfigVariantControlTests.java b/sdk/src/androidTest/java/ly/count/android/sdk/RemoteConfigVariantControlTests.java
new file mode 100644
index 000000000..f6f9be0e6
--- /dev/null
+++ b/sdk/src/androidTest/java/ly/count/android/sdk/RemoteConfigVariantControlTests.java
@@ -0,0 +1,155 @@
+package ly.count.android.sdk;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import java.util.Map;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class RemoteConfigVariantControlTests {
+
+    @Test
+    public void testConvertVariantsJsonToMap_ValidInput_Multi() throws JSONException {
+        // Create a sample JSON object with variants
+        JSONObject variantsObj = new JSONObject();
+        JSONArray variantArray1 = new JSONArray();
+        variantArray1.put(new JSONObject().put("name", "Variant 1"));
+        variantArray1.put(new JSONObject().put("name", "Variant 2"));
+        JSONArray variantArray2 = new JSONArray();
+        variantArray2.put(new JSONObject().put("name", "Variant 3"));
+        variantArray2.put(new JSONObject().put("name", "Variant 4"));
+        variantsObj.put("key1", variantArray1);
+        variantsObj.put("key2", variantArray2);
+
+        // Call the function to convert variants JSON to a map
+        Map<String, String[]> resultMap = ModuleRemoteConfig.convertVariantsJsonToMap(variantsObj);
+
+        // Assert the expected map values
+        Assert.assertEquals(2, resultMap.size());
+
+        // Assert the values for key1
+        String[] key1Variants = resultMap.get("key1");
+        Assert.assertEquals(2, key1Variants.length);
+        Assert.assertEquals("Variant 1", key1Variants[0]);
+        Assert.assertEquals("Variant 2", key1Variants[1]);
+
+        // Assert the values for key2
+        String[] key2Variants = resultMap.get("key2");
+        Assert.assertEquals(2, key2Variants.length);
+        Assert.assertEquals("Variant 3", key2Variants[0]);
+        Assert.assertEquals("Variant 4", key2Variants[1]);
+    }
+
+
+    @Test
+    public void testConvertVariantsJsonToMap_ValidInput_Single() throws JSONException {
+        // Create a sample JSON object with valid variants
+        JSONObject variantsObj = new JSONObject();
+        variantsObj.put("key1", new JSONArray().put(new JSONObject().put("name", "Variant 1")));
+        variantsObj.put("key2", new JSONArray().put(new JSONObject().put("name", "Variant 2")));
+
+        // Call the function to convert variants JSON to a map
+        Map<String, String[]> resultMap = ModuleRemoteConfig.convertVariantsJsonToMap(variantsObj);
+
+        // Assert the expected map values
+        Assert.assertEquals(2, resultMap.size());
+
+        // Assert the values for key1
+        String[] key1Variants = resultMap.get("key1");
+        Assert.assertEquals(1, key1Variants.length);
+        Assert.assertEquals("Variant 1", key1Variants[0]);
+
+        // Assert the values for key2
+        String[] key2Variants = resultMap.get("key2");
+        Assert.assertEquals(1, key2Variants.length);
+        Assert.assertEquals("Variant 2", key2Variants[0]);
+    }
+
+    @Test(expected = JSONException.class)
+    public void testConvertVariantsJsonToMap_InvalidInput() throws JSONException {
+        // Create a sample JSON object with invalid variants (missing "name" field)
+        JSONObject variantsObj = new JSONObject();
+        variantsObj.put("key1", new JSONArray().put(new JSONObject().put("invalid_key", "Invalid Value")));
+
+        // Call the function to convert variants JSON to a map (expecting JSONException)
+        ModuleRemoteConfig.convertVariantsJsonToMap(variantsObj);
+    }
+
+
+    @Test(expected = JSONException.class)
+    public void testConvertVariantsJsonToMap_InvalidJson() throws JSONException {
+        // Test with invalid JSON object
+        JSONObject variantsObj = new JSONObject();
+        variantsObj.put("key1", "Invalid JSON");
+
+        // Call the function to convert variants JSON to a map (expecting JSONException)
+        ModuleRemoteConfig.convertVariantsJsonToMap(variantsObj);
+    }
+
+    @Test
+    public void testConvertVariantsJsonToMap_NoValues() throws JSONException {
+        // Create an empty JSON object
+        JSONObject variantsObj = new JSONObject();
+
+        // Call the function to convert variants JSON to a map
+        Map<String, String[]> resultMap = ModuleRemoteConfig.convertVariantsJsonToMap(variantsObj);
+
+        // Assert that the map is empty
+        Assert.assertTrue(resultMap.isEmpty());
+    }
+
+    @Test
+    public void testConvertVariantsJsonToMap_DifferentStructures() throws JSONException {
+        // Test with JSON object having different structures
+        JSONObject variantsObj = new JSONObject();
+
+        // Structure 1: Empty JSON array
+        variantsObj.put("key1", new JSONArray());
+
+        // Structure 2: Single variant as JSON object
+        variantsObj.put("key2", new JSONArray().put(new JSONObject().put("name", "Variant 1")));
+
+        // Structure 3: Multiple variants as JSON objects
+        variantsObj.put("key3", new JSONArray().put(new JSONObject().put("name", "Variant 2")).put(new JSONObject().put("name", "Variant 3")));
+
+        // Call the function to convert variants JSON to a map
+        Map<String, String[]> resultMap = ModuleRemoteConfig.convertVariantsJsonToMap(variantsObj);
+
+        // Assert the expected map values
+        Assert.assertEquals(3, resultMap.size());
+
+        // Assert the values for key1 (empty array)
+        String[] key1Variants = resultMap.get("key1");
+        Assert.assertEquals(0, key1Variants.length);
+
+        // Assert the values for key2 (single variant)
+        String[] key2Variants = resultMap.get("key2");
+        Assert.assertEquals(1, key2Variants.length);
+        Assert.assertEquals("Variant 1", key2Variants[0]);
+
+        // Assert the values for key3 (multiple variants)
+        String[] key3Variants = resultMap.get("key3");
+        Assert.assertEquals(2, key3Variants.length);
+        Assert.assertEquals("Variant 2", key3Variants[0]);
+        Assert.assertEquals("Variant 3", key3Variants[1]);
+    }
+
+    // TODO: is this okay?
+    @Test
+    public void testConvertVariantsJsonToMap_NullJsonKey() throws JSONException {
+        // Test with a null JSON key
+        String variantsObj = "{\"null\":[{\"name\":\"null\"}]}";
+
+        // Call the function to convert variants JSON to a map (expecting JSONException)
+        Map<String, String[]> resultMap = ModuleRemoteConfig.convertVariantsJsonToMap(new JSONObject(variantsObj));
+
+        // Assert the values for key1
+        String[] key1Variants = resultMap.get("null");
+        Assert.assertEquals(1, key1Variants.length);
+        Assert.assertEquals("null", key1Variants[0]);
+    }
+}
diff --git a/sdk/src/main/java/ly/count/android/sdk/Countly.java b/sdk/src/main/java/ly/count/android/sdk/Countly.java
index 8200ba5e8..818474852 100644
--- a/sdk/src/main/java/ly/count/android/sdk/Countly.java
+++ b/sdk/src/main/java/ly/count/android/sdk/Countly.java
@@ -119,17 +119,6 @@ public enum CountlyMessagingProvider {
         HMS,    // Huawei
     }
 
-    /**
-     * Enum used throughout Countly for relaying result of A/B test variants fetch
-     * TODO: Make it proper with correct enums and variety
-     */
-    public enum RCVariantEnums {
-        SERVER_NOT_REACHABLE,
-        RESULT_SUCCESS,
-        TEMP_OR_DEVICE_ID_ISSUE,
-        CRITICAL_ERROR,
-    }
-
     //SDK limit defaults
     final int maxKeyLengthDefault = 128;
     final int maxValueSizeDefault = 256;
diff --git a/sdk/src/main/java/ly/count/android/sdk/ImmediateRequestResponse.java b/sdk/src/main/java/ly/count/android/sdk/ImmediateRequestResponse.java
new file mode 100644
index 000000000..d7842bdd4
--- /dev/null
+++ b/sdk/src/main/java/ly/count/android/sdk/ImmediateRequestResponse.java
@@ -0,0 +1,13 @@
+package ly.count.android.sdk;
+
+/**
+ * Enum used throughout Countly for relaying result of A/B test variants fetch
+ * TODO: Make it proper with correct enums and variety
+ */
+public enum ImmediateRequestResponse {
+    NETWORK_ISSUE,
+    SUCCESS,
+    USAGE_ERROR,
+    INTERNAL_ERROR,
+}
+
diff --git a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
index 0a6560b94..bd330a33e 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
@@ -12,7 +12,7 @@
 
 public class ModuleRemoteConfig extends ModuleBase {
     boolean updateRemoteConfigAfterIdChange = false;
-    JSONObject variantContainer; // Stores the fetched A/B test variants
+    Map<String,String[]> variantContainer; // Stores the fetched A/B test variants
     RemoteConfig remoteConfigInterface = null;
 
     //if set to true, it will automatically download remote configs on module startup
@@ -104,8 +104,8 @@ public void callback(JSONObject checkResponse) {
                         boolean clearOldValues = keysExcept == null && keysOnly == null;
                         mergeCheckResponseIntoCurrentValues(clearOldValues, checkResponse);
                     } catch (Exception ex) {
-                        L.e("[ModuleRemoteConfig] updateRemoteConfigValues - execute, Encountered critical issue while trying to download remote config information from the server, [" + ex.toString() + "]");
-                        error = "Encountered critical issue while trying to download remote config information from the server, [" + ex.toString() + "]";
+                        L.e("[ModuleRemoteConfig] updateRemoteConfigValues - execute, Encountered internal issue while trying to download remote config information from the server, [" + ex.toString() + "]");
+                        error = "Encountered internal issue while trying to download remote config information from the server, [" + ex.toString() + "]";
                     }
 
                     if (callback != null) {
@@ -114,9 +114,9 @@ public void callback(JSONObject checkResponse) {
                 }
             }, L);
         } catch (Exception ex) {
-            L.e("[ModuleRemoteConfig] Encountered critical error while trying to perform a remote config update. " + ex.toString());
+            L.e("[ModuleRemoteConfig] Encountered internal error while trying to perform a remote config update. " + ex.toString());
             if (callback != null) {
-                callback.callback("Encountered critical error while trying to perform a remote config update");
+                callback.callback("Encountered internal error while trying to perform a remote config update");
             }
         }
     }
@@ -126,15 +126,13 @@ public void callback(JSONObject checkResponse) {
      *
      * @param callback called after the fetch is done
      */
-    void testFetchAllVariantsInternal(@Nullable final RemoteConfigVariantCallback callback) {
+    void testFetchAllVariantsInternal(@NonNull final RemoteConfigVariantCallback callback) {
         try {
             L.d("[ModuleRemoteConfig] Fetching all A/B test variants");
 
             if (deviceIdProvider.isTemporaryIdEnabled() || requestQueueProvider.queueContainsTemporaryIdItems() || deviceIdProvider.getDeviceId() == null) {
                 L.d("[ModuleRemoteConfig] Fetching all A/B test variants was aborted, temporary device ID mode is set or device ID is null.");
-                if (callback != null) {
-                    callback.callback(Countly.RCVariantEnums.TEMP_OR_DEVICE_ID_ISSUE);
-                }
+                callback.callback(ImmediateRequestResponse.USAGE_ERROR);
                 return;
             }
 
@@ -151,43 +149,42 @@ void testFetchAllVariantsInternal(@Nullable final RemoteConfigVariantCallback ca
                 public void callback(JSONObject checkResponse) {
                     L.d("[ModuleRemoteConfig] Processing Fetching all A/B test variants received response, received response is null:[" + (checkResponse == null) + "]");
                     if (checkResponse == null) {
-                        callback.callback(Countly.RCVariantEnums.SERVER_NOT_REACHABLE);
+                        callback.callback(ImmediateRequestResponse.NETWORK_ISSUE);
                         return;
                     }
 
                     // TODO: wrt checkResponse handle enums here
-                    String error = null;
+
                     try {
-                        variantContainer = checkResponse;
+                        Map<String,String[]> parsedResponse = convertVariantsJsonToMap(checkResponse);
+                        variantContainer = parsedResponse;
                     } catch (Exception ex) {
-                        L.e("[ModuleRemoteConfig] testFetchAllVariantsInternal - execute, Encountered critical issue while trying to fetch all A/B test variants from the server, [" + ex.toString() + "]");
-                        error = "Encountered critical issue while trying to fetch all A/B test variants from the server, [" + ex.toString() + "]";
+                        L.e("[ModuleRemoteConfig] testFetchAllVariantsInternal - execute, Encountered internal issue while trying to fetch information from the server, [" + ex.toString() + "]");
                     }
 
-                    callback.callback(Countly.RCVariantEnums.RESULT_SUCCESS);
+                    callback.callback(ImmediateRequestResponse.SUCCESS);
                 }
             }, L);
         } catch (Exception ex) {
-            L.e("[ModuleRemoteConfig] Encountered critical error while trying to fetch all A/B test variants. " + ex.toString());
-            callback.callback(Countly.RCVariantEnums.CRITICAL_ERROR);
+            L.e("[ModuleRemoteConfig] Encountered internal error while trying to fetch all A/B test variants. " + ex.toString());
+            callback.callback(ImmediateRequestResponse.INTERNAL_ERROR);
         }
     }
 
-    void testEnrollIntoVariantInternal(@NonNull final String key, @NonNull final String variant, @Nullable final RemoteConfigVariantCallback callback) {
+    void testEnrollIntoVariantInternal(@NonNull final String key, @NonNull final String variant, @NonNull final RemoteConfigVariantCallback callback) {
         try {
             L.d("[ModuleRemoteConfig] Enrolling A/B test variants, Key/Variant pairs:[" + key + "][" + variant + "]");
 
             if (deviceIdProvider.isTemporaryIdEnabled() || requestQueueProvider.queueContainsTemporaryIdItems() || deviceIdProvider.getDeviceId() == null) {
                 L.d("[ModuleRemoteConfig] Enrolling A/B test variants was aborted, temporary device ID mode is set or device ID is null.");
-                if (callback != null) {
-                    callback.callback(Countly.RCVariantEnums.TEMP_OR_DEVICE_ID_ISSUE);
-                }
+                callback.callback(ImmediateRequestResponse.USAGE_ERROR);
                 return;
             }
 
             // check Key and Variant
             if (TextUtils.isEmpty(key) || TextUtils.isEmpty(variant)) {
                 L.w("[ModuleRemoteConfig] Enrolling A/B test variants, Key/Variant pair is invalid. Aborting.");
+                callback.callback(ImmediateRequestResponse.USAGE_ERROR);
                 return;
             }
 
@@ -204,36 +201,30 @@ void testEnrollIntoVariantInternal(@NonNull final String key, @NonNull final Str
                 public void callback(JSONObject checkResponse) {
                     L.d("[ModuleRemoteConfig] Processing Fetching all A/B test variants received response, received response is null:[" + (checkResponse == null) + "]");
                     if (checkResponse == null) {
-                        callback.callback(Countly.RCVariantEnums.SERVER_NOT_REACHABLE);
+                        callback.callback(ImmediateRequestResponse.NETWORK_ISSUE);
                         return;
                     }
 
                     // TODO: wrt checkResponse handle enums here
-                    String error = null;
-                    try {
-                        if (remoteConfigAutomaticUpdateEnabled) {
-                            // TODO: Check consent here? Should not call directly?
-                            updateRemoteConfigValues(null, null, false, new RemoteConfigCallback() {
-                                @Override public void callback(String error) {
-                                    if (error != null) {
-                                        L.d("[ModuleRemoteConfig] Updated remote config after enrolling to a variant");
-                                    } else {
-                                        L.e("[ModuleRemoteConfig] Attempt to update the remote config after enrolling to a variant failed:" + error.toString());
-                                    }
+                    if (remoteConfigAutomaticUpdateEnabled) {
+                        // TODO: Check consent here? Should not call directly?
+                        updateRemoteConfigValues(null, null, false, new RemoteConfigCallback() {
+                            @Override public void callback(String error) {
+                                if (error != null) {
+                                    L.d("[ModuleRemoteConfig] Updated remote config after enrolling to a variant");
+                                } else {
+                                    L.e("[ModuleRemoteConfig] Attempt to update the remote config after enrolling to a variant failed:" + error.toString());
                                 }
-                            });
-                        }
-                    } catch (Exception ex) {
-                        L.e("[ModuleRemoteConfig] testFetchAllVariantsInternal - execute, Encountered critical issue while trying to enroll all A/B test variants from the server, [" + ex.toString() + "]");
-                        error = "Encountered critical issue while trying to enroll all A/B test variants from the server, [" + ex.toString() + "]";
+                            }
+                        });
                     }
 
-                    callback.callback(Countly.RCVariantEnums.RESULT_SUCCESS);
+                    callback.callback(ImmediateRequestResponse.SUCCESS);
                 }
             }, L);
         } catch (Exception ex) {
-            L.e("[ModuleRemoteConfig] Encountered critical error while trying to enroll A/B test variants. " + ex.toString());
-            callback.callback(Countly.RCVariantEnums.CRITICAL_ERROR);
+            L.e("[ModuleRemoteConfig] Encountered internal error while trying to enroll A/B test variants. " + ex.toString());
+            callback.callback(ImmediateRequestResponse.INTERNAL_ERROR);
         }
     }
 
@@ -261,6 +252,36 @@ void mergeCheckResponseIntoCurrentValues(boolean clearOldValues, JSONObject chec
         L.d("[ModuleRemoteConfig] Finished remote config saving");
     }
 
+    /**
+     * Converts A/B testing variants fetched from the server (JSONObject) into a map
+     * @param variantsObj - JSON Object fetched from the server
+     * @return
+     * @throws JSONException
+     */
+    static Map<String, String[]> convertVariantsJsonToMap(@NonNull JSONObject variantsObj) throws JSONException {
+        Map<String, String[]> map = new HashMap<>();
+
+        // Iterate over the keys of the JSON object
+        Iterator<String> keys = variantsObj.keys();
+        while (keys.hasNext()) {
+            String key = keys.next();
+            JSONArray jsonArray = variantsObj.getJSONArray(key);
+
+            // Extract the variant names from the JSON array
+            String[] variants = new String[jsonArray.length()];
+            for (int i = 0; i < jsonArray.length(); i++) {
+                JSONObject variantObj = jsonArray.getJSONObject(i);
+                String variant = variantObj.getString("name");
+                variants[i] = variant;
+            }
+
+            // Add the key and variant names to the map
+            map.put(key, variants);
+        }
+
+        return map;
+    }
+
     /*
      * Decide which keys to use
      * Useful if both 'keysExcept' and 'keysOnly' set
@@ -336,7 +357,7 @@ Map<String, Object> getAllRemoteConfigValuesInternal() {
      *
      * @return
      */
-    JSONObject getAllRemoteConfigVariantsInternal() {
+    Map<String, String[]> getAllRemoteConfigVariantsInternal() {
         return variantContainer;
     }
 
@@ -470,7 +491,7 @@ public Map<String, Object> getAllValues() {
             }
         }
 
-        public JSONObject getAllVariants() {
+        public Map<String, String[]> getAllVariants() {
             synchronized (_cly) {
                 L.i("[RemoteConfig] Calling 'getAllVariants'");
 
@@ -498,12 +519,7 @@ public void testFetchAllVariants(RemoteConfigVariantCallback callback) {
                 if (callback == null) {
                     callback = new RemoteConfigVariantCallback() {
                         @Override public void callback(Enum result) {
-                            if (result == Countly.RCVariantEnums.RESULT_SUCCESS) {
-                                L.i("[RemoteConfig] Fetched all variants successfully");
-                            } else {
-                                L.e("[RemoteConfig] Fetching all variants failed" + result);
-                            }
-                        }
+                           }
                     };
                 }
 
@@ -515,10 +531,10 @@ public void testFetchAllVariants(RemoteConfigVariantCallback callback) {
          * Enrolls user for a specific variant of A/B testing experiment
          *
          * @param key - key value retrieved from the fetched variants
-         * @param variant - name of the variant for the key to enroll
+         * @param variantName - name of the variant for the key to enroll
          * @param callback
          */
-        public void testEnrollIntoVariant(String key, String variant, RemoteConfigVariantCallback callback) {
+        public void testEnrollIntoVariant(String key, String variantName, RemoteConfigVariantCallback callback) {
             synchronized (_cly) {
                 L.i("[RemoteConfig] Calling 'testEnrollIntoVariant'");
 
@@ -526,7 +542,7 @@ public void testEnrollIntoVariant(String key, String variant, RemoteConfigVarian
                     return;
                 }
 
-                if (key == null || variant == null) {
+                if (key == null || variantName == null) {
                     L.w("[RemoteConfig] testEnrollIntoVariant, passed key or variant is null. Aborting.");
                     return;
                 }
@@ -534,16 +550,11 @@ public void testEnrollIntoVariant(String key, String variant, RemoteConfigVarian
                 if (callback == null) {
                     callback = new RemoteConfigVariantCallback() {
                         @Override public void callback(Enum result) {
-                            if (result == Countly.RCVariantEnums.RESULT_SUCCESS) {
-                                L.i("[RemoteConfig] Enrolled to the variant successfully");
-                            } else {
-                                L.e("[RemoteConfig] Enrolling to the variant failed" + result);
-                            }
                         }
                     };
                 }
 
-                testEnrollIntoVariantInternal(key, variant, callback);
+                testEnrollIntoVariantInternal(key, variantName, callback);
             }
         }
 

From 8bdb57ebcd71e542b7624464304faa734b43f230 Mon Sep 17 00:00:00 2001
From: turtledreams <deniztaygunerten@gmail.com>
Date: Fri, 26 May 2023 17:39:53 +0900
Subject: [PATCH 11/18] HAN

---
 .../count/android/sdk/ModuleRemoteConfig.java | 60 +++++++++++++------
 1 file changed, 42 insertions(+), 18 deletions(-)

diff --git a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
index bd330a33e..7e89a6b80 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
@@ -12,7 +12,7 @@
 
 public class ModuleRemoteConfig extends ModuleBase {
     boolean updateRemoteConfigAfterIdChange = false;
-    Map<String,String[]> variantContainer; // Stores the fetched A/B test variants
+    Map<String, String[]> variantContainer; // Stores the fetched A/B test variants
     RemoteConfig remoteConfigInterface = null;
 
     //if set to true, it will automatically download remote configs on module startup
@@ -153,10 +153,8 @@ public void callback(JSONObject checkResponse) {
                         return;
                     }
 
-                    // TODO: wrt checkResponse handle enums here
-
                     try {
-                        Map<String,String[]> parsedResponse = convertVariantsJsonToMap(checkResponse);
+                        Map<String, String[]> parsedResponse = convertVariantsJsonToMap(checkResponse);
                         variantContainer = parsedResponse;
                     } catch (Exception ex) {
                         L.e("[ModuleRemoteConfig] testFetchAllVariantsInternal - execute, Encountered internal issue while trying to fetch information from the server, [" + ex.toString() + "]");
@@ -205,21 +203,29 @@ public void callback(JSONObject checkResponse) {
                         return;
                     }
 
-                    // TODO: wrt checkResponse handle enums here
-                    if (remoteConfigAutomaticUpdateEnabled) {
-                        // TODO: Check consent here? Should not call directly?
-                        updateRemoteConfigValues(null, null, false, new RemoteConfigCallback() {
-                            @Override public void callback(String error) {
-                                if (error != null) {
-                                    L.d("[ModuleRemoteConfig] Updated remote config after enrolling to a variant");
-                                } else {
-                                    L.e("[ModuleRemoteConfig] Attempt to update the remote config after enrolling to a variant failed:" + error.toString());
+                    try {
+                        if (!isResponseValid(checkResponse)) {
+                            callback.callback(ImmediateRequestResponse.NETWORK_ISSUE);
+                            return;
+                        }
+
+                        // Update Remote Config
+                        if (remoteConfigAutomaticUpdateEnabled) {
+                            updateRemoteConfigValues(null, null, false, new RemoteConfigCallback() {
+                                @Override public void callback(String error) {
+                                    if (error == null) {
+                                        L.d("[ModuleRemoteConfig] Updated remote config after enrolling to a variant");
+                                    } else {
+                                        L.e("[ModuleRemoteConfig] Attempt to update the remote config after enrolling to a variant failed:" + error.toString());
+                                    }
                                 }
-                            }
-                        });
-                    }
+                            });
+                        }
 
-                    callback.callback(ImmediateRequestResponse.SUCCESS);
+                        callback.callback(ImmediateRequestResponse.SUCCESS);
+                    } catch (Exception ex) {
+                        L.e("[ModuleRemoteConfig] testEnrollIntoVariantInternal - execute, Encountered internal issue while trying to enroll to the variant, [" + ex.toString() + "]");
+                    }
                 }
             }, L);
         } catch (Exception ex) {
@@ -252,8 +258,26 @@ void mergeCheckResponseIntoCurrentValues(boolean clearOldValues, JSONObject chec
         L.d("[ModuleRemoteConfig] Finished remote config saving");
     }
 
+    /**
+     * Checks and evaluates the response from the server
+     *
+     * @param responseJson - JSONObject response
+     * @return
+     * @throws JSONException
+     */
+    boolean isResponseValid(@NonNull JSONObject responseJson) throws JSONException {
+        boolean result = false;
+
+        if (responseJson.get("result").equals("Success")) {
+            result = true;
+        }
+
+        return result;
+    }
+
     /**
      * Converts A/B testing variants fetched from the server (JSONObject) into a map
+     *
      * @param variantsObj - JSON Object fetched from the server
      * @return
      * @throws JSONException
@@ -519,7 +543,7 @@ public void testFetchAllVariants(RemoteConfigVariantCallback callback) {
                 if (callback == null) {
                     callback = new RemoteConfigVariantCallback() {
                         @Override public void callback(Enum result) {
-                           }
+                        }
                     };
                 }
 

From a40a141045e2b8b86d6e5b26eef3f72640942cde Mon Sep 17 00:00:00 2001
From: turtledreams <deniztaygunerten@gmail.com>
Date: Fri, 26 May 2023 18:49:54 +0900
Subject: [PATCH 12/18] error

---
 .../android/sdk/ImmediateRequestResponse.java      |  3 +--
 .../ly/count/android/sdk/ModuleRemoteConfig.java   | 14 +++++++-------
 .../android/sdk/RemoteConfigVariantCallback.java   |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/sdk/src/main/java/ly/count/android/sdk/ImmediateRequestResponse.java b/sdk/src/main/java/ly/count/android/sdk/ImmediateRequestResponse.java
index d7842bdd4..969f95a59 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ImmediateRequestResponse.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ImmediateRequestResponse.java
@@ -7,7 +7,6 @@
 public enum ImmediateRequestResponse {
     NETWORK_ISSUE,
     SUCCESS,
-    USAGE_ERROR,
-    INTERNAL_ERROR,
+    ERROR,
 }
 
diff --git a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
index 7e89a6b80..d1f1adeb2 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
@@ -132,7 +132,7 @@ void testFetchAllVariantsInternal(@NonNull final RemoteConfigVariantCallback cal
 
             if (deviceIdProvider.isTemporaryIdEnabled() || requestQueueProvider.queueContainsTemporaryIdItems() || deviceIdProvider.getDeviceId() == null) {
                 L.d("[ModuleRemoteConfig] Fetching all A/B test variants was aborted, temporary device ID mode is set or device ID is null.");
-                callback.callback(ImmediateRequestResponse.USAGE_ERROR);
+                callback.callback(ImmediateRequestResponse.ERROR);
                 return;
             }
 
@@ -165,7 +165,7 @@ public void callback(JSONObject checkResponse) {
             }, L);
         } catch (Exception ex) {
             L.e("[ModuleRemoteConfig] Encountered internal error while trying to fetch all A/B test variants. " + ex.toString());
-            callback.callback(ImmediateRequestResponse.INTERNAL_ERROR);
+            callback.callback(ImmediateRequestResponse.ERROR);
         }
     }
 
@@ -175,14 +175,14 @@ void testEnrollIntoVariantInternal(@NonNull final String key, @NonNull final Str
 
             if (deviceIdProvider.isTemporaryIdEnabled() || requestQueueProvider.queueContainsTemporaryIdItems() || deviceIdProvider.getDeviceId() == null) {
                 L.d("[ModuleRemoteConfig] Enrolling A/B test variants was aborted, temporary device ID mode is set or device ID is null.");
-                callback.callback(ImmediateRequestResponse.USAGE_ERROR);
+                callback.callback(ImmediateRequestResponse.ERROR);
                 return;
             }
 
             // check Key and Variant
             if (TextUtils.isEmpty(key) || TextUtils.isEmpty(variant)) {
                 L.w("[ModuleRemoteConfig] Enrolling A/B test variants, Key/Variant pair is invalid. Aborting.");
-                callback.callback(ImmediateRequestResponse.USAGE_ERROR);
+                callback.callback(ImmediateRequestResponse.ERROR);
                 return;
             }
 
@@ -230,7 +230,7 @@ public void callback(JSONObject checkResponse) {
             }, L);
         } catch (Exception ex) {
             L.e("[ModuleRemoteConfig] Encountered internal error while trying to enroll A/B test variants. " + ex.toString());
-            callback.callback(ImmediateRequestResponse.INTERNAL_ERROR);
+            callback.callback(ImmediateRequestResponse.ERROR);
         }
     }
 
@@ -542,7 +542,7 @@ public void testFetchAllVariants(RemoteConfigVariantCallback callback) {
 
                 if (callback == null) {
                     callback = new RemoteConfigVariantCallback() {
-                        @Override public void callback(Enum result) {
+                        @Override public void callback(ImmediateRequestResponse result) {
                         }
                     };
                 }
@@ -573,7 +573,7 @@ public void testEnrollIntoVariant(String key, String variantName, RemoteConfigVa
 
                 if (callback == null) {
                     callback = new RemoteConfigVariantCallback() {
-                        @Override public void callback(Enum result) {
+                        @Override public void callback(ImmediateRequestResponse result) {
                         }
                     };
                 }
diff --git a/sdk/src/main/java/ly/count/android/sdk/RemoteConfigVariantCallback.java b/sdk/src/main/java/ly/count/android/sdk/RemoteConfigVariantCallback.java
index 571fe3b5a..ce3113626 100644
--- a/sdk/src/main/java/ly/count/android/sdk/RemoteConfigVariantCallback.java
+++ b/sdk/src/main/java/ly/count/android/sdk/RemoteConfigVariantCallback.java
@@ -7,5 +7,5 @@ public interface RemoteConfigVariantCallback {
      *
      * @param result provides an enum for the result of fetch request
      */
-    void callback(Enum result);
+    void callback(ImmediateRequestResponse result);
 }

From 57d2c6f5d513f98c01cfd47b770ffa8944bddfa2 Mon Sep 17 00:00:00 2001
From: turtledreams <deniztaygunerten@gmail.com>
Date: Mon, 29 May 2023 21:59:50 +0900
Subject: [PATCH 13/18] changes

---
 .../android/demo/ActivityExampleTests.java    |  12 +-
 .../sdk/RemoteConfigVariantControlTests.java  | 112 ++++++++++++++-
 .../java/ly/count/android/sdk/TestUtils.java  |  11 ++
 .../android/sdk/ImmediateRequestResponse.java |   2 +-
 .../count/android/sdk/ModuleRemoteConfig.java | 131 +++++++++++++-----
 5 files changed, 220 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java b/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
index e66cfe2ff..5ca077f86 100644
--- a/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
+++ b/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
@@ -22,9 +22,9 @@ public void onCreate(Bundle savedInstanceState) {
 
     // For fetching all variants with a button click
     public void onClickFetchAllVariants(View v) {
-        Countly.sharedInstance().remoteConfig().testFetchAllVariants(new RemoteConfigVariantCallback() {
+        Countly.sharedInstance().remoteConfig().testingFetchVariantInformation(new RemoteConfigVariantCallback() {
             @Override
-            public void callback(Enum result) {
+            public void callback(ImmediateRequestResponse result) {
                 if (result == ImmediateRequestResponse.SUCCESS) {
                     Toast.makeText(getApplicationContext(), "Fetch finished", Toast.LENGTH_SHORT).show();
                 } else {
@@ -36,7 +36,7 @@ public void callback(Enum result) {
 
     // To get all variants from the storage and show them with a toast
     public void onClickVariantsPrintValues(View v) {
-        Map<String, String[]> values = Countly.sharedInstance().remoteConfig().getAllVariants();
+        Map<String, String[]> values = Countly.sharedInstance().remoteConfig().testingGetAllVariants();
         if (values == null) {
             Countly.sharedInstance().L.w("No variants present");
             return;
@@ -58,7 +58,7 @@ public void onClickVariantsPrintValues(View v) {
 
 
     public void onClickEnrollVariant(View v) {
-        Map<String,String[]> values = Countly.sharedInstance().remoteConfig().getAllVariants();
+        Map<String,String[]> values = Countly.sharedInstance().remoteConfig().testingGetAllVariants();
         if (values == null) {
             Countly.sharedInstance().L.w("No variants present");
             return;
@@ -74,9 +74,9 @@ public void onClickEnrollVariant(View v) {
             break; // Get only the first key-value pair
         }
 
-        Countly.sharedInstance().remoteConfig().testEnrollIntoVariant(key, variant, new RemoteConfigVariantCallback() {
+        Countly.sharedInstance().remoteConfig().testingEnrollIntoVariant(key, variant, new RemoteConfigVariantCallback() {
             @Override
-            public void callback(Enum result) {
+            public void callback(ImmediateRequestResponse result) {
                 if (result == ImmediateRequestResponse.SUCCESS) {
                     Toast.makeText(getApplicationContext(), "Fetch finished", Toast.LENGTH_SHORT).show();
                 } else {
diff --git a/sdk/src/androidTest/java/ly/count/android/sdk/RemoteConfigVariantControlTests.java b/sdk/src/androidTest/java/ly/count/android/sdk/RemoteConfigVariantControlTests.java
index f6f9be0e6..27cd905ad 100644
--- a/sdk/src/androidTest/java/ly/count/android/sdk/RemoteConfigVariantControlTests.java
+++ b/sdk/src/androidTest/java/ly/count/android/sdk/RemoteConfigVariantControlTests.java
@@ -6,11 +6,23 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import static androidx.test.InstrumentationRegistry.getContext;
+import static org.mockito.Mockito.mock;
+
 @RunWith(AndroidJUnit4.class)
 public class RemoteConfigVariantControlTests {
+    CountlyStore countlyStore;
+
+    @Before
+    public void setUp() {
+        Countly.sharedInstance().setLoggingEnabled(true);
+        countlyStore = new CountlyStore(getContext(), mock(ModuleLog.class));
+        countlyStore.clear();
+    }
 
     @Test
     public void testConvertVariantsJsonToMap_ValidInput_Multi() throws JSONException {
@@ -44,7 +56,6 @@ public void testConvertVariantsJsonToMap_ValidInput_Multi() throws JSONException
         Assert.assertEquals("Variant 4", key2Variants[1]);
     }
 
-
     @Test
     public void testConvertVariantsJsonToMap_ValidInput_Single() throws JSONException {
         // Create a sample JSON object with valid variants
@@ -69,18 +80,22 @@ public void testConvertVariantsJsonToMap_ValidInput_Single() throws JSONExceptio
         Assert.assertEquals("Variant 2", key2Variants[0]);
     }
 
-    @Test(expected = JSONException.class)
+    @Test
     public void testConvertVariantsJsonToMap_InvalidInput() throws JSONException {
         // Create a sample JSON object with invalid variants (missing "name" field)
         JSONObject variantsObj = new JSONObject();
         variantsObj.put("key1", new JSONArray().put(new JSONObject().put("invalid_key", "Invalid Value")));
 
-        // Call the function to convert variants JSON to a map (expecting JSONException)
-        ModuleRemoteConfig.convertVariantsJsonToMap(variantsObj);
-    }
+        // Call the function to convert variants JSON to a map
+        Map<String, String[]> resultMap = ModuleRemoteConfig.convertVariantsJsonToMap(variantsObj);
+        Assert.assertEquals(1, resultMap.size());
 
+         // Assert the values for key1
+        String[] key1Variants = resultMap.get("key1");
+        Assert.assertEquals(0, key1Variants.length);
+    }
 
-    @Test(expected = JSONException.class)
+    @Test
     public void testConvertVariantsJsonToMap_InvalidJson() throws JSONException {
         // Test with invalid JSON object
         JSONObject variantsObj = new JSONObject();
@@ -88,6 +103,14 @@ public void testConvertVariantsJsonToMap_InvalidJson() throws JSONException {
 
         // Call the function to convert variants JSON to a map (expecting JSONException)
         ModuleRemoteConfig.convertVariantsJsonToMap(variantsObj);
+
+        // Call the function to convert variants JSON to a map
+        Map<String, String[]> resultMap = ModuleRemoteConfig.convertVariantsJsonToMap(variantsObj);
+        Assert.assertEquals(1, resultMap.size());
+
+        // Assert the values for key1
+        String[] key1Variants = resultMap.get("key1");
+        Assert.assertEquals(0, key1Variants.length);
     }
 
     @Test
@@ -138,7 +161,6 @@ public void testConvertVariantsJsonToMap_DifferentStructures() throws JSONExcept
         Assert.assertEquals("Variant 3", key3Variants[1]);
     }
 
-    // TODO: is this okay?
     @Test
     public void testConvertVariantsJsonToMap_NullJsonKey() throws JSONException {
         // Test with a null JSON key
@@ -152,4 +174,80 @@ public void testConvertVariantsJsonToMap_NullJsonKey() throws JSONException {
         Assert.assertEquals(1, key1Variants.length);
         Assert.assertEquals("null", key1Variants[0]);
     }
+
+    @Test
+    public void testNormalFlow() {
+        CountlyConfig config = TestUtils.createVariantConfig(createIRGForSpecificResponse("{\"key\":[{\"name\":\"variant\"}]}"));
+        Countly countly = (new Countly()).init(config);
+
+        // Developer did not provide a callback
+        countly.moduleRemoteConfig.remoteConfigInterface.testingFetchVariantInformation(null);
+        Map<String, String[]> values = countly.moduleRemoteConfig.remoteConfigInterface.testingGetAllVariants();
+        String[] variantArray = countly.moduleRemoteConfig.remoteConfigInterface.testingGetVariantsForKey("key");
+        String[] variantArrayFalse = countly.moduleRemoteConfig.remoteConfigInterface.testingGetVariantsForKey("key2");
+
+         //Assert the values
+        String[] key1Variants = values.get("key");
+        Assert.assertEquals(1, key1Variants.length);
+        Assert.assertEquals("variant", key1Variants[0]);
+        Assert.assertEquals(1, variantArray.length);
+        Assert.assertEquals("variant", variantArray[0]);
+        Assert.assertEquals(0, variantArrayFalse.length);
+    }
+
+    @Test
+    public void testNullVariant() {
+        CountlyConfig config = TestUtils.createVariantConfig(createIRGForSpecificResponse("{\"key\":[{\"name\":null}]}"));
+        Countly countly = (new Countly()).init(config);
+
+        // Developer did not provide a callback
+        countly.moduleRemoteConfig.remoteConfigInterface.testingFetchVariantInformation(null);
+        Map<String, String[]> values = countly.moduleRemoteConfig.remoteConfigInterface.testingGetAllVariants();
+
+        // Assert the values
+        String[] key1Variants = values.get("key");
+        Assert.assertEquals(1, key1Variants.length);
+        Assert.assertEquals("null", key1Variants[0]); // TODO: is fine?
+    }
+
+
+    @Test
+    public void testFilteringWrongKeys() {
+        CountlyConfig config = TestUtils.createVariantConfig(createIRGForSpecificResponse("{\"key\":[{\"noname\":\"variant1\"},{\"name\":\"variant2\"}]}"));
+        Countly countly = (new Countly()).init(config);
+
+        // Developer did not provide a callback
+        countly.moduleRemoteConfig.remoteConfigInterface.testingFetchVariantInformation(null);
+        Map<String, String[]> values = countly.moduleRemoteConfig.remoteConfigInterface.testingGetAllVariants();
+
+        //Assert the values
+        String[] key1Variants = values.get("key");
+        Assert.assertEquals(1, key1Variants.length);
+        Assert.assertEquals("variant2", key1Variants[0]);
+    }
+
+    ImmediateRequestGenerator createIRGForSpecificResponse(final String targetResponse) {
+        return new ImmediateRequestGenerator() {
+            @Override public ImmediateRequestI CreateImmediateRequestMaker() {
+                return new ImmediateRequestI() {
+                    @Override public void doWork(String requestData, String customEndpoint, ConnectionProcessor cp, boolean requestShouldBeDelayed, boolean networkingIsEnabled, ImmediateRequestMaker.InternalImmediateRequestCallback callback, ModuleLog log) {
+                        if (targetResponse == null) {
+                            callback.callback(null);
+                            return;
+                        }
+
+                        JSONObject jobj = null;
+
+                        try {
+                            jobj = new JSONObject(targetResponse);
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+
+                        callback.callback(jobj);
+                    }
+                };
+            }
+        };
+    }
 }
diff --git a/sdk/src/androidTest/java/ly/count/android/sdk/TestUtils.java b/sdk/src/androidTest/java/ly/count/android/sdk/TestUtils.java
index 2fc774d07..8cc589df4 100644
--- a/sdk/src/androidTest/java/ly/count/android/sdk/TestUtils.java
+++ b/sdk/src/androidTest/java/ly/count/android/sdk/TestUtils.java
@@ -65,6 +65,17 @@ public static CountlyConfig createConfigurationConfig(boolean enableServerConfig
         return cc;
     }
 
+    public static CountlyConfig createVariantConfig(ImmediateRequestGenerator irGen) {
+        CountlyConfig cc = (new CountlyConfig((Application) ApplicationProvider.getApplicationContext(), commonAppKey, commonURL))
+            .setDeviceId(commonDeviceId)
+            .setLoggingEnabled(true)
+            .enableCrashReporting();
+
+        cc.immediateRequestGenerator = irGen;
+
+        return cc;
+    }
+
     public static CountlyConfig createConsentCountlyConfig(boolean requiresConsent, String[] givenConsent, ModuleBase testModuleListener, RequestQueueProvider rqp) {
         CountlyConfig cc = (new CountlyConfig((Application) ApplicationProvider.getApplicationContext(), commonAppKey, commonURL))
             .setDeviceId(commonDeviceId)
diff --git a/sdk/src/main/java/ly/count/android/sdk/ImmediateRequestResponse.java b/sdk/src/main/java/ly/count/android/sdk/ImmediateRequestResponse.java
index 969f95a59..ea243ea6b 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ImmediateRequestResponse.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ImmediateRequestResponse.java
@@ -2,7 +2,7 @@
 
 /**
  * Enum used throughout Countly for relaying result of A/B test variants fetch
- * TODO: Make it proper with correct enums and variety
+ * TODO: Make it camel case?
  */
 public enum ImmediateRequestResponse {
     NETWORK_ISSUE,
diff --git a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
index d1f1adeb2..5cbbae710 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
@@ -11,6 +11,7 @@
 import org.json.JSONObject;
 
 public class ModuleRemoteConfig extends ModuleBase {
+    ImmediateRequestGenerator immediateRequestGenerator;
     boolean updateRemoteConfigAfterIdChange = false;
     Map<String, String[]> variantContainer; // Stores the fetched A/B test variants
     RemoteConfig remoteConfigInterface = null;
@@ -27,6 +28,7 @@ public class ModuleRemoteConfig extends ModuleBase {
         L.v("[ModuleRemoteConfig] Initialising");
 
         metricOverride = config.metricOverride;
+        immediateRequestGenerator = config.immediateRequestGenerator;
 
         if (config.enableRemoteConfigAutomaticDownload) {
             L.d("[ModuleRemoteConfig] Setting if remote config Automatic download will be enabled, " + config.enableRemoteConfigAutomaticDownload);
@@ -126,7 +128,7 @@ public void callback(JSONObject checkResponse) {
      *
      * @param callback called after the fetch is done
      */
-    void testFetchAllVariantsInternal(@NonNull final RemoteConfigVariantCallback callback) {
+    void testingFetchVariantInformationInternal(@NonNull final RemoteConfigVariantCallback callback) {
         try {
             L.d("[ModuleRemoteConfig] Fetching all A/B test variants");
 
@@ -144,7 +146,7 @@ void testFetchAllVariantsInternal(@NonNull final RemoteConfigVariantCallback cal
             ConnectionProcessor cp = requestQueueProvider.createConnectionProcessor();
             final boolean networkingIsEnabled = cp.configProvider_.getNetworkingEnabled();
 
-            (new ImmediateRequestMaker()).doWork(requestData, "/o/sdk", cp, false, networkingIsEnabled, new ImmediateRequestMaker.InternalImmediateRequestCallback() {
+            immediateRequestGenerator.CreateImmediateRequestMaker().doWork(requestData, "/i/sdk", cp, false, networkingIsEnabled, new ImmediateRequestMaker.InternalImmediateRequestCallback() {
                 @Override
                 public void callback(JSONObject checkResponse) {
                     L.d("[ModuleRemoteConfig] Processing Fetching all A/B test variants received response, received response is null:[" + (checkResponse == null) + "]");
@@ -157,7 +159,7 @@ public void callback(JSONObject checkResponse) {
                         Map<String, String[]> parsedResponse = convertVariantsJsonToMap(checkResponse);
                         variantContainer = parsedResponse;
                     } catch (Exception ex) {
-                        L.e("[ModuleRemoteConfig] testFetchAllVariantsInternal - execute, Encountered internal issue while trying to fetch information from the server, [" + ex.toString() + "]");
+                        L.e("[ModuleRemoteConfig] testingFetchVariantInformationInternal - execute, Encountered internal issue while trying to fetch information from the server, [" + ex.toString() + "]");
                     }
 
                     callback.callback(ImmediateRequestResponse.SUCCESS);
@@ -169,7 +171,7 @@ public void callback(JSONObject checkResponse) {
         }
     }
 
-    void testEnrollIntoVariantInternal(@NonNull final String key, @NonNull final String variant, @NonNull final RemoteConfigVariantCallback callback) {
+    void testingEnrollIntoVariantInternal(@NonNull final String key, @NonNull final String variant, @NonNull final RemoteConfigVariantCallback callback) {
         try {
             L.d("[ModuleRemoteConfig] Enrolling A/B test variants, Key/Variant pairs:[" + key + "][" + variant + "]");
 
@@ -194,7 +196,7 @@ void testEnrollIntoVariantInternal(@NonNull final String key, @NonNull final Str
             ConnectionProcessor cp = requestQueueProvider.createConnectionProcessor();
             final boolean networkingIsEnabled = cp.configProvider_.getNetworkingEnabled();
 
-            (new ImmediateRequestMaker()).doWork(requestData, "/o/sdk", cp, false, networkingIsEnabled, new ImmediateRequestMaker.InternalImmediateRequestCallback() {
+            immediateRequestGenerator.CreateImmediateRequestMaker().doWork(requestData, "/i/sdk", cp, false, networkingIsEnabled, new ImmediateRequestMaker.InternalImmediateRequestCallback() {
                 @Override
                 public void callback(JSONObject checkResponse) {
                     L.d("[ModuleRemoteConfig] Processing Fetching all A/B test variants received response, received response is null:[" + (checkResponse == null) + "]");
@@ -224,7 +226,7 @@ public void callback(JSONObject checkResponse) {
 
                         callback.callback(ImmediateRequestResponse.SUCCESS);
                     } catch (Exception ex) {
-                        L.e("[ModuleRemoteConfig] testEnrollIntoVariantInternal - execute, Encountered internal issue while trying to enroll to the variant, [" + ex.toString() + "]");
+                        L.e("[ModuleRemoteConfig] testingEnrollIntoVariantInternal - execute, Encountered internal issue while trying to enroll to the variant, [" + ex.toString() + "]");
                     }
                 }
             }, L);
@@ -283,27 +285,54 @@ boolean isResponseValid(@NonNull JSONObject responseJson) throws JSONException {
      * @throws JSONException
      */
     static Map<String, String[]> convertVariantsJsonToMap(@NonNull JSONObject variantsObj) throws JSONException {
-        Map<String, String[]> map = new HashMap<>();
-
-        // Iterate over the keys of the JSON object
-        Iterator<String> keys = variantsObj.keys();
-        while (keys.hasNext()) {
-            String key = keys.next();
-            JSONArray jsonArray = variantsObj.getJSONArray(key);
-
-            // Extract the variant names from the JSON array
-            String[] variants = new String[jsonArray.length()];
-            for (int i = 0; i < jsonArray.length(); i++) {
-                JSONObject variantObj = jsonArray.getJSONObject(i);
-                String variant = variantObj.getString("name");
-                variants[i] = variant;
-            }
+        // Initialize the map to store the results
+        Map<String, String[]> resultMap = new HashMap<>();
 
-            // Add the key and variant names to the map
-            map.put(key, variants);
+        try {
+            // Get the keys of the JSON object using names() method
+            JSONArray keys = variantsObj.names();
+            if (keys != null) {
+                for (int i = 0; i < keys.length(); i++) {
+                    String key = keys.getString(i);
+                    Object value = variantsObj.get(key);
+
+                    // Set the key and and an empty Array initially
+                    String[] emptyArray = new String[0];
+                    resultMap.put(key, emptyArray);
+
+                    // Check if the value is a JSON array
+                    if (value instanceof JSONArray) {
+                        JSONArray jsonArray = (JSONArray) value;
+
+                        // Check if the JSON array contains objects
+                        if (jsonArray.length() > 0 && jsonArray.get(0) instanceof JSONObject) {
+                            // Extract the values from the JSON objects
+                            String[] variants = new String[jsonArray.length()];
+                            int count = 0;
+                            for (int j = 0; j < jsonArray.length(); j++) {
+                                JSONObject variantObject = jsonArray.getJSONObject(j);
+                                if (variantObject.has("name")) {
+                                    variants[count] = variantObject.getString("name");
+                                    count++;
+                                }
+                            }
+
+                            // Map the key and its corresponding variants
+                            if (count > 0) {
+                                String[] filteredVariants = new String[count];
+                                System.arraycopy(variants, 0, filteredVariants, 0, count);
+                                resultMap.put(key, filteredVariants);
+                            } // else if the JSON object had no key 'name' we return String[0]
+                        } // else if values of JSON array are not JSON object(all?) or no values at all we return String[0]
+                    } // else if value is not JSON array we return String[0]
+                }
+            }
+        } catch (Exception ex) {
+            Countly.sharedInstance().L.e("[ModuleRemoteConfig] convertVariantsJsonToMap, failed parsing:[" + ex.toString() + "]");
+            return new HashMap<>();
         }
 
-        return map;
+        return resultMap;
     }
 
     /*
@@ -381,10 +410,23 @@ Map<String, Object> getAllRemoteConfigValuesInternal() {
      *
      * @return
      */
-    Map<String, String[]> getAllRemoteConfigVariantsInternal() {
+    Map<String, String[]> testingGetAllVariantsInternal() {
         return variantContainer;
     }
 
+    /**
+     * Get all variants for a given key if exists. Else returns an empty array.
+     * @param key
+     * @return
+     */
+    String[] testingGetVariantsForKeyInternal(String key){
+        if (variantContainer.containsKey(key)) {
+            return variantContainer.get(key);
+        }
+
+        return new String[0];
+    }
+
     static class RemoteConfigValueStore {
         public JSONObject values = new JSONObject();
 
@@ -515,15 +557,36 @@ public Map<String, Object> getAllValues() {
             }
         }
 
-        public Map<String, String[]> getAllVariants() {
+        /**
+         * Returns all variant information as a Map<String, String[]>
+         * @return
+         */
+        public Map<String, String[]> testingGetAllVariants() {
+            synchronized (_cly) {
+                L.i("[RemoteConfig] Calling 'testingGetAllVariants'");
+
+                if (!consentProvider.getConsent(Countly.CountlyFeatureNames.remoteConfig)) {
+                    return null;
+                }
+
+                return testingGetAllVariantsInternal();
+            }
+        }
+
+        /**
+         * Returns variant information for a key as a String[]
+         * @param key - key value to get variant information for
+         * @return
+         */
+        public String[] testingGetVariantsForKey(String key) {
             synchronized (_cly) {
-                L.i("[RemoteConfig] Calling 'getAllVariants'");
+                L.i("[RemoteConfig] Calling 'testingGetVariantsForKey'");
 
                 if (!consentProvider.getConsent(Countly.CountlyFeatureNames.remoteConfig)) {
                     return null;
                 }
 
-                return getAllRemoteConfigVariantsInternal();
+                return testingGetVariantsForKeyInternal(key);
             }
         }
 
@@ -532,9 +595,9 @@ public Map<String, String[]> getAllVariants() {
          *
          * @param callback
          */
-        public void testFetchAllVariants(RemoteConfigVariantCallback callback) {
+        public void testingFetchVariantInformation(RemoteConfigVariantCallback callback) {
             synchronized (_cly) {
-                L.i("[RemoteConfig] Calling 'testFetchAllVariants'");
+                L.i("[RemoteConfig] Calling 'testingFetchVariantInformation'");
 
                 if (!consentProvider.getConsent(Countly.CountlyFeatureNames.remoteConfig)) {
                     return;
@@ -547,7 +610,7 @@ public void testFetchAllVariants(RemoteConfigVariantCallback callback) {
                     };
                 }
 
-                testFetchAllVariantsInternal(callback);
+                testingFetchVariantInformationInternal(callback);
             }
         }
 
@@ -558,9 +621,9 @@ public void testFetchAllVariants(RemoteConfigVariantCallback callback) {
          * @param variantName - name of the variant for the key to enroll
          * @param callback
          */
-        public void testEnrollIntoVariant(String key, String variantName, RemoteConfigVariantCallback callback) {
+        public void testingEnrollIntoVariant(String key, String variantName, RemoteConfigVariantCallback callback) {
             synchronized (_cly) {
-                L.i("[RemoteConfig] Calling 'testEnrollIntoVariant'");
+                L.i("[RemoteConfig] Calling 'testingEnrollIntoVariant'");
 
                 if (!consentProvider.getConsent(Countly.CountlyFeatureNames.remoteConfig)) {
                     return;
@@ -578,7 +641,7 @@ public void testEnrollIntoVariant(String key, String variantName, RemoteConfigVa
                     };
                 }
 
-                testEnrollIntoVariantInternal(key, variantName, callback);
+                testingEnrollIntoVariantInternal(key, variantName, callback);
             }
         }
 

From f1170fa318afccc2894d6fbeadce282fc1460132 Mon Sep 17 00:00:00 2001
From: turtledreams <deniztaygunerten@gmail.com>
Date: Mon, 29 May 2023 22:32:51 +0900
Subject: [PATCH 14/18] linting

---
 .../java/ly/count/android/demo/ActivityExampleTests.java     | 3 +--
 .../count/android/sdk/RemoteConfigVariantControlTests.java   | 5 ++---
 .../main/java/ly/count/android/sdk/ModuleRemoteConfig.java   | 5 ++++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java b/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
index 5ca077f86..4dd5e0416 100644
--- a/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
+++ b/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
@@ -56,9 +56,8 @@ public void onClickVariantsPrintValues(View v) {
         t.show();
     }
 
-
     public void onClickEnrollVariant(View v) {
-        Map<String,String[]> values = Countly.sharedInstance().remoteConfig().testingGetAllVariants();
+        Map<String, String[]> values = Countly.sharedInstance().remoteConfig().testingGetAllVariants();
         if (values == null) {
             Countly.sharedInstance().L.w("No variants present");
             return;
diff --git a/sdk/src/androidTest/java/ly/count/android/sdk/RemoteConfigVariantControlTests.java b/sdk/src/androidTest/java/ly/count/android/sdk/RemoteConfigVariantControlTests.java
index 27cd905ad..904a3e46a 100644
--- a/sdk/src/androidTest/java/ly/count/android/sdk/RemoteConfigVariantControlTests.java
+++ b/sdk/src/androidTest/java/ly/count/android/sdk/RemoteConfigVariantControlTests.java
@@ -90,7 +90,7 @@ public void testConvertVariantsJsonToMap_InvalidInput() throws JSONException {
         Map<String, String[]> resultMap = ModuleRemoteConfig.convertVariantsJsonToMap(variantsObj);
         Assert.assertEquals(1, resultMap.size());
 
-         // Assert the values for key1
+        // Assert the values for key1
         String[] key1Variants = resultMap.get("key1");
         Assert.assertEquals(0, key1Variants.length);
     }
@@ -186,7 +186,7 @@ public void testNormalFlow() {
         String[] variantArray = countly.moduleRemoteConfig.remoteConfigInterface.testingGetVariantsForKey("key");
         String[] variantArrayFalse = countly.moduleRemoteConfig.remoteConfigInterface.testingGetVariantsForKey("key2");
 
-         //Assert the values
+        //Assert the values
         String[] key1Variants = values.get("key");
         Assert.assertEquals(1, key1Variants.length);
         Assert.assertEquals("variant", key1Variants[0]);
@@ -210,7 +210,6 @@ public void testNullVariant() {
         Assert.assertEquals("null", key1Variants[0]); // TODO: is fine?
     }
 
-
     @Test
     public void testFilteringWrongKeys() {
         CountlyConfig config = TestUtils.createVariantConfig(createIRGForSpecificResponse("{\"key\":[{\"noname\":\"variant1\"},{\"name\":\"variant2\"}]}"));
diff --git a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
index 44c7a0863..5720bcf9a 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
@@ -409,10 +409,11 @@ Map<String, String[]> testingGetAllVariantsInternal() {
 
     /**
      * Get all variants for a given key if exists. Else returns an empty array.
+     *
      * @param key
      * @return
      */
-    String[] testingGetVariantsForKeyInternal(String key){
+    String[] testingGetVariantsForKeyInternal(String key) {
         if (variantContainer.containsKey(key)) {
             return variantContainer.get(key);
         }
@@ -552,6 +553,7 @@ public Map<String, Object> getAllValues() {
 
         /**
          * Returns all variant information as a Map<String, String[]>
+         *
          * @return
          */
         public Map<String, String[]> testingGetAllVariants() {
@@ -568,6 +570,7 @@ public Map<String, String[]> testingGetAllVariants() {
 
         /**
          * Returns variant information for a key as a String[]
+         *
          * @param key - key value to get variant information for
          * @return
          */

From 62c7740e48bd6c1eb6fb168c366c943b3adbf8bc Mon Sep 17 00:00:00 2001
From: turtledreams <deniztaygunerten@gmail.com>
Date: Mon, 29 May 2023 22:34:40 +0900
Subject: [PATCH 15/18] api end point comment changed

---
 sdk/src/main/java/ly/count/android/sdk/ConnectionQueue.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk/src/main/java/ly/count/android/sdk/ConnectionQueue.java b/sdk/src/main/java/ly/count/android/sdk/ConnectionQueue.java
index 63f91bde0..76184635b 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ConnectionQueue.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ConnectionQueue.java
@@ -715,7 +715,7 @@ public String prepareRemoteConfigRequest(@Nullable String keysInclude, @Nullable
 
     /**
      * To fetch all variants from the server. Something like this should be formed: method=ab_fetch_variants&app_key="APP_KEY"&device_id=DEVICE_ID
-     * API end point for this is /o/sdk
+     * API end point for this is /i/sdk
      *
      * @return
      */
@@ -727,7 +727,7 @@ public String prepareFetchAllVariants() {
         return data;
     }
 
-    public String prepareEnrollVariant(String key, String variant){
+    public String prepareEnrollVariant(String key, String variant) {
         String data = "method=ab_enroll_variant"
             + "&app_key=" + UtilsNetworking.urlEncodeString(baseInfoProvider.getAppKey())
             + "&device_id=" + UtilsNetworking.urlEncodeString(deviceIdProvider_.getDeviceId())

From 97a4aa37db7d0e646d66758be3a9382687298cf3 Mon Sep 17 00:00:00 2001
From: turtledreams <deniztaygunerten@gmail.com>
Date: Mon, 29 May 2023 22:36:55 +0900
Subject: [PATCH 16/18] immediaterequestresponse to requestresponse

---
 .../android/demo/ActivityExampleTests.java    | 10 ++++----
 .../count/android/sdk/ModuleRemoteConfig.java | 24 +++++++++----------
 .../sdk/RemoteConfigVariantCallback.java      |  2 +-
 ...uestResponse.java => RequestResponse.java} |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)
 rename sdk/src/main/java/ly/count/android/sdk/{ImmediateRequestResponse.java => RequestResponse.java} (83%)

diff --git a/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java b/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
index 4dd5e0416..801b1a255 100644
--- a/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
+++ b/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
@@ -9,7 +9,7 @@
 import java.util.Arrays;
 import java.util.Map;
 import ly.count.android.sdk.Countly;
-import ly.count.android.sdk.ImmediateRequestResponse;
+import ly.count.android.sdk.RequestResponse;
 import ly.count.android.sdk.RemoteConfigVariantCallback;
 
 public class ActivityExampleTests extends AppCompatActivity {
@@ -24,8 +24,8 @@ public void onCreate(Bundle savedInstanceState) {
     public void onClickFetchAllVariants(View v) {
         Countly.sharedInstance().remoteConfig().testingFetchVariantInformation(new RemoteConfigVariantCallback() {
             @Override
-            public void callback(ImmediateRequestResponse result) {
-                if (result == ImmediateRequestResponse.SUCCESS) {
+            public void callback(RequestResponse result) {
+                if (result == RequestResponse.SUCCESS) {
                     Toast.makeText(getApplicationContext(), "Fetch finished", Toast.LENGTH_SHORT).show();
                 } else {
                     Toast.makeText(getApplicationContext(), "Error: " + result, Toast.LENGTH_SHORT).show();
@@ -75,8 +75,8 @@ public void onClickEnrollVariant(View v) {
 
         Countly.sharedInstance().remoteConfig().testingEnrollIntoVariant(key, variant, new RemoteConfigVariantCallback() {
             @Override
-            public void callback(ImmediateRequestResponse result) {
-                if (result == ImmediateRequestResponse.SUCCESS) {
+            public void callback(RequestResponse result) {
+                if (result == RequestResponse.SUCCESS) {
                     Toast.makeText(getApplicationContext(), "Fetch finished", Toast.LENGTH_SHORT).show();
                 } else {
                     Toast.makeText(getApplicationContext(), "Error: " + result, Toast.LENGTH_SHORT).show();
diff --git a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
index 5720bcf9a..da5b4ffa7 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
@@ -127,7 +127,7 @@ void testingFetchVariantInformationInternal(@NonNull final RemoteConfigVariantCa
 
             if (deviceIdProvider.isTemporaryIdEnabled() || requestQueueProvider.queueContainsTemporaryIdItems() || deviceIdProvider.getDeviceId() == null) {
                 L.d("[ModuleRemoteConfig] Fetching all A/B test variants was aborted, temporary device ID mode is set or device ID is null.");
-                callback.callback(ImmediateRequestResponse.ERROR);
+                callback.callback(RequestResponse.ERROR);
                 return;
             }
 
@@ -144,7 +144,7 @@ void testingFetchVariantInformationInternal(@NonNull final RemoteConfigVariantCa
                 public void callback(JSONObject checkResponse) {
                     L.d("[ModuleRemoteConfig] Processing Fetching all A/B test variants received response, received response is null:[" + (checkResponse == null) + "]");
                     if (checkResponse == null) {
-                        callback.callback(ImmediateRequestResponse.NETWORK_ISSUE);
+                        callback.callback(RequestResponse.NETWORK_ISSUE);
                         return;
                     }
 
@@ -155,12 +155,12 @@ public void callback(JSONObject checkResponse) {
                         L.e("[ModuleRemoteConfig] testingFetchVariantInformationInternal - execute, Encountered internal issue while trying to fetch information from the server, [" + ex.toString() + "]");
                     }
 
-                    callback.callback(ImmediateRequestResponse.SUCCESS);
+                    callback.callback(RequestResponse.SUCCESS);
                 }
             }, L);
         } catch (Exception ex) {
             L.e("[ModuleRemoteConfig] Encountered internal error while trying to fetch all A/B test variants. " + ex.toString());
-            callback.callback(ImmediateRequestResponse.ERROR);
+            callback.callback(RequestResponse.ERROR);
         }
     }
 
@@ -170,14 +170,14 @@ void testingEnrollIntoVariantInternal(@NonNull final String key, @NonNull final
 
             if (deviceIdProvider.isTemporaryIdEnabled() || requestQueueProvider.queueContainsTemporaryIdItems() || deviceIdProvider.getDeviceId() == null) {
                 L.d("[ModuleRemoteConfig] Enrolling A/B test variants was aborted, temporary device ID mode is set or device ID is null.");
-                callback.callback(ImmediateRequestResponse.ERROR);
+                callback.callback(RequestResponse.ERROR);
                 return;
             }
 
             // check Key and Variant
             if (TextUtils.isEmpty(key) || TextUtils.isEmpty(variant)) {
                 L.w("[ModuleRemoteConfig] Enrolling A/B test variants, Key/Variant pair is invalid. Aborting.");
-                callback.callback(ImmediateRequestResponse.ERROR);
+                callback.callback(RequestResponse.ERROR);
                 return;
             }
 
@@ -194,13 +194,13 @@ void testingEnrollIntoVariantInternal(@NonNull final String key, @NonNull final
                 public void callback(JSONObject checkResponse) {
                     L.d("[ModuleRemoteConfig] Processing Fetching all A/B test variants received response, received response is null:[" + (checkResponse == null) + "]");
                     if (checkResponse == null) {
-                        callback.callback(ImmediateRequestResponse.NETWORK_ISSUE);
+                        callback.callback(RequestResponse.NETWORK_ISSUE);
                         return;
                     }
 
                     try {
                         if (!isResponseValid(checkResponse)) {
-                            callback.callback(ImmediateRequestResponse.NETWORK_ISSUE);
+                            callback.callback(RequestResponse.NETWORK_ISSUE);
                             return;
                         }
 
@@ -217,7 +217,7 @@ public void callback(JSONObject checkResponse) {
                             });
                         }
 
-                        callback.callback(ImmediateRequestResponse.SUCCESS);
+                        callback.callback(RequestResponse.SUCCESS);
                     } catch (Exception ex) {
                         L.e("[ModuleRemoteConfig] testingEnrollIntoVariantInternal - execute, Encountered internal issue while trying to enroll to the variant, [" + ex.toString() + "]");
                     }
@@ -225,7 +225,7 @@ public void callback(JSONObject checkResponse) {
             }, L);
         } catch (Exception ex) {
             L.e("[ModuleRemoteConfig] Encountered internal error while trying to enroll A/B test variants. " + ex.toString());
-            callback.callback(ImmediateRequestResponse.ERROR);
+            callback.callback(RequestResponse.ERROR);
         }
     }
 
@@ -601,7 +601,7 @@ public void testingFetchVariantInformation(RemoteConfigVariantCallback callback)
 
                 if (callback == null) {
                     callback = new RemoteConfigVariantCallback() {
-                        @Override public void callback(ImmediateRequestResponse result) {
+                        @Override public void callback(RequestResponse result) {
                         }
                     };
                 }
@@ -632,7 +632,7 @@ public void testingEnrollIntoVariant(String key, String variantName, RemoteConfi
 
                 if (callback == null) {
                     callback = new RemoteConfigVariantCallback() {
-                        @Override public void callback(ImmediateRequestResponse result) {
+                        @Override public void callback(RequestResponse result) {
                         }
                     };
                 }
diff --git a/sdk/src/main/java/ly/count/android/sdk/RemoteConfigVariantCallback.java b/sdk/src/main/java/ly/count/android/sdk/RemoteConfigVariantCallback.java
index ce3113626..0ed1ab0a6 100644
--- a/sdk/src/main/java/ly/count/android/sdk/RemoteConfigVariantCallback.java
+++ b/sdk/src/main/java/ly/count/android/sdk/RemoteConfigVariantCallback.java
@@ -7,5 +7,5 @@ public interface RemoteConfigVariantCallback {
      *
      * @param result provides an enum for the result of fetch request
      */
-    void callback(ImmediateRequestResponse result);
+    void callback(RequestResponse result);
 }
diff --git a/sdk/src/main/java/ly/count/android/sdk/ImmediateRequestResponse.java b/sdk/src/main/java/ly/count/android/sdk/RequestResponse.java
similarity index 83%
rename from sdk/src/main/java/ly/count/android/sdk/ImmediateRequestResponse.java
rename to sdk/src/main/java/ly/count/android/sdk/RequestResponse.java
index ea243ea6b..40853396a 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ImmediateRequestResponse.java
+++ b/sdk/src/main/java/ly/count/android/sdk/RequestResponse.java
@@ -4,7 +4,7 @@
  * Enum used throughout Countly for relaying result of A/B test variants fetch
  * TODO: Make it camel case?
  */
-public enum ImmediateRequestResponse {
+public enum RequestResponse {
     NETWORK_ISSUE,
     SUCCESS,
     ERROR,

From 8277240fd6703f373c05ee072da7c7e7562cff74 Mon Sep 17 00:00:00 2001
From: turtledreams <deniztaygunerten@gmail.com>
Date: Mon, 29 May 2023 23:16:44 +0900
Subject: [PATCH 17/18] rcvariantcallback name chaneg

---
 .../ly/count/android/demo/ActivityExampleTests.java  |  6 +++---
 .../ly/count/android/sdk/ModuleRemoteConfig.java     | 12 ++++++------
 ...igVariantCallback.java => RCVariantCallback.java} |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename sdk/src/main/java/ly/count/android/sdk/{RemoteConfigVariantCallback.java => RCVariantCallback.java} (82%)

diff --git a/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java b/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
index 801b1a255..e4a3c4368 100644
--- a/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
+++ b/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
@@ -10,7 +10,7 @@
 import java.util.Map;
 import ly.count.android.sdk.Countly;
 import ly.count.android.sdk.RequestResponse;
-import ly.count.android.sdk.RemoteConfigVariantCallback;
+import ly.count.android.sdk.RCVariantCallback;
 
 public class ActivityExampleTests extends AppCompatActivity {
 
@@ -22,7 +22,7 @@ public void onCreate(Bundle savedInstanceState) {
 
     // For fetching all variants with a button click
     public void onClickFetchAllVariants(View v) {
-        Countly.sharedInstance().remoteConfig().testingFetchVariantInformation(new RemoteConfigVariantCallback() {
+        Countly.sharedInstance().remoteConfig().testingFetchVariantInformation(new RCVariantCallback() {
             @Override
             public void callback(RequestResponse result) {
                 if (result == RequestResponse.SUCCESS) {
@@ -73,7 +73,7 @@ public void onClickEnrollVariant(View v) {
             break; // Get only the first key-value pair
         }
 
-        Countly.sharedInstance().remoteConfig().testingEnrollIntoVariant(key, variant, new RemoteConfigVariantCallback() {
+        Countly.sharedInstance().remoteConfig().testingEnrollIntoVariant(key, variant, new RCVariantCallback() {
             @Override
             public void callback(RequestResponse result) {
                 if (result == RequestResponse.SUCCESS) {
diff --git a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
index da5b4ffa7..06aaf07f8 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
@@ -121,7 +121,7 @@ public void callback(JSONObject checkResponse) {
      *
      * @param callback called after the fetch is done
      */
-    void testingFetchVariantInformationInternal(@NonNull final RemoteConfigVariantCallback callback) {
+    void testingFetchVariantInformationInternal(@NonNull final RCVariantCallback callback) {
         try {
             L.d("[ModuleRemoteConfig] Fetching all A/B test variants");
 
@@ -164,7 +164,7 @@ public void callback(JSONObject checkResponse) {
         }
     }
 
-    void testingEnrollIntoVariantInternal(@NonNull final String key, @NonNull final String variant, @NonNull final RemoteConfigVariantCallback callback) {
+    void testingEnrollIntoVariantInternal(@NonNull final String key, @NonNull final String variant, @NonNull final RCVariantCallback callback) {
         try {
             L.d("[ModuleRemoteConfig] Enrolling A/B test variants, Key/Variant pairs:[" + key + "][" + variant + "]");
 
@@ -591,7 +591,7 @@ public String[] testingGetVariantsForKey(String key) {
          *
          * @param callback
          */
-        public void testingFetchVariantInformation(RemoteConfigVariantCallback callback) {
+        public void testingFetchVariantInformation(RCVariantCallback callback) {
             synchronized (_cly) {
                 L.i("[RemoteConfig] Calling 'testingFetchVariantInformation'");
 
@@ -600,7 +600,7 @@ public void testingFetchVariantInformation(RemoteConfigVariantCallback callback)
                 }
 
                 if (callback == null) {
-                    callback = new RemoteConfigVariantCallback() {
+                    callback = new RCVariantCallback() {
                         @Override public void callback(RequestResponse result) {
                         }
                     };
@@ -617,7 +617,7 @@ public void testingFetchVariantInformation(RemoteConfigVariantCallback callback)
          * @param variantName - name of the variant for the key to enroll
          * @param callback
          */
-        public void testingEnrollIntoVariant(String key, String variantName, RemoteConfigVariantCallback callback) {
+        public void testingEnrollIntoVariant(String key, String variantName, RCVariantCallback callback) {
             synchronized (_cly) {
                 L.i("[RemoteConfig] Calling 'testingEnrollIntoVariant'");
 
@@ -631,7 +631,7 @@ public void testingEnrollIntoVariant(String key, String variantName, RemoteConfi
                 }
 
                 if (callback == null) {
-                    callback = new RemoteConfigVariantCallback() {
+                    callback = new RCVariantCallback() {
                         @Override public void callback(RequestResponse result) {
                         }
                     };
diff --git a/sdk/src/main/java/ly/count/android/sdk/RemoteConfigVariantCallback.java b/sdk/src/main/java/ly/count/android/sdk/RCVariantCallback.java
similarity index 82%
rename from sdk/src/main/java/ly/count/android/sdk/RemoteConfigVariantCallback.java
rename to sdk/src/main/java/ly/count/android/sdk/RCVariantCallback.java
index 0ed1ab0a6..90e6bacd9 100644
--- a/sdk/src/main/java/ly/count/android/sdk/RemoteConfigVariantCallback.java
+++ b/sdk/src/main/java/ly/count/android/sdk/RCVariantCallback.java
@@ -1,6 +1,6 @@
 package ly.count.android.sdk;
 
-public interface RemoteConfigVariantCallback {
+public interface RCVariantCallback {
 
     /**
      * Called after fetching A/B test variants

From bbe7a4de189114cdba40a881daa6a0c05d60732a Mon Sep 17 00:00:00 2001
From: turtledreams <deniztaygunerten@gmail.com>
Date: Tue, 30 May 2023 19:43:01 +0900
Subject: [PATCH 18/18] error added

---
 .../android/demo/ActivityExampleTests.java    |  4 ++--
 .../ly/count/android/sdk/UtilsTimeTests.java  |  2 +-
 .../count/android/sdk/ModuleRemoteConfig.java | 24 +++++++++----------
 .../count/android/sdk/RCVariantCallback.java  |  3 ++-
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java b/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
index e4a3c4368..8741a5f56 100644
--- a/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
+++ b/app/src/main/java/ly/count/android/demo/ActivityExampleTests.java
@@ -24,7 +24,7 @@ public void onCreate(Bundle savedInstanceState) {
     public void onClickFetchAllVariants(View v) {
         Countly.sharedInstance().remoteConfig().testingFetchVariantInformation(new RCVariantCallback() {
             @Override
-            public void callback(RequestResponse result) {
+            public void callback(RequestResponse result, String error) {
                 if (result == RequestResponse.SUCCESS) {
                     Toast.makeText(getApplicationContext(), "Fetch finished", Toast.LENGTH_SHORT).show();
                 } else {
@@ -75,7 +75,7 @@ public void onClickEnrollVariant(View v) {
 
         Countly.sharedInstance().remoteConfig().testingEnrollIntoVariant(key, variant, new RCVariantCallback() {
             @Override
-            public void callback(RequestResponse result) {
+            public void callback(RequestResponse result, String error) {
                 if (result == RequestResponse.SUCCESS) {
                     Toast.makeText(getApplicationContext(), "Fetch finished", Toast.LENGTH_SHORT).show();
                 } else {
diff --git a/sdk/src/androidTest/java/ly/count/android/sdk/UtilsTimeTests.java b/sdk/src/androidTest/java/ly/count/android/sdk/UtilsTimeTests.java
index ed8d075fa..b945aea0b 100644
--- a/sdk/src/androidTest/java/ly/count/android/sdk/UtilsTimeTests.java
+++ b/sdk/src/androidTest/java/ly/count/android/sdk/UtilsTimeTests.java
@@ -32,7 +32,7 @@ public void invalidGet() {
     @Test
     public void testInstant() {
         UtilsTime.Instant i1 = UtilsTime.Instant.get(1579463653876L);
-        Assert.assertEquals(0, i1.dow);
+        Assert.assertEquals(0, i1.dow); // TODO: "expected:<0> but was:<1>"
         Assert.assertEquals(1579463653876L, i1.timestampMs);
 
         //weird stuff to account for timezones and daylight saving
diff --git a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
index 06aaf07f8..6d4e8be23 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java
@@ -127,7 +127,7 @@ void testingFetchVariantInformationInternal(@NonNull final RCVariantCallback cal
 
             if (deviceIdProvider.isTemporaryIdEnabled() || requestQueueProvider.queueContainsTemporaryIdItems() || deviceIdProvider.getDeviceId() == null) {
                 L.d("[ModuleRemoteConfig] Fetching all A/B test variants was aborted, temporary device ID mode is set or device ID is null.");
-                callback.callback(RequestResponse.ERROR);
+                callback.callback(RequestResponse.ERROR, "Temporary device ID mode is set or device ID is null.");
                 return;
             }
 
@@ -144,7 +144,7 @@ void testingFetchVariantInformationInternal(@NonNull final RCVariantCallback cal
                 public void callback(JSONObject checkResponse) {
                     L.d("[ModuleRemoteConfig] Processing Fetching all A/B test variants received response, received response is null:[" + (checkResponse == null) + "]");
                     if (checkResponse == null) {
-                        callback.callback(RequestResponse.NETWORK_ISSUE);
+                        callback.callback(RequestResponse.NETWORK_ISSUE, "Received response is null." );
                         return;
                     }
 
@@ -155,12 +155,12 @@ public void callback(JSONObject checkResponse) {
                         L.e("[ModuleRemoteConfig] testingFetchVariantInformationInternal - execute, Encountered internal issue while trying to fetch information from the server, [" + ex.toString() + "]");
                     }
 
-                    callback.callback(RequestResponse.SUCCESS);
+                    callback.callback(RequestResponse.SUCCESS, null);
                 }
             }, L);
         } catch (Exception ex) {
             L.e("[ModuleRemoteConfig] Encountered internal error while trying to fetch all A/B test variants. " + ex.toString());
-            callback.callback(RequestResponse.ERROR);
+            callback.callback(RequestResponse.ERROR, "Encountered internal error while trying to fetch all A/B test variants.");
         }
     }
 
@@ -170,14 +170,14 @@ void testingEnrollIntoVariantInternal(@NonNull final String key, @NonNull final
 
             if (deviceIdProvider.isTemporaryIdEnabled() || requestQueueProvider.queueContainsTemporaryIdItems() || deviceIdProvider.getDeviceId() == null) {
                 L.d("[ModuleRemoteConfig] Enrolling A/B test variants was aborted, temporary device ID mode is set or device ID is null.");
-                callback.callback(RequestResponse.ERROR);
+                callback.callback(RequestResponse.ERROR, "Temporary device ID mode is set or device ID is null.");
                 return;
             }
 
             // check Key and Variant
             if (TextUtils.isEmpty(key) || TextUtils.isEmpty(variant)) {
                 L.w("[ModuleRemoteConfig] Enrolling A/B test variants, Key/Variant pair is invalid. Aborting.");
-                callback.callback(RequestResponse.ERROR);
+                callback.callback(RequestResponse.ERROR, "Provided key/variant pair is invalid.");
                 return;
             }
 
@@ -194,13 +194,13 @@ void testingEnrollIntoVariantInternal(@NonNull final String key, @NonNull final
                 public void callback(JSONObject checkResponse) {
                     L.d("[ModuleRemoteConfig] Processing Fetching all A/B test variants received response, received response is null:[" + (checkResponse == null) + "]");
                     if (checkResponse == null) {
-                        callback.callback(RequestResponse.NETWORK_ISSUE);
+                        callback.callback(RequestResponse.NETWORK_ISSUE, "Received response is null.");
                         return;
                     }
 
                     try {
                         if (!isResponseValid(checkResponse)) {
-                            callback.callback(RequestResponse.NETWORK_ISSUE);
+                            callback.callback(RequestResponse.NETWORK_ISSUE, "Bad response from the server:" + checkResponse.toString());
                             return;
                         }
 
@@ -217,7 +217,7 @@ public void callback(JSONObject checkResponse) {
                             });
                         }
 
-                        callback.callback(RequestResponse.SUCCESS);
+                        callback.callback(RequestResponse.SUCCESS, null);
                     } catch (Exception ex) {
                         L.e("[ModuleRemoteConfig] testingEnrollIntoVariantInternal - execute, Encountered internal issue while trying to enroll to the variant, [" + ex.toString() + "]");
                     }
@@ -225,7 +225,7 @@ public void callback(JSONObject checkResponse) {
             }, L);
         } catch (Exception ex) {
             L.e("[ModuleRemoteConfig] Encountered internal error while trying to enroll A/B test variants. " + ex.toString());
-            callback.callback(RequestResponse.ERROR);
+            callback.callback(RequestResponse.ERROR, "Encountered internal error while trying to enroll A/B test variants.");
         }
     }
 
@@ -601,7 +601,7 @@ public void testingFetchVariantInformation(RCVariantCallback callback) {
 
                 if (callback == null) {
                     callback = new RCVariantCallback() {
-                        @Override public void callback(RequestResponse result) {
+                        @Override public void callback(RequestResponse result, String error) {
                         }
                     };
                 }
@@ -632,7 +632,7 @@ public void testingEnrollIntoVariant(String key, String variantName, RCVariantCa
 
                 if (callback == null) {
                     callback = new RCVariantCallback() {
-                        @Override public void callback(RequestResponse result) {
+                        @Override public void callback(RequestResponse result, String error) {
                         }
                     };
                 }
diff --git a/sdk/src/main/java/ly/count/android/sdk/RCVariantCallback.java b/sdk/src/main/java/ly/count/android/sdk/RCVariantCallback.java
index 90e6bacd9..4f666dbf4 100644
--- a/sdk/src/main/java/ly/count/android/sdk/RCVariantCallback.java
+++ b/sdk/src/main/java/ly/count/android/sdk/RCVariantCallback.java
@@ -6,6 +6,7 @@ public interface RCVariantCallback {
      * Called after fetching A/B test variants
      *
      * @param result provides an enum for the result of fetch request
+     * @param error provides an error string if it exists
      */
-    void callback(RequestResponse result);
+    void callback(RequestResponse result, String error);
 }