Skip to content

[SES-4822] - Fix a deadlock in group poller #1663

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 1 commit into from
Nov 5, 2025
Merged

[SES-4822] - Fix a deadlock in group poller #1663

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
10 changes: 9 additions & 1 deletion app/src/main/java/org/thoughtcrime/securesms/groups/GroupPoller.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,9 @@ class GroupPoller @AssistedInject constructor(
).also { emit(it) }

// Notify all pending tokens
pendingTokens.forEach { it.resultCallback.send(pollResult) }
pendingTokens.forEach {
it.resultCallback.trySend(pollResult)
}
pendingTokens.clear()
}
}.stateIn(scope, SharingStarted.Eagerly, State())
Expand All @@ -135,10 +137,12 @@ class GroupPoller @AssistedInject constructor(
appVisibilityManager.isAppVisible.first { visible -> visible }

// As soon as the app becomes visible, start polling
Log.d(TAG, "Requesting routine poll for group($groupId)")
if (requestPollOnce().hasNonRetryableError()) {
Log.v(TAG, "Error polling group $groupId and stopped polling")
break
}
Log.d(TAG, "Routine poll done once for group($groupId)")

// As long as the app is visible, keep polling
while (true) {
Expand All @@ -152,10 +156,14 @@ class GroupPoller @AssistedInject constructor(
break
}

Log.d(TAG, "Requesting routine poll for group($groupId)")

if (requestPollOnce().hasNonRetryableError()) {
Log.v(TAG, "Error polling group $groupId and stopped polling")
return@launch
}

Log.d(TAG, "Routine poll done once for group($groupId)")
}
}
}
Expand Down