Skip to content

Commit 268d850

Browse files
refactor: Migrate Internal Application context class to kotlin (#511)
1 parent b6ab438 commit 268d850

13 files changed

Lines changed: 962 additions & 881 deletions

File tree

android-core/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ android {
8484
jvmArgs += ['--add-opens', 'java.base/java.text=ALL-UNNAMED']
8585
jvmArgs += ['--add-opens', 'java.base/java.math=ALL-UNNAMED']
8686
jvmArgs += ['--add-opens', 'java.base/java.util.concurrent=ALL-UNNAMED']
87+
jvmArgs += ['--add-opens', 'java.base/java.util.concurrent.atomic=ALL-UNNAMED']
8788
jvmArgs += ['--add-opens', 'java.base/java.lang.ref=ALL-UNNAMED']
8889
}
8990
if (useOrchestrator()) {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ class SessionMessagesTest : BaseCleanStartedEachTest() {
2828
fun testSessionStartMessage() {
2929
val sessionStartReceived = BooleanArray(1)
3030
sessionStartReceived[0] = false
31-
Assert.assertFalse(mAppStateManager.session.isActive)
31+
Assert.assertFalse(mAppStateManager.fetchSession().isActive)
3232
val sessionId = AndroidUtils.Mutable<String?>(null)
3333
mAppStateManager.ensureActiveSession()
34-
sessionId.value = mAppStateManager.session.mSessionID
34+
sessionId.value = mAppStateManager.fetchSession().mSessionID
3535
AccessUtils.awaitMessageHandler()
3636
MParticle.getInstance()?.upload()
3737
mServer.waitForVerify(
@@ -45,14 +45,14 @@ class SessionMessagesTest : BaseCleanStartedEachTest() {
4545
if (eventObject.getString("dt") == Constants.MessageType.SESSION_START) {
4646
Assert.assertEquals(
4747
eventObject.getLong("ct").toFloat(),
48-
mAppStateManager.session.mSessionStartTime.toFloat(),
48+
mAppStateManager.fetchSession().mSessionStartTime.toFloat(),
4949
1000f
5050
)
5151
Assert.assertEquals(
5252
"""started sessionID = ${sessionId.value}
53-
current sessionId = ${mAppStateManager.session.mSessionID}
53+
current sessionId = ${mAppStateManager.fetchSession().mSessionID}
5454
sent sessionId = ${eventObject.getString("id")}""",
55-
mAppStateManager.session.mSessionID,
55+
mAppStateManager.fetchSession().mSessionID,
5656
eventObject.getString("id")
5757
)
5858
sessionStartReceived[0] = true

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class AppStateManagerInstrumentedTest : BaseCleanStartedEachTest() {
3333
}
3434
mAppStateManager?.ensureActiveSession()
3535
for (mpid in mpids) {
36-
mAppStateManager?.session?.addMpid(mpid)
36+
mAppStateManager?.fetchSession()?.addMpid(mpid)
3737
}
3838
val checked = BooleanArray(1)
3939
val latch: CountDownLatch = MPLatch(1)
@@ -72,7 +72,7 @@ class AppStateManagerInstrumentedTest : BaseCleanStartedEachTest() {
7272
mpids.add(Constants.TEMPORARY_MPID)
7373
mAppStateManager?.ensureActiveSession()
7474
for (mpid in mpids) {
75-
mAppStateManager?.session?.addMpid(mpid)
75+
mAppStateManager?.fetchSession()?.addMpid(mpid)
7676
}
7777
val latch: CountDownLatch = MPLatch(1)
7878
val checked = MutableBoolean(false)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ class BatchSessionInfoTest : BaseCleanStartedEachTest() {
3636

3737
AccessUtils.awaitMessageHandler()
3838
MParticle.getInstance()?.Internal()?.apply {
39-
val sessionId = appStateManager.session.mSessionID
39+
val sessionId = appStateManager.fetchSession().mSessionID
4040
appStateManager.endSession()
4141
appStateManager.ensureActiveSession()
4242
InstallReferrerHelper.setInstallReferrer(mContext, "222")
43-
assertNotEquals(sessionId, appStateManager.session.mSessionID)
43+
assertNotEquals(sessionId, appStateManager.fetchSession().mSessionID)
4444
}
4545

4646
var messageCount = 0

0 commit comments

Comments
 (0)