Skip to content

SyncthingService: Don't wait for runner thread to exit #135

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
chenxiaolong merged 1 commit into from
May 16, 2026
+4 −3
Merged

SyncthingService: Don't wait for runner thread to exit #135

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions app/src/main/java/com/chiller3/basicsync/syncthing/SyncthingService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,14 +279,15 @@ class SyncthingService : Service(), SyncthingStatusReceiver, DeviceStateListener
override fun onDestroy() {
super.onDestroy()

// We intentionally don't wait for runnerThread to exit. Syncthing can sometimes take a few
// seconds to fully exit, which can trigger an ANR warning. This is not a problem because if
// a new service starts while Syncthing from this service is still shutting down, the global
// lock in stbridge will just block the startup.
synchronized(stateLock) {
shouldThreadRun = false
}
stateChanged()

// This should be quick.
runnerThread.join()

synchronized(stateLock) {
listeners.clear()
}
Expand Down