From fa5c52cfb53ed7ec2383eba4b268cebcfb15ddcd Mon Sep 17 00:00:00 2001
From: Xiaowei Zhu <33129495+zhu-xiaowei@users.noreply.github.com>
Date: Sun, 7 May 2023 22:25:40 +0800
Subject: [PATCH] feat: update version to 0.4.0 (#11)

---------

Co-authored-by: xiaoweii <xiaoweii@amazom.com>
---
 .../aws/solution/clickstream/ActivityLifecycleManager.java    | 2 +-
 .../solution/clickstream/client/AutoRecordEventClient.java    | 4 ++--
 .../aws/solution/clickstream/AutoRecordEventClientTest.java   | 4 +++-
 gradle.properties                                             | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/clickstream/src/main/java/software/aws/solution/clickstream/ActivityLifecycleManager.java b/clickstream/src/main/java/software/aws/solution/clickstream/ActivityLifecycleManager.java
index 5fbd6a4..b81844e 100644
--- a/clickstream/src/main/java/software/aws/solution/clickstream/ActivityLifecycleManager.java
+++ b/clickstream/src/main/java/software/aws/solution/clickstream/ActivityLifecycleManager.java
@@ -143,8 +143,8 @@ public void onStateChanged(@NonNull LifecycleOwner lifecycleOwner, @NonNull Life
             autoRecordEventClient.recordUserEngagement();
         } else if (event == Lifecycle.Event.ON_START) {
             LOG.debug("Application entered the foreground.");
-            autoRecordEventClient.updateEngageTimestamp();
             autoRecordEventClient.handleFirstOpen();
+            autoRecordEventClient.updateEngageTimestamp();
             boolean isNewSession = sessionClient.initialSession();
             if (isNewSession) {
                 autoRecordEventClient.setIsEntrances();
diff --git a/clickstream/src/main/java/software/aws/solution/clickstream/client/AutoRecordEventClient.java b/clickstream/src/main/java/software/aws/solution/clickstream/client/AutoRecordEventClient.java
index b65ca81..5cb7070 100644
--- a/clickstream/src/main/java/software/aws/solution/clickstream/client/AutoRecordEventClient.java
+++ b/clickstream/src/main/java/software/aws/solution/clickstream/client/AutoRecordEventClient.java
@@ -61,8 +61,6 @@ public AutoRecordEventClient(@NonNull final ClickstreamContext clickstreamContex
         }
         this.clickstreamContext = clickstreamContext;
         this.isFirstOpen = clickstreamContext.getSystem().getPreferences().getBoolean("isFirstOpen", true);
-        checkAppVersionUpdate();
-        checkOSVersionUpdate();
     }
 
     /**
@@ -152,6 +150,8 @@ private void checkOSVersionUpdate() {
      * handle the first open event.
      */
     public void handleFirstOpen() {
+        checkAppVersionUpdate();
+        checkOSVersionUpdate();
         if (isFirstOpen) {
             final AnalyticsEvent event =
                 this.clickstreamContext.getAnalyticsClient().createEvent(Event.PresetEvent.FIRST_OPEN);
diff --git a/clickstream/src/test/java/software/aws/solution/clickstream/AutoRecordEventClientTest.java b/clickstream/src/test/java/software/aws/solution/clickstream/AutoRecordEventClientTest.java
index f319508..44573f6 100644
--- a/clickstream/src/test/java/software/aws/solution/clickstream/AutoRecordEventClientTest.java
+++ b/clickstream/src/test/java/software/aws/solution/clickstream/AutoRecordEventClientTest.java
@@ -40,6 +40,7 @@
 import software.aws.solution.clickstream.client.ClickstreamManager;
 import software.aws.solution.clickstream.client.Event;
 import software.aws.solution.clickstream.client.db.ClickstreamDBUtil;
+import software.aws.solution.clickstream.client.util.StringUtil;
 import software.aws.solution.clickstream.util.ReflectUtil;
 
 import java.util.ArrayList;
@@ -300,8 +301,9 @@ public void testOSVersionForNotUpdate() throws Exception {
      */
     @Test
     public void testOSVersionForUpdate() throws Exception {
+        ReflectUtil.invokeMethod(client, "checkOSVersionUpdate");
         String previousOSVersion = clickstreamContext.getSystem().getPreferences().getString("osVersion", "");
-        assertNotNull(previousOSVersion);
+        assertFalse(StringUtil.isNullOrEmpty(previousOSVersion));
 
         ReflectionHelpers.setStaticField(Build.VERSION.class, "RELEASE", "10");
         ReflectUtil.invokeMethod(client, "checkOSVersionUpdate");
diff --git a/gradle.properties b/gradle.properties
index 62063fe..f5a8d25 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,7 +12,7 @@ org.gradle.jvmargs=-Xmx4g
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 org.gradle.parallel=true
 
-VERSION_NAME=0.3.0
+VERSION_NAME=0.4.0
 
 POM_GROUP=software.aws.solution
 POM_ARTIFACT_ID=clickstream