Skip to content

Commit a98cbf8

Browse files
SES-4512 - Fix official communities not loaded (#1506)
1 parent 4f88228 commit a98cbf8

File tree

1 file changed

+24
-6
lines changed
  • app/src/main/java/org/session/libsession/messaging/open_groups

1 file changed

+24
-6
lines changed

app/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupApi.kt

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,12 @@ object OpenGroupApi {
293293
}
294294
}
295295

296-
private fun getResponseBodyJson(request: Request, signRequest: Boolean = true): Promise<Map<*, *>, Exception> {
297-
return send(request, signRequest = signRequest).map {
296+
private fun getResponseBodyJson(
297+
request: Request,
298+
signRequest: Boolean = true,
299+
serverPubKeyHex: String? = null
300+
): Promise<Map<*, *>, Exception> {
301+
return send(request, signRequest = signRequest, serverPubKeyHex = serverPubKeyHex).map {
298302
JsonUtil.fromJson(it.body, Map::class.java)
299303
}
300304
}
@@ -307,7 +311,10 @@ object OpenGroupApi {
307311
return caps
308312
}
309313

310-
val fetched = getCapabilities(server).await()
314+
val fetched = getCapabilities(server,
315+
serverPubKeyHex = defaultServerPublicKey.takeIf { server == defaultServer }
316+
).await()
317+
311318
storage.setServerCapabilities(server, fetched.capabilities)
312319
return fetched.capabilities
313320
}
@@ -427,14 +434,15 @@ object OpenGroupApi {
427434
roomID: String,
428435
imageId: String,
429436
signRequest: Boolean = true,
437+
serverPubKeyHex: String? = null,
430438
): Promise<ByteArraySlice, Exception> {
431439
val request = Request(
432440
verb = GET,
433441
room = roomID,
434442
server = server,
435443
endpoint = Endpoint.RoomFileIndividual(roomID, imageId)
436444
)
437-
return getResponseBody(request, signRequest = signRequest)
445+
return getResponseBody(request, signRequest = signRequest, serverPubKeyHex = serverPubKeyHex)
438446
}
439447

440448
// region Upload/Download
@@ -713,7 +721,13 @@ object OpenGroupApi {
713721
}
714722
}
715723
val images = groups.associate { group ->
716-
group.token to group.imageId?.let { downloadOpenGroupProfilePicture(defaultServer, group.token, it, signRequest = false) }
724+
group.token to group.imageId?.let { downloadOpenGroupProfilePicture(
725+
server = defaultServer,
726+
roomID = group.token,
727+
imageId = it,
728+
signRequest = false,
729+
serverPubKeyHex = defaultServerPublicKey,
730+
) }
717731
}
718732
groups.map { group ->
719733
val image = try {
@@ -734,7 +748,11 @@ object OpenGroupApi {
734748
server = defaultServer,
735749
endpoint = Endpoint.Rooms
736750
)
737-
return getResponseBody(request, signRequest = false).map { response ->
751+
return getResponseBody(
752+
request = request,
753+
signRequest = false,
754+
serverPubKeyHex = defaultServerPublicKey
755+
).map { response ->
738756
MessagingModuleConfiguration.shared.json
739757
.decodeFromStream<Array<RoomInfoDetails>>(response.inputStream())
740758
.toList()

0 commit comments

Comments
 (0)