Skip to content

Make AQS resilient to background init in multi-process apps #6699

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 2 commits into from
Feb 13, 2025
Merged

Make AQS resilient to background init in multi-process apps #6699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4302623
Make AQS resilient to background init in multi-process apps
mrober Feb 12, 2025
59e6201
Changelog
mrober Feb 12, 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
1 change: 1 addition & 0 deletions firebase-sessions/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Unreleased

* [fixed] Make AQS resilient to background init in multi-process apps.

# 2.0.7
* [fixed] Removed extraneous logs that risk leaking internal identifiers.
Expand Down
26 changes: 18 additions & 8 deletions firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionLifecycleService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,16 @@ internal class SessionLifecycleService : Service() {

/** Generates a new session id and sends it everywhere it's needed */
private fun newSession() {
SessionGenerator.instance.generateNewSession()
Log.d(TAG, "Generated new session.")
broadcastSession()
SessionDatastore.instance.updateSessionId(SessionGenerator.instance.currentSession.sessionId)
try {
SessionGenerator.instance.generateNewSession()
Log.d(TAG, "Generated new session.")
broadcastSession()
SessionDatastore.instance.updateSessionId(
SessionGenerator.instance.currentSession.sessionId
)
} catch (ex: IllegalStateException) {
Log.w(TAG, "Failed to generate new session.", ex)
}
}

/**
Expand All @@ -149,10 +155,14 @@ internal class SessionLifecycleService : Service() {
if (hasForegrounded) {
sendSessionToClient(client, SessionGenerator.instance.currentSession.sessionId)
} else {
// Send the value from the datastore before the first foregrounding it exists
val storedSession = SessionDatastore.instance.getCurrentSessionId()
Log.d(TAG, "App has not yet foregrounded. Using previously stored session.")
storedSession?.let { sendSessionToClient(client, it) }
try {
// Send the value from the datastore before the first foregrounding it exists
val storedSession = SessionDatastore.instance.getCurrentSessionId()
Log.d(TAG, "App has not yet foregrounded. Using previously stored session.")
storedSession?.let { sendSessionToClient(client, it) }
} catch (ex: IllegalStateException) {
Log.w(TAG, "Failed to send session to client.", ex)
}
}
}

Expand Down
Loading