Skip to content

Clean up push registration retry logic #1826

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
SessionHero01 merged 8 commits into from
Jan 14, 2026
Merged

Clean up push registration retry logic #1826

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5d31408
Remove PushRegistryV1 as it is for legacy group only
SessionHero01 Jan 8, 2026
ff6b2c4
Merge remote-tracking branch 'origin/feature/onion-request-refactor' …
SessionHero01 Jan 8, 2026
48689ae
Merge remote-tracking branch 'origin/feature/onion-request-refactor' …
SessionHero01 Jan 13, 2026
20d7095
Merge remote-tracking branch 'origin/feature/onion-request-refactor' …
SessionHero01 Jan 13, 2026
a71c880
Merge remote-tracking branch 'origin/feature/onion-request-refactor' …
SessionHero01 Jan 13, 2026
7693c0f
Clean up push registration retry logic
SessionHero01 Jan 14, 2026
8acd05a
Comments
SessionHero01 Jan 14, 2026
a21140c
Asserting API contract
SessionHero01 Jan 14, 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
Prev Previous commit
Asserting API contract
  • Loading branch information
@SessionHero01
SessionHero01 committed Jan 14, 2026
commit a21140c6c61326a68579d2dce6d8aa0740009b83
14 changes: 8 additions & 6 deletions app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistryV2.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ class PushRegistryV2 @Inject constructor(
val server = Server.LATEST
val url = "${server.url}/$path"

val (intermediateResults, rawApiResponse) = serverClient.sendWithData(
val (r, rawApiResponse) = serverClient.sendWithData(
operationName = "PushRegistryV2.$path",
requestFactory = {
val requests = builder()
Expand All @@ -128,19 +128,25 @@ class PushRegistryV2 @Inject constructor(

val bodyString = Json.encodeToString(successfullyBuiltRequests)
val body = bodyString.toRequestBody("application/json".toMediaType())
results to Request.Builder().url(url).post(body).build()
results to successfullyBuiltRequests.size to Request.Builder().url(url).post(body).build()
},
serverBaseUrl = server.url,
x25519PublicKey = server.publicKey,
version = Version.V4
)

val (intermediateResults, numSuccessfullyBuiltRequests) = r

@Suppress("OPT_IN_USAGE") val apiResponses = withContext(Dispatchers.Default) {
requireNotNull(rawApiResponse.body) { "Response doesn't have a body" }
.inputStream()
.use { Json.decodeFromStream<List<Response>>(it) }
}

check(numSuccessfullyBuiltRequests == apiResponses.size) {
"Number of API responses (${apiResponses.size}) does not match number of successfully built requests ($numSuccessfullyBuiltRequests)"
}

val apiResponseIterator = apiResponses.iterator()

intermediateResults.forEachIndexed { idx, result ->

@ThomasSession ThomasSession Jan 14, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we get fewer results than expected from the server, isn't it possible to misalign the results?

@SessionHero01 SessionHero01 Jan 14, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the server MUST give us exactly the same number of result back, otherwise we have no way to know if a request is success or not. Think of it this way: we send an array of request to the server, you'd expect to get the same sized array back, it is an assumption that we have made prior to the network refactoring.

@SessionHero01 SessionHero01 Jan 14, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will add an explicit check for this server behavior and we will reject the whole call if the server is naughty

Expand All @@ -150,10 +156,6 @@ class PushRegistryV2 @Inject constructor(
}
}

check(!apiResponseIterator.hasNext()) {
"API returned more results than expected"
}

@Suppress("UNCHECKED_CAST")
return intermediateResults as List<Result<Response>>
}
Expand Down