Skip to content

Bring 1.29.0 to dev #1664

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
Nov 6, 2025
Merged

Bring 1.29.0 to dev #1664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa2c8e8
Tweak group polling concurrency (#1661)
SessionHero01 Nov 4, 2025
e18695b
Fix a deadlock in group poller (#1663)
SessionHero01 Nov 5, 2025
f23df6d
Merge remote-tracking branch 'origin/dev' into merge-1.29.0
SessionHero01 Nov 5, 2025
b5c2136
Merge branch 'dev' into merge-1.29.0
SessionHero01 Nov 5, 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
4 changes: 2 additions & 2 deletions app/src/main/java/org/session/libsignal/utilities/HTTP.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ object HTTP {
private val httpCallSemaphore = Semaphore(20)

private suspend fun Call.await(): Response {
return withContext(Dispatchers.IO) {
httpCallSemaphore.withPermit {
return httpCallSemaphore.withPermit {
withContext(Dispatchers.IO) {
execute()
}
}
Expand Down
15 changes: 13 additions & 2 deletions 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 Expand Up @@ -226,6 +234,8 @@ class GroupPoller @AssistedInject constructor(
throw NonRetryableException("Group has been kicked")
}

Log.v(TAG, "Start polling group($groupId) message snode = ${snode.ip}")

val adminKey = group.adminKey

val pollingTasks = mutableListOf<Pair<String, Deferred<*>>>()
Expand Down Expand Up @@ -270,7 +280,6 @@ class GroupPoller @AssistedInject constructor(
Namespace.GROUP_MESSAGES()
).orEmpty()

Log.v(TAG, "Retrieving group($groupId) message since lastHash = $lastHash, snode = ${snode.publicKeySet}")

SnodeAPI.sendBatchRequest(
snode = snode,
Expand Down Expand Up @@ -356,6 +365,8 @@ class GroupPoller @AssistedInject constructor(
}
}

Log.d(TAG, "Group($groupId) polling completed, success = ${result.isSuccess}")

if (result.isFailure) {
val error = result.exceptionOrNull()
Log.e(TAG, "Error polling group", error)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/thoughtcrime/securesms/groups/GroupPollerManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class GroupPollerManager @Inject constructor(
pollFactory: GroupPoller.Factory,
@param:ManagerScope private val managerScope: CoroutineScope,
) : OnAppStartupComponent {
private val groupPollerSemaphore = Semaphore(5)
private val groupPollerSemaphore = Semaphore(20)

@Suppress("OPT_IN_USAGE")
private val groupPollers: StateFlow<Map<AccountId, GroupPollerHandle>> =
Expand Down