Merge branch 'staging' into auto_user_props_save

Author: arifBurakDemiray

CHANGELOG.md

@@ -1,13 +1,16 @@
-## XX.XX.XX
+## 24.1.4
 * ! 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
-  
+  * When a session call made
+* Cleaned up unused gradle dependencies from root build.gradle.
+
 ## 24.1.3
 * Extended minimum JDK support to 8.
 
 ## 24.1.2
+
 * !! Major Breaking Change !! Minimum JDK support is 19 for this minor.
 
 * Migrated from Sonatype OSSRH.
@@ -219,3 +222,4 @@
 
 * initial SDK release
 * MavenCentral rerelease 
+

build.gradle

@@ -1,37 +1,21 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    repositories {
-        google()
-        mavenCentral()
-        jcenter()
-        maven {
-            url "https://maven.google.com"
-        }
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.4'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
-        classpath 'com.google.gms:google-services:4.4.2'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
+  repositories {
+    google()
+    mavenCentral()
+  }
 }
 
 allprojects {
-    ext.CLY_VERSION = "24.1.3"
-    ext.POWERMOCK_VERSION = "1.7.4"
+  ext.CLY_VERSION = "24.1.3"
+  ext.POWERMOCK_VERSION = "1.7.4"
 
-    tasks.withType(Javadoc) {
-        options.addStringOption('Xdoclint:none', '-quiet')
-    }
-    repositories {
-        google()
-        jcenter()
-        //mavenLocal()
-        maven {
-            url "https://maven.google.com" // Google's Maven repository
-        }
-    }
+  tasks.withType(Javadoc) {
+    options.addStringOption('Xdoclint:none', '-quiet')
+  }
+  repositories {
+    google()
+    mavenCentral()
+  }
 }

sdk-java/build.gradle

@@ -8,7 +8,11 @@ buildscript {
     //mavenLocal()
   }
   dependencies {
-    classpath 'com.vanniktech:gradle-maven-publish-plugin:0.28.0' //for publishing
+    // Load publish plugin ONLY when publish task is requested
+    if (gradle.startParameter.taskNames.any { it.toLowerCase().contains("publish") }) {
+      // This requires minimum java 11 to work
+      classpath 'com.vanniktech:gradle-maven-publish-plugin:0.28.0'
+    } 
   }
 }
 
@@ -28,4 +32,6 @@ dependencies {
   //testImplementation 'com.squareup.okhttp3:mockwebserver:3.7.0'
 }
 
-apply plugin: "com.vanniktech.maven.publish"
+if (gradle.startParameter.taskNames.any { it.toLowerCase().contains("publish") }) {
+  apply plugin: "com.vanniktech.maven.publish"
+}

sdk-java/src/main/java/ly/count/sdk/java/Config.java

@@ -1489,6 +1489,7 @@ public String toString() {
      * - When an event is recorded
      * - During an internal timer tick
      * - Upon flushing the event queue
+     * - When a session call made
      *
      * @return {@code this} instance for method chaining
      */

sdk-java/src/main/java/ly/count/sdk/java/internal/SessionImpl.java

@@ -118,6 +118,9 @@ Future<Boolean> begin(Long now) {
         }
 
         this.consents = SDKCore.instance.consents;
+        if (config.isAutoSendUserPropertiesOnSessions() && config.sdk.userProfile() != null) {
+            config.sdk.module(ModuleUserProfile.class).saveInternal();
+        }
 
         if (pushOnChange) {
             Storage.pushAsync(config, this);
@@ -157,6 +160,9 @@ Future<Boolean> update(Long now) {
         }
 
         this.consents = SDKCore.instance.consents;
+        if (config.isAutoSendUserPropertiesOnSessions() && config.sdk.userProfile() != null) {
+            config.sdk.module(ModuleUserProfile.class).saveInternal();
+        }
 
         Long duration = updateDuration(now);
 
@@ -192,6 +198,9 @@ Future<Boolean> end(Long now, final Tasks.Callback<Boolean> callback, String did
         ended = now == null ? System.nanoTime() : now;
 
         this.consents = SDKCore.instance.consents;
+        if (config.isAutoSendUserPropertiesOnSessions() && config.sdk.userProfile() != null) {
+            config.sdk.module(ModuleUserProfile.class).saveInternal();
+        }
 
         if (currentView != null) {
             currentView.stop(true);

sdk-java/src/test/java/ly/count/sdk/java/internal/SessionImplTests.java

@@ -629,6 +629,81 @@ public void view_stopStartedAndNext() {
         ModuleViewsTests.validateView("next", 0.0, 2, 3, false, true, null, TestUtils.keysValues[1], TestUtils.keysValues[0]);
     }
 
+    /**
+     * Validates that when session calls are made, if any user properties are set,
+     * they are sent before sending that session call
+     * Validated with all session calls: begin, update, end
+     *
+     * @throws InterruptedException if thread is interrupted
+     */
+    @Test
+    public void userPropsOnSessions() throws InterruptedException {
+        Countly.instance().init(TestUtils.getConfigSessions(Config.Feature.UserProfiles));
+        Countly.instance().userProfile().setProperty("name", "John Doe");
+        Countly.instance().userProfile().setProperty("custom_key", "custom_value");
+
+        Countly.session().begin();
+        Map<String, String>[] RQ = TestUtils.getCurrentRQ();
+        UserEditorTests.validateUserDetailsRequestInRQ(TestUtils.map("user_details", TestUtils.json("name", "John Doe", "custom", TestUtils.map("custom_key", "custom_value"))), 0, 2);
+        Assert.assertEquals("1", RQ[1].get("begin_session"));
+
+        Thread.sleep(2000); // wait for session to update
+        Countly.instance().userProfile().save();
+        RQ = TestUtils.getCurrentRQ();
+        Assert.assertEquals(2, RQ.length); // Validate that user properties are flushed
+
+        Countly.instance().userProfile().setProperty("email", "[email protected]");
+        Countly.session().update();
+
+        RQ = TestUtils.getCurrentRQ();
+        Assert.assertEquals(TestUtils.json("email", "[email protected]"), RQ[2].get("user_details"));
+        Assert.assertEquals("2", RQ[3].get("session_duration"));
+
+        Thread.sleep(2000); // wait for session to update
+        Countly.instance().userProfile().save();
+        RQ = TestUtils.getCurrentRQ();
+        Assert.assertEquals(4, RQ.length); // Validate that user properties are flushed with update call
+
+        Countly.instance().userProfile().setProperty("done", "yes");
+        Countly.session().end();
+
+        RQ = TestUtils.getCurrentRQ();
+        Assert.assertEquals(TestUtils.json("custom", TestUtils.map("done", "yes")), RQ[4].get("user_details"));
+        Assert.assertEquals("1", RQ[5].get("end_session"));
+    }
+
+    /**
+     * Validates that when session calls are made, if any user properties are set,
+     * they are not packed because auto-send is disabled
+     *
+     * @throws InterruptedException if thread is interrupted
+     */
+    @Test
+    public void userPropsOnSessions_reversed() throws InterruptedException {
+        Countly.instance().init(TestUtils.getConfigSessions(Config.Feature.UserProfiles).disableAutoSendUserPropertiesOnSessions());
+        Countly.instance().userProfile().setProperty("name", "John Doe");
+        Countly.instance().userProfile().setProperty("custom_key", "custom_value");
+
+        Countly.session().begin();
+        Map<String, String>[] RQ = TestUtils.getCurrentRQ();
+        Assert.assertEquals(1, RQ.length);
+        Assert.assertEquals("1", RQ[0].get("begin_session"));
+
+        Thread.sleep(2000); // wait for session to update
+        Countly.session().update();
+        RQ = TestUtils.getCurrentRQ();
+
+        Assert.assertEquals(2, RQ.length);
+        Assert.assertEquals("2", RQ[1].get("session_duration"));
+
+        Thread.sleep(2000);
+        Countly.session().end();
+        RQ = TestUtils.getCurrentRQ();
+
+        Assert.assertEquals(3, RQ.length);
+        Assert.assertEquals("1", RQ[2].get("end_session"));
+    }
+
     private void validateNotEquals(int idOffset, BiFunction<SessionImpl, SessionImpl, Consumer<Long>> setter) {
         Countly.instance().init(TestUtils.getConfigSessions());
         long ts = TimeUtils.timestampMs();