Skip to content

Start KeyCachingService when the lock screen is shown, not when created #2249

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
mpretty-cyro merged 2 commits into from
Nov 5, 2026
Merged

Start KeyCachingService when the lock screen is shown, not when created #2249

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a63e7fd
Start KeyCachingService when the lock screen is shown, not when created
mpretty-cyro Oct 28, 2026
861b5bf
Correct the screen-lock service comment
mpretty-cyro Oct 29, 2026
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
10 changes: 8 additions & 2 deletions app/src/main/java/org/thoughtcrime/securesms/ScreenLockActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,8 @@ class ScreenLockActivity : BaseActionBarActivity() {
}
})

// Start and bind to the KeyCachingService instance.
// Bind now; the service is started from onResume.
val bindIntent = Intent(this, KeyCachingService::class.java)
startService(bindIntent)
bindService(bindIntent, object : ServiceConnection {
override fun onServiceConnected(name: ComponentName?, service: IBinder) {
keyCachingService = (service as KeySetBinder).service
Expand Down Expand Up @@ -196,6 +195,13 @@ class ScreenLockActivity : BaseActionBarActivity() {

override fun onResume() {
super.onResume()

// KeyCachingService must be started, not only bound, or it is destroyed (clearing the key)
// once nothing is bound. Android refuses startService while the app is in the background,
// and this activity can be created there, so start it once we're visible.
// handleAuthenticated only needs the bound service, so it may run before this.
startService(Intent(this, KeyCachingService::class.java))

setLockTypeVisibility()
if (isScreenLockEnabled(this) && !authenticated && !failure) { resumeScreenLock() }
failure = false
Expand Down
Loading