Merge pull request #345 from Countly/staging

Staging

Author: arifBurakDemiray

CHANGELOG.md

@@ -1,15 +1,21 @@
-## 24.4.2
+## 24.7.0
 * ! Minor breaking change ! User properties will now be automatically saved under the following conditions:
   * When an event is recorded
   * During an internal timer tick
   * Upon flushing the event queue
 
-* Mitigated an issue where on consent revoke, remote config values were cleared, not anymore.
-
 * Added support for array, List and JSONArray to all user given segmentations. They will support only mutable and ummutable versions of the primitive types. Which are:
   * String, Integer, int, Boolean, bool, Float, float, Double, double, Long, long
   * Keep in mind that float array will be converted to the double array by the JSONArray
 
+* Mitigated an issue where remote config values caching was changing by device id change, not anymore. It is linked to the configuration "enableRemoteConfigValueCaching" now.
+* Mitigated an issue related to the device ID by creating an internal migration.
+* Resolved a problem where revoked consents were sent after changes without merging.
+* Fixed a bug that caused the device ID to be incorrectly set after changes with merging.
+* Mitigated an issue where on consent revoke, remote config values were cleared, not anymore.
+
+* Change device id with merge not reporting session duration anymore.
+
 ## 24.4.1
 * ! Minor breaking change ! Mitigated an issue where internal SDK limits did not apply
 

app-native/build.gradle

@@ -37,7 +37,7 @@ android {
             path file('src/main/cpp/CMakeLists.txt')
         }
     }
-    ndkVersion '23.1.7779620'
+    ndkVersion '21.0.6113669'
 
     // Use this if you are working with sdk-native subproject instead of maven library.
     // Change also the dependency config below.

gradle.properties

@@ -22,7 +22,7 @@ org.gradle.configureondemand=true
 android.useAndroidX=true
 android.enableJetifier=true
 # RELEASE FIELD SECTION
-VERSION_NAME=24.4.2-RC1
+VERSION_NAME=24.7.0
 GROUP=ly.count.android
 POM_URL=https://github.com/Countly/countly-sdk-android
 POM_SCM_URL=https://github.com/Countly/countly-sdk-android

sdk/src/androidTest/java/ly/count/android/sdk/TestUtils.java

@@ -42,7 +42,7 @@ public class TestUtils {
     public final static String commonAppKey = "appkey";
     public final static String commonDeviceId = "1234";
     public final static String SDK_NAME = "java-native-android";
-    public final static String SDK_VERSION = "24.4.2-RC1";
+    public final static String SDK_VERSION = "24.7.0";
     public static final int MAX_THREAD_COUNT_PER_STACK_TRACE = 50;
 
     public static class Activity2 extends Activity {

sdk/src/androidTest/java/ly/count/android/sdk/UtilsInternalLimitsTests.java

@@ -324,7 +324,7 @@ public void removeUnsupportedDataTypes_arrays() {
 
         Assert.assertEquals(7, segmentation.size());
 
-        Assert.assertTrue(UtilsInternalLimits.removeUnsupportedDataTypes(segmentation));
+        Assert.assertTrue(UtilsInternalLimits.removeUnsupportedDataTypes(segmentation, Mockito.mock(ModuleLog.class)));
 
         Assert.assertEquals(6, segmentation.size());
         Assert.assertEquals(aa1, segmentation.get("aa1"));
@@ -350,7 +350,7 @@ public void removeUnsupportedDataTypes_lists() {
 
         Assert.assertEquals(9, segmentation.size());
 
-        Assert.assertTrue(UtilsInternalLimits.removeUnsupportedDataTypes(segmentation));
+        Assert.assertTrue(UtilsInternalLimits.removeUnsupportedDataTypes(segmentation, Mockito.mock(ModuleLog.class)));
 
         Assert.assertEquals(6, segmentation.size());
         Assert.assertEquals(aa1, segmentation.get("aa1"));
@@ -369,7 +369,7 @@ public void removeUnsupportedDataTypes_listsEmpty() {
 
         Assert.assertEquals(2, segmentation.size());
 
-        Assert.assertFalse(UtilsInternalLimits.removeUnsupportedDataTypes(segmentation));
+        Assert.assertFalse(UtilsInternalLimits.removeUnsupportedDataTypes(segmentation, Mockito.mock(ModuleLog.class)));
         Assert.assertEquals(2, segmentation.size());
         Assert.assertEquals(aa1, segmentation.get("aa1"));
         Assert.assertEquals(aa2, segmentation.get("aa2"));
@@ -393,7 +393,7 @@ public void removeUnsupportedDataTypes_arraysEmpty() {
 
         Assert.assertEquals(12, segmentation.size());
 
-        Assert.assertTrue(UtilsInternalLimits.removeUnsupportedDataTypes(segmentation));
+        Assert.assertTrue(UtilsInternalLimits.removeUnsupportedDataTypes(segmentation, Mockito.mock(ModuleLog.class)));
         Assert.assertEquals(11, segmentation.size());
         Assert.assertEquals(aa1, segmentation.get("aa1"));
         Assert.assertEquals(aa2, segmentation.get("aa2"));
@@ -422,7 +422,7 @@ public void removeUnsupportedDataTypes_jsonArray() {
 
         Assert.assertEquals(8, segmentation.size());
 
-        Assert.assertTrue(UtilsInternalLimits.removeUnsupportedDataTypes(segmentation));
+        Assert.assertTrue(UtilsInternalLimits.removeUnsupportedDataTypes(segmentation, Mockito.mock(ModuleLog.class)));
         Assert.assertEquals(7, segmentation.size());
         Assert.assertEquals(empty, segmentation.get("empty"));
         Assert.assertEquals(arrInt, segmentation.get("arrInt"));

sdk/src/main/java/ly/count/android/sdk/Countly.java

@@ -47,7 +47,7 @@ of this software and associated documentation files (the "Software"), to deal
  */
 public class Countly {
 
-    private final String DEFAULT_COUNTLY_SDK_VERSION_STRING = "24.4.2-RC1";
+    private final String DEFAULT_COUNTLY_SDK_VERSION_STRING = "24.7.0";
 
     /**
      * Used as request meta data on every request

sdk/src/main/java/ly/count/android/sdk/ModuleDeviceId.java

@@ -129,7 +129,7 @@ void changeDeviceIdWithoutMergeInternal(@NonNull String deviceId) {
         _cly.moduleUserProfile.saveInternal();
 
         //update remote config_ values after id change if automatic update is enabled
-        _cly.moduleRemoteConfig.clearAndDownloadAfterIdChange(true);
+        _cly.moduleRemoteConfig.clearAndDownloadAfterIdChange();
 
         _cly.moduleSessions.endSessionInternal();
 
@@ -189,7 +189,7 @@ void changeDeviceIdWithMergeInternal(@NonNull String deviceId) {
             // in both cases we act the same as the temporary ID requests will be updated with the final ID later
 
             //update remote config_ values after id change if automatic update is enabled
-            _cly.moduleRemoteConfig.clearAndDownloadAfterIdChange(false);
+            _cly.moduleRemoteConfig.clearAndDownloadAfterIdChange();
             requestQueueProvider.changeDeviceId(deviceId, deviceIdInstance.getCurrentId());
             deviceIdInstance.changeToCustomId(deviceId);
             _cly.notifyDeviceIdChange();

sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java

@@ -381,12 +381,11 @@ void clearValueStoreInternal() {
         return variantResponse;
     }
 
-    void clearAndDownloadAfterIdChange(boolean valuesShouldBeCacheCleared) {
-        L.v("[RemoteConfig] Clearing remote config values and preparing to download after ID update, " + valuesShouldBeCacheCleared);
+    void clearAndDownloadAfterIdChange() {
+        L.v("[RemoteConfig] Clearing remote config values and preparing to download after ID update");
+
+        CacheOrClearRCValuesIfNeeded();
 
-        if (valuesShouldBeCacheCleared) {
-            CacheOrClearRCValuesIfNeeded();
-        }
         if (automaticDownloadTriggersEnabled && consentProvider.getConsent(Countly.CountlyFeatureNames.remoteConfig)) {
             updateRemoteConfigAfterIdChange = true;
         }