TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-25 02:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix SnodeAPI error thrown outside of Promise

Browse Source
This commit is contained in:
bemusementpark 2024-08-05 16:26:20 +09:30
parent 41f5fcc67e
commit 8a9faa182d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
View File

@ -15,6 +15,7 @@ import nl.komponents.kovenant.all
import nl.komponents.kovenant.functional.bind import nl.komponents.kovenant.functional.bind
import nl.komponents.kovenant.functional.map import nl.komponents.kovenant.functional.map
import nl.komponents.kovenant.task import nl.komponents.kovenant.task
import nl.komponents.kovenant.unwrap
import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.MessagingModuleConfiguration
import org.session.libsession.messaging.utilities.MessageWrapper import org.session.libsession.messaging.utilities.MessageWrapper
import org.session.libsession.messaging.utilities.SodiumUtilities.sodium import org.session.libsession.messaging.utilities.SodiumUtilities.sodium
@ -202,7 +203,7 @@ object SnodeAPI {
} }
// Public API // Public API
fun getAccountID(onsName: String): Promise<String, Exception> { fun getAccountID(onsName: String): Promise<String, Exception> = task {
val validationCount = 3 val validationCount = 3
val accountIDByteCount = 33 val accountIDByteCount = 33
// Hash the ONS name using BLAKE2b // Hash the ONS name using BLAKE2b
@ -228,7 +229,7 @@ object SnodeAPI {
} }
} }
} }
return all(promises).map { results -> all(promises).map { results ->
results.map { json -> results.map { json ->
val intermediate = json["result"] as? Map<*, *> ?: throw Error.Generic val intermediate = json["result"] as? Map<*, *> ?: throw Error.Generic
val hexEncodedCiphertext = intermediate["encrypted_value"] as? String ?: throw Error.Generic val hexEncodedCiphertext = intermediate["encrypted_value"] as? String ?: throw Error.Generic
@ -264,7 +265,7 @@ object SnodeAPI {
}.takeIf { it.size == validationCount && it.toSet().size == 1 }?.first() }.takeIf { it.size == validationCount && it.toSet().size == 1 }?.first()
?: throw Error.ValidationFailed ?: throw Error.ValidationFailed
} }
} }.unwrap()
fun getSwarm(publicKey: String): Promise<Set<Snode>, Exception> = fun getSwarm(publicKey: String): Promise<Set<Snode>, Exception> =
database.getSwarm(publicKey)?.takeIf { it.size >= minimumSwarmSnodeCount }?.let(Promise.Companion::of) database.getSwarm(publicKey)?.takeIf { it.size >= minimumSwarmSnodeCount }?.let(Promise.Companion::of)