@@ -293,8 +293,12 @@ object OpenGroupApi {
293
293
}
294
294
}
295
295
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 {
298
302
JsonUtil .fromJson(it.body, Map ::class .java)
299
303
}
300
304
}
@@ -307,7 +311,10 @@ object OpenGroupApi {
307
311
return caps
308
312
}
309
313
310
- val fetched = getCapabilities(server).await()
314
+ val fetched = getCapabilities(server,
315
+ serverPubKeyHex = defaultServerPublicKey.takeIf { server == defaultServer }
316
+ ).await()
317
+
311
318
storage.setServerCapabilities(server, fetched.capabilities)
312
319
return fetched.capabilities
313
320
}
@@ -427,14 +434,15 @@ object OpenGroupApi {
427
434
roomID : String ,
428
435
imageId : String ,
429
436
signRequest : Boolean = true,
437
+ serverPubKeyHex : String? = null,
430
438
): Promise <ByteArraySlice , Exception > {
431
439
val request = Request (
432
440
verb = GET ,
433
441
room = roomID,
434
442
server = server,
435
443
endpoint = Endpoint .RoomFileIndividual (roomID, imageId)
436
444
)
437
- return getResponseBody(request, signRequest = signRequest)
445
+ return getResponseBody(request, signRequest = signRequest, serverPubKeyHex = serverPubKeyHex )
438
446
}
439
447
440
448
// region Upload/Download
@@ -713,7 +721,13 @@ object OpenGroupApi {
713
721
}
714
722
}
715
723
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
+ ) }
717
731
}
718
732
groups.map { group ->
719
733
val image = try {
@@ -734,7 +748,11 @@ object OpenGroupApi {
734
748
server = defaultServer,
735
749
endpoint = Endpoint .Rooms
736
750
)
737
- return getResponseBody(request, signRequest = false ).map { response ->
751
+ return getResponseBody(
752
+ request = request,
753
+ signRequest = false ,
754
+ serverPubKeyHex = defaultServerPublicKey
755
+ ).map { response ->
738
756
MessagingModuleConfiguration .shared.json
739
757
.decodeFromStream<Array <RoomInfoDetails >>(response.inputStream())
740
758
.toList()
0 commit comments