Skip to content

Commit 833211e

Browse files
committed
Address feedback
1 parent 5b4ffb1 commit 833211e

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SharedSessionRepository.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ constructor(
124124
val newSessionDetails =
125125
sessionGenerator.generateNewSession(sessionData.sessionDetails)
126126
sessionFirelogPublisher.mayLogSession(sessionDetails = newSessionDetails)
127+
processDataManager.onSessionGenerated()
127128
currentSessionData.copy(sessionDetails = newSessionDetails, backgroundTime = null)
128129
} else {
129130
currentSessionData
@@ -164,17 +165,17 @@ constructor(
164165
sessionData.backgroundTime?.let { backgroundTime ->
165166
val interval = timeProvider.currentTime() - backgroundTime
166167
if (interval > sessionsSettings.sessionRestartTimeout) {
167-
// Passed session restart timeout, so should initiate a new session
168+
Log.d(TAG, "Passed session restart timeout, so initiate a new session")
168169
return true
169170
}
170171
}
171172

172173
sessionData.processDataMap?.let { processDataMap ->
173-
// Has not passed session restart timeout, so check for cold app start
174+
Log.d(TAG, "Has not passed session restart timeout, so check for cold app start")
174175
return processDataManager.isColdStart(processDataMap)
175176
}
176177

177-
// No process has backgrounded yet and no process mapping, should not change the session
178+
Log.d(TAG, "No process has backgrounded yet and no process data, should not change the session")
178179
return false
179180
}
180181

firebase-sessions/src/test/kotlin/com/google/firebase/sessions/ProcessDataManagerTest.kt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import com.google.firebase.FirebaseApp
2222
import com.google.firebase.sessions.testing.FakeFirebaseApp
2323
import com.google.firebase.sessions.testing.FakeRunningAppProcessInfo
2424
import com.google.firebase.sessions.testing.FakeUuidGenerator
25-
import com.google.firebase.sessions.testing.FakeUuidGenerator.Companion.UUID_1 as MY_UUID
26-
import com.google.firebase.sessions.testing.FakeUuidGenerator.Companion.UUID_2 as OTHER_UUID
25+
import com.google.firebase.sessions.testing.FakeUuidGenerator.Companion.UUID_1
26+
import com.google.firebase.sessions.testing.FakeUuidGenerator.Companion.UUID_2
2727
import org.junit.After
2828
import org.junit.Test
2929
import org.junit.runner.RunWith
@@ -33,10 +33,10 @@ internal class ProcessDataManagerTest {
3333
@Test
3434
fun isColdStart_myProcess() {
3535
val appContext = FakeFirebaseApp().firebaseApp.applicationContext
36-
val processDataManager = ProcessDataManagerImpl(appContext, FakeUuidGenerator(MY_UUID))
36+
val processDataManager = ProcessDataManagerImpl(appContext, FakeUuidGenerator(UUID_1))
3737

3838
val coldStart =
39-
processDataManager.isColdStart(mapOf(MY_PROCESS_NAME to ProcessData(MY_PID, MY_UUID)))
39+
processDataManager.isColdStart(mapOf(MY_PROCESS_NAME to ProcessData(MY_PID, UUID_1)))
4040

4141
assertThat(coldStart).isFalse()
4242
}
@@ -46,13 +46,13 @@ internal class ProcessDataManagerTest {
4646
FakeFirebaseApp(processes = listOf(myProcessInfo, otherProcessInfo))
4747
.firebaseApp
4848
.applicationContext
49-
val processDataManager = ProcessDataManagerImpl(appContext, FakeUuidGenerator(MY_UUID))
49+
val processDataManager = ProcessDataManagerImpl(appContext, FakeUuidGenerator(UUID_1))
5050

5151
val coldStart =
5252
processDataManager.isColdStart(
5353
mapOf(
54-
MY_PROCESS_NAME to ProcessData(MY_PID, MY_UUID),
55-
OTHER_PROCESS_NAME to ProcessData(OTHER_PID, OTHER_UUID),
54+
MY_PROCESS_NAME to ProcessData(MY_PID, UUID_1),
55+
OTHER_PROCESS_NAME to ProcessData(OTHER_PID, UUID_2),
5656
)
5757
)
5858

@@ -62,21 +62,21 @@ internal class ProcessDataManagerTest {
6262
@Test
6363
fun isColdStart_staleProcessPid() {
6464
val appContext = FakeFirebaseApp().firebaseApp.applicationContext
65-
val processDataManager = ProcessDataManagerImpl(appContext, FakeUuidGenerator(MY_UUID))
65+
val processDataManager = ProcessDataManagerImpl(appContext, FakeUuidGenerator(UUID_1))
6666

6767
val coldStart =
68-
processDataManager.isColdStart(mapOf(MY_PROCESS_NAME to ProcessData(OTHER_PID, MY_UUID)))
68+
processDataManager.isColdStart(mapOf(MY_PROCESS_NAME to ProcessData(OTHER_PID, UUID_1)))
6969

7070
assertThat(coldStart).isTrue()
7171
}
7272

7373
@Test
7474
fun isColdStart_staleProcessUuid() {
7575
val appContext = FakeFirebaseApp().firebaseApp.applicationContext
76-
val processDataManager = ProcessDataManagerImpl(appContext, FakeUuidGenerator(MY_UUID))
76+
val processDataManager = ProcessDataManagerImpl(appContext, FakeUuidGenerator(UUID_1))
7777

7878
val coldStart =
79-
processDataManager.isColdStart(mapOf(MY_PROCESS_NAME to ProcessData(MY_PID, OTHER_UUID)))
79+
processDataManager.isColdStart(mapOf(MY_PROCESS_NAME to ProcessData(MY_PID, UUID_2)))
8080

8181
assertThat(coldStart).isTrue()
8282
}
@@ -87,13 +87,13 @@ internal class ProcessDataManagerTest {
8787
FakeFirebaseApp(processes = listOf(myProcessInfo, otherProcessInfo))
8888
.firebaseApp
8989
.applicationContext
90-
val processDataManager = ProcessDataManagerImpl(appContext, FakeUuidGenerator(MY_UUID))
90+
val processDataManager = ProcessDataManagerImpl(appContext, FakeUuidGenerator(UUID_1))
9191

9292
val coldStart =
9393
processDataManager.isColdStart(
9494
mapOf(
95-
MY_PROCESS_NAME to ProcessData(OTHER_PID, MY_UUID),
96-
OTHER_PROCESS_NAME to ProcessData(OTHER_PID, OTHER_UUID),
95+
MY_PROCESS_NAME to ProcessData(OTHER_PID, UUID_1),
96+
OTHER_PROCESS_NAME to ProcessData(OTHER_PID, UUID_2),
9797
)
9898
)
9999

0 commit comments

Comments
 (0)