Skip to content

Final cleanup before merging #7112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 8, 2025
Merged

Final cleanup before merging #7112

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9211ca7
Final cleanup before merging
mrober Jul 7, 2025
54fc98a
Address feedback
mrober Jul 7, 2025
3ae4c4f
Format
mrober Jul 7, 2025
d33b857
Feedback
mrober Jul 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ constructor(
) {

init {
Log.d(TAG, "Initializing Firebase Sessions SDK.")
Log.d(TAG, "Initializing Firebase Sessions ${BuildConfig.VERSION_NAME}.")
val appContext = firebaseApp.applicationContext.applicationContext
if (appContext is Application) {
appContext.registerActivityLifecycleCallbacks(sessionsActivityLifecycleCallbacks)
Expand Down
2 changes: 2 additions & 0 deletions ...ssions/src/main/kotlin/com/google/firebase/sessions/SessionsActivityLifecycleCallbacks.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ constructor(private val sharedSessionRepository: SharedSessionRepository) :
}

override fun onActivityResumed(activity: Activity) {
// There is a known issue in API level 34 where in some cases with a split screen, the call to
// onActivityResumed can happen before the call to onActivityPaused. This is fixed in API 35+
if (enabled) {
sharedSessionRepository.appForeground()
}
Expand Down
7 changes: 3 additions & 4 deletions firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SharedSessionRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,11 @@ constructor(
Log.d(TAG, "App backgrounded, but local SessionData not initialized")
return
}
val sessionData = localSessionData
Log.d(TAG, "App backgrounded on ${processDataManager.myProcessName} - $sessionData")
Log.d(TAG, "App backgrounded on ${processDataManager.myProcessName}")

CoroutineScope(backgroundDispatcher).launch {
try {
sessionDataStore.updateData {
sessionDataStore.updateData { sessionData ->
sessionData.copy(backgroundTime = timeProvider.currentTime())
}
} catch (ex: Exception) {
Expand All @@ -127,7 +126,7 @@ constructor(
return
}
val sessionData = localSessionData
Log.d(TAG, "App foregrounded on ${processDataManager.myProcessName} - $sessionData")
Log.d(TAG, "App foregrounded on ${processDataManager.myProcessName}")

// Check if maybe the session data needs to be updated
if (isSessionExpired(sessionData) || isMyProcessStale(sessionData)) {
Expand Down
1 change: 0 additions & 1 deletion ...e-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/FirstFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ class FirstFragment : Fragment() {
val intent = Intent(requireContext(), SecondActivity::class.java)
intent.addFlags(FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_LAUNCH_ADJACENT)
startActivity(intent)
activity?.finish()
}
binding.startSplitscreenSame.setOnClickListener {
val intent = Intent(requireContext(), MainActivity::class.java)
Expand Down