Changed gradle and kotlin versions and made LibsodiumInitializer.initializeWithCallback a bit prettier
This commit is contained in:
1 parent
59f2d77890
commit
504e8db46b
5 files changed
+7
-13
No files matched your search
+4
-8
@@ -2,12 +2,7 @@ package ext.libsodium.com.ionspin.kotlin.crypto
|
||||
|
||||
import com.ionspin.kotlin.crypto.getSodiumLoaded
|
||||
import com.ionspin.kotlin.crypto.sodiumLoaded
|
||||
import ext.libsodium._libsodiumPromise
|
||||
import ext.libsodium.crypto_generichash
|
||||
import ext.libsodium.crypto_hash_sha256
|
||||
import ext.libsodium.crypto_hash_sha256_init
|
||||
import ext.libsodium.crypto_hash_sha512
|
||||
import ext.libsodium.sodium_init
|
||||
import ext.libsodium.*
|
||||
import kotlin.coroutines.suspendCoroutine
|
||||
|
||||
/**
|
||||
@@ -50,12 +45,13 @@ object JsSodiumLoader {
|
||||
}
|
||||
}
|
||||
|
||||
fun loadWithCallback(doneCallback: () -> (JsAny)) {
|
||||
fun loadWithCallback(doneCallback: () -> (Unit)) {
|
||||
if (!getSodiumLoaded()) {
|
||||
_libsodiumPromise.then<JsAny> {
|
||||
_libsodiumPromise.then<JsAny?> {
|
||||
sodium_init()
|
||||
sodiumLoaded = true
|
||||
doneCallback.invoke()
|
||||
null
|
||||
}
|
||||
} else {
|
||||
doneCallback.invoke()
|
||||
|
||||
-2
@@ -26,8 +26,6 @@ actual object LibsodiumInitializer {
|
||||
JsSodiumLoader.loadWithCallback {
|
||||
isPlatformInitialized = true
|
||||
done()
|
||||
// TODO: there's no return needed!!!
|
||||
"null".toJsString()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user