From 3b5ecb30afedf7c09aff9a5f21b929dcc2fd0d80 Mon Sep 17 00:00:00 2001
From: turtledreams <deniztaygunerten@gmail.com>
Date: Thu, 2 Nov 2023 19:48:12 +0900
Subject: [PATCH 1/3] removed device id from calls goint to request queue

---
 CHANGELOG.md                                               | 3 +++
 app/src/main/res/layout/activity_example_remote_config.xml | 7 +++++++
 .../main/java/ly/count/android/sdk/ConnectionQueue.java    | 4 +---
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b826ebae5..52415ba25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 23.8.4
+* Mitigated an issue where the device ID was changed temporarily while exiting an AB experiment
+
 ## 23.8.3
 * Added a config method to set a time limit after which the requests would be removed if not sent to the server: 'setRequestDropAgeHours'
 * Added a call to enroll users to A/B tests when getting a remote config value: 'getValueAndEnroll'
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 451119418..f475acd31 100644
--- a/app/src/main/res/layout/activity_example_remote_config.xml
+++ b/app/src/main/res/layout/activity_example_remote_config.xml
@@ -79,4 +79,11 @@
       android:onClick="onClickRemoteConfigPrintValuesAndEnroll"
       android:text="Get all and enroll"
       />
+  <Button
+      android:id="@+id/exit_all"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:onClick="onClickRemoteConfigExitForKeys"
+      android:text="Exit all keys"
+      />
 </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 23fd8b9c6..7f038d2c3 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ConnectionQueue.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ConnectionQueue.java
@@ -213,7 +213,6 @@ public void enrollToKeys(@NonNull String[] keys) {
         String data = prepareCommonRequestDataShort()
             + "&method=ab"
             + "&keys=" + UtilsNetworking.encodedArrayBuilder(keys)
-            + "&device_id=" + UtilsNetworking.urlEncodeString(deviceIdProvider_.getDeviceId())
             + "&new_end_point=/o/sdk";
 
         addRequestToQueue(data, false);
@@ -236,8 +235,7 @@ public void exitForKeys(@NonNull String[] keys) {
         }
 
         String data = prepareCommonRequestDataShort()
-            + "&method=ab_opt_out"
-            + "&device_id=" + UtilsNetworking.urlEncodeString(deviceIdProvider_.getDeviceId());
+            + "&method=ab_opt_out";
 
         if (keys.length > 0) { // exits all otherwise
             data += "&keys=" + UtilsNetworking.encodedArrayBuilder(keys);

From 6aa779c915eb81074180731f54e8e399476ca312 Mon Sep 17 00:00:00 2001
From: turtledreams <deniztaygunerten@gmail.com>
Date: Thu, 2 Nov 2023 20:23:22 +0900
Subject: [PATCH 2/3] version update

---
 gradle.properties                                               | 2 +-
 .../java/ly/count/android/sdk/ConnectionQueueTests.java         | 2 +-
 sdk/src/main/java/ly/count/android/sdk/Countly.java             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 178c11fde..c4543ebd7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,7 +22,7 @@ org.gradle.configureondemand=true
 android.useAndroidX=true
 android.enableJetifier=true
 # RELEASE FIELD SECTION
-VERSION_NAME=23.8.3
+VERSION_NAME=23.8.4
 GROUP=ly.count.android
 POM_URL=https://github.com/Countly/countly-sdk-android
 POM_SCM_URL=https://github.com/Countly/countly-sdk-android
diff --git a/sdk/src/androidTest/java/ly/count/android/sdk/ConnectionQueueTests.java b/sdk/src/androidTest/java/ly/count/android/sdk/ConnectionQueueTests.java
index f3ded5e34..6b9d7e088 100644
--- a/sdk/src/androidTest/java/ly/count/android/sdk/ConnectionQueueTests.java
+++ b/sdk/src/androidTest/java/ly/count/android/sdk/ConnectionQueueTests.java
@@ -502,7 +502,7 @@ public void testPrepareCommonRequest() {
                         break;
                     case "sdk_version":
                         if (a == 0) {
-                            Assert.assertTrue(pair[1].equals("23.8.3"));
+                            Assert.assertTrue(pair[1].equals("23.8.4"));
                         } else if (a == 1) {
                             Assert.assertTrue(pair[1].equals("123sdf.v-213"));
                         }
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 f2f3c5c2b..1f1b4329f 100644
--- a/sdk/src/main/java/ly/count/android/sdk/Countly.java
+++ b/sdk/src/main/java/ly/count/android/sdk/Countly.java
@@ -49,7 +49,7 @@ of this software and associated documentation files (the "Software"), to deal
  */
 public class Countly {
 
-    private final String DEFAULT_COUNTLY_SDK_VERSION_STRING = "23.8.3";
+    private final String DEFAULT_COUNTLY_SDK_VERSION_STRING = "23.8.4";
 
     /**
      * Used as request meta data on every request

From bf2f3adde49d8b89a0decf6bcbd5fdef28db7571 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Art=C5=ABrs=20Kadi=C4=B7is?= <kadikis.arturs@gmail.com>
Date: Thu, 2 Nov 2023 13:31:01 +0200
Subject: [PATCH 3/3] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52415ba25..83a29921b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
 ## 23.8.4
-* Mitigated an issue where the device ID was changed temporarily while exiting an AB experiment
+* Mitigated an issue where the device ID was changed after exiting an AB experiment
 
 ## 23.8.3
 * Added a config method to set a time limit after which the requests would be removed if not sent to the server: 'setRequestDropAgeHours'