fix: gather all under one flag

Author: arifBurakDemiray

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

@@ -118,7 +118,7 @@ Future<Boolean> begin(Long now) {
         }
 
         this.consents = SDKCore.instance.consents;
-        if (config.isAutoSendUserPropertiesOnSessions() && config.sdk.userProfile() != null) {
+        if (config.isAutoSendUserProperties() && config.sdk.userProfile() != null) {
             config.sdk.module(ModuleUserProfile.class).saveInternal();
         }
 
@@ -160,7 +160,7 @@ Future<Boolean> update(Long now) {
         }
 
         this.consents = SDKCore.instance.consents;
-        if (config.isAutoSendUserPropertiesOnSessions() && config.sdk.userProfile() != null) {
+        if (config.isAutoSendUserProperties() && config.sdk.userProfile() != null) {
             config.sdk.module(ModuleUserProfile.class).saveInternal();
         }
 
@@ -198,7 +198,7 @@ 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) {
+        if (config.isAutoSendUserProperties() && config.sdk.userProfile() != null) {
             config.sdk.module(ModuleUserProfile.class).saveInternal();
         }
 

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

@@ -516,6 +516,28 @@ public void eventsUserProps_propsSave() {
         Assert.assertEquals(TestUtils.json("custom", TestUtils.map("after_event", "value2")), RQ[1].get("user_details"));
     }
 
+    /**
+     * Recording events with user properties and with flushing events
+     * Validating that if a user property save called, it does not flush EQ before saving user properties
+     */
+    @Test
+    public void eventsUserProps_propsSave_reversed() {
+        init(TestUtils.getConfigEvents(4).disableAutoSendUserProperties());
+
+        Countly.instance().events().recordEvent(eKeys[0]);
+
+        Map<String, String>[] RQ = TestUtils.getCurrentRQ();
+        Assert.assertEquals(0, RQ.length);
+        TestUtils.validateEventInEQ(eKeys[0], null, 1, null, null, 0, 1, "_CLY_", null, "", null);
+
+        Countly.instance().userProfile().setProperty("after_event", "value2");
+        Countly.instance().userProfile().save();
+
+        RQ = TestUtils.getCurrentRQ();
+        Assert.assertEquals(1, RQ.length);
+        Assert.assertEquals(TestUtils.json("custom", TestUtils.map("after_event", "value2")), RQ[0].get("user_details"));
+    }
+
     /**
      * Validate that user properties are sent with timer tick if no events are recorded
      */
@@ -534,6 +556,23 @@ public void eventsUserProps_timer() throws InterruptedException {
         Assert.assertEquals(TestUtils.json("custom", TestUtils.map("before_timer", "value1")), RQ[0].get("user_details"));
     }
 
+    /**
+     * Validate that user properties does not send with timer tick if no events are recorded
+     */
+    @Test
+    public void eventsUserProps_timer_reversed() throws InterruptedException {
+        init(TestUtils.getConfigEvents(4).setUpdateSessionTimerDelay(2).disableAutoSendUserProperties());
+
+        Countly.instance().userProfile().setProperty("before_timer", "value1");
+
+        Map<String, String>[] RQ = TestUtils.getCurrentRQ();
+        Assert.assertEquals(0, RQ.length);
+
+        Thread.sleep(2500); // wait for the tick
+        RQ = TestUtils.getCurrentRQ();
+        Assert.assertEquals(0, RQ.length);
+    }
+
     private void validateTimedEventSize(int expectedQueueSize, int expectedTimedEventSize) {
         TestUtils.validateEQSize(expectedQueueSize, TestUtils.getCurrentEQ(), moduleEvents.eventQueue);
         Assert.assertEquals(expectedTimedEventSize, moduleEvents.timedEvents.size());

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

@@ -680,7 +680,7 @@ public void userPropsOnSessions() throws InterruptedException {
      */
     @Test
     public void userPropsOnSessions_reversed() throws InterruptedException {
-        Countly.instance().init(TestUtils.getConfigSessions(Config.Feature.UserProfiles).disableAutoSendUserPropertiesOnSessions());
+        Countly.instance().init(TestUtils.getConfigSessions(Config.Feature.UserProfiles).disableAutoSendUserProperties());
         Countly.instance().userProfile().setProperty("name", "John Doe");
         Countly.instance().userProfile().setProperty("custom_key", "custom_value");