Merge remote-tracking branch 'origin/development' into feat/SQDSDKS-6673_identity_caching_2

Author: Mansi-mParticle

CHANGELOG.md

@@ -1,3 +1,13 @@
+## [5.58.3](https://github.com/mParticle/mparticle-android-sdk/compare/v5.58.2...v5.58.3) (2024-10-24)
+
+
+### Updates & Maintenance
+
+* Migrate Internal Constants class to kotlin  ([#510](https://github.com/mParticle/mparticle-android-sdk/issues/510)) ([2fd32f6](https://github.com/mParticle/mparticle-android-sdk/commit/2fd32f6d068975b0c57bde1a50e25c3a1c5617bb))
+* Migrate MPLifecycleCallbackDelegate and MPLocationListener class to Kotlin ([#506](https://github.com/mParticle/mparticle-android-sdk/issues/506)) ([687e623](https://github.com/mParticle/mparticle-android-sdk/commit/687e6234bdfc6b24680e92f348422f4a5c298529))
+* Remove unused session history upload code ([#507](https://github.com/mParticle/mparticle-android-sdk/issues/507)) ([a86cd3b](https://github.com/mParticle/mparticle-android-sdk/commit/a86cd3b7bdc923a152ae9f5503244aadb50065de))
+* Update submodules ([81e50ca](https://github.com/mParticle/mparticle-android-sdk/commit/81e50ca7f9f185c143dbc3567772e331588f72cd))
+
 ## [5.58.2](https://github.com/mParticle/mparticle-android-sdk/compare/v5.58.1...v5.58.2) (2024-09-11)
 
 

README.md

@@ -16,7 +16,7 @@ You can grab the Core SDK via Maven Central. Please see the badge above and foll
 
 ```groovy
 dependencies {
-    implementation 'com.mparticle:android-core:5.58.2'
+    implementation 'com.mparticle:android-core:5.58.3'
 }
 ```
 
@@ -27,8 +27,8 @@ Several integrations require additional client-side add-on libraries called "kit
 ```groovy
 dependencies {
     implementation (
-        'com.mparticle:android-example-kit:5.58.2',
-        'com.mparticle:android-another-kit:5.58.2'
+        'com.mparticle:android-example-kit:5.58.3',
+        'com.mparticle:android-another-kit:5.58.3'
     )
 }
 ```

android-core/build.gradle

@@ -84,6 +84,7 @@ android {
             jvmArgs += ['--add-opens', 'java.base/java.text=ALL-UNNAMED']
             jvmArgs += ['--add-opens', 'java.base/java.math=ALL-UNNAMED']
             jvmArgs += ['--add-opens', 'java.base/java.util.concurrent=ALL-UNNAMED']
+            jvmArgs += ['--add-opens', 'java.base/java.util.concurrent.atomic=ALL-UNNAMED']
             jvmArgs += ['--add-opens', 'java.base/java.lang.ref=ALL-UNNAMED']
         }
         if (useOrchestrator()) {
@@ -158,6 +159,7 @@ dependencies {
     testImplementation project(':testutils')
     testImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlin_version"
 
     androidTestImplementation project(':testutils')
     if (useOrchestrator()) {
@@ -166,6 +168,7 @@ dependencies {
     }
     androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
+    androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlin_version"
 }
 
 

android-core/src/androidTest/kotlin/com.mparticle/SessionMessagesTest.kt

@@ -28,10 +28,10 @@ class SessionMessagesTest : BaseCleanStartedEachTest() {
     fun testSessionStartMessage() {
         val sessionStartReceived = BooleanArray(1)
         sessionStartReceived[0] = false
-        Assert.assertFalse(mAppStateManager.session.isActive)
+        Assert.assertFalse(mAppStateManager.fetchSession().isActive)
         val sessionId = AndroidUtils.Mutable<String?>(null)
         mAppStateManager.ensureActiveSession()
-        sessionId.value = mAppStateManager.session.mSessionID
+        sessionId.value = mAppStateManager.fetchSession().mSessionID
         AccessUtils.awaitMessageHandler()
         MParticle.getInstance()?.upload()
         mServer.waitForVerify(
@@ -45,14 +45,14 @@ class SessionMessagesTest : BaseCleanStartedEachTest() {
                             if (eventObject.getString("dt") == Constants.MessageType.SESSION_START) {
                                 Assert.assertEquals(
                                     eventObject.getLong("ct").toFloat(),
-                                    mAppStateManager.session.mSessionStartTime.toFloat(),
+                                    mAppStateManager.fetchSession().mSessionStartTime.toFloat(),
                                     1000f
                                 )
                                 Assert.assertEquals(
                                     """started sessionID = ${sessionId.value} 
-current sessionId = ${mAppStateManager.session.mSessionID} 
+current sessionId = ${mAppStateManager.fetchSession().mSessionID} 
 sent sessionId = ${eventObject.getString("id")}""",
-                                    mAppStateManager.session.mSessionID,
+                                    mAppStateManager.fetchSession().mSessionID,
                                     eventObject.getString("id")
                                 )
                                 sessionStartReceived[0] = true

android-core/src/androidTest/kotlin/com.mparticle/internal/AppStateManagerInstrumentedTest.kt

@@ -8,6 +8,8 @@ import com.mparticle.internal.database.services.AccessUtils
 import com.mparticle.internal.database.services.MParticleDBManager
 import com.mparticle.testutils.BaseCleanStartedEachTest
 import com.mparticle.testutils.MPLatch
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.runTest
 import org.json.JSONException
 import org.junit.Assert
 import org.junit.Before
@@ -33,7 +35,7 @@ class AppStateManagerInstrumentedTest : BaseCleanStartedEachTest() {
         }
         mAppStateManager?.ensureActiveSession()
         for (mpid in mpids) {
-            mAppStateManager?.session?.addMpid(mpid)
+            mAppStateManager?.fetchSession()?.addMpid(mpid)
         }
         val checked = BooleanArray(1)
         val latch: CountDownLatch = MPLatch(1)
@@ -72,7 +74,7 @@ class AppStateManagerInstrumentedTest : BaseCleanStartedEachTest() {
         mpids.add(Constants.TEMPORARY_MPID)
         mAppStateManager?.ensureActiveSession()
         for (mpid in mpids) {
-            mAppStateManager?.session?.addMpid(mpid)
+            mAppStateManager?.fetchSession()?.addMpid(mpid)
         }
         val latch: CountDownLatch = MPLatch(1)
         val checked = MutableBoolean(false)
@@ -104,7 +106,7 @@ class AppStateManagerInstrumentedTest : BaseCleanStartedEachTest() {
 
     @Test
     @Throws(InterruptedException::class)
-    fun testOnApplicationForeground() {
+    fun testOnApplicationForeground() = runTest(StandardTestDispatcher()) {
         val latch: CountDownLatch = MPLatch(2)
         val kitManagerTester = KitManagerTester(mContext, latch)
         com.mparticle.AccessUtils.setKitManager(kitManagerTester)

android-core/src/androidTest/kotlin/com.mparticle/internal/BatchSessionInfoTest.kt

@@ -36,11 +36,11 @@ class BatchSessionInfoTest : BaseCleanStartedEachTest() {
 
         AccessUtils.awaitMessageHandler()
         MParticle.getInstance()?.Internal()?.apply {
-            val sessionId = appStateManager.session.mSessionID
+            val sessionId = appStateManager.fetchSession().mSessionID
             appStateManager.endSession()
             appStateManager.ensureActiveSession()
             InstallReferrerHelper.setInstallReferrer(mContext, "222")
-            assertNotEquals(sessionId, appStateManager.session.mSessionID)
+            assertNotEquals(sessionId, appStateManager.fetchSession().mSessionID)
         }
 
         var messageCount = 0

android-core/src/androidTest/kotlin/com.mparticle/internal/UserStorageTest.kt

@@ -18,7 +18,9 @@ class UserStorageTest : BaseCleanStartedEachTest() {
         val startTime = System.currentTimeMillis()
         val storage = UserStorage.create(mContext, ran.nextLong())
         val firstSeen = storage.firstSeenTime
-        Assert.assertTrue(firstSeen >= startTime && firstSeen <= System.currentTimeMillis())
+        if (firstSeen != null) {
+            Assert.assertTrue(firstSeen >= startTime && firstSeen <= System.currentTimeMillis())
+        }
 
         // make sure that the firstSeenTime does not update if it has already been set
         storage.firstSeenTime = 10L