Android script fix & Askar impl on Kotlin mobile demo (#1270)

* Updated unffi README.md new sh command with the new folder structure Signed-off-by: alberto-instnt <113043904+alberto-instnt@users.noreply.github.com> * adjusted android script and added askar implementation on kotlin mobile demo Signed-off-by: Alberto Leon <alberto@instnt.org> * added AskarWalletConfig on mobile demo Signed-off-by: Alberto Leon <alberto@instnt.org> --------- Signed-off-by: alberto-instnt <113043904+alberto-instnt@users.noreply.github.com> Signed-off-by: Alberto Leon <alberto@instnt.org>
hyperledger · Jul 22, 2024 · f9c07c9 · f9c07c9
1 parent 08bea95
commit f9c07c9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/aries/agents/mobile_demo/app/build.gradle b/aries/agents/mobile_demo/app/build.gradle
@@ -37,7 +37,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.3.2'
+        kotlinCompilerExtensionVersion '1.5.14'
     }
     packagingOptions {
         resources {

diff --git a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/AppDemoController.kt b/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/AppDemoController.kt
@@ -48,16 +48,11 @@ class AppDemoController : ViewModel() {
         return profile!!
     }
 
-    private val walletConfig = WalletConfig(
-        walletName = "test_create_wallet_add_uuid_here",
-        walletKey = "8dvfYSt5d1taSd6yJdpjq4emkwsPDDLYxkNFysFD2cZY",
-        walletKeyDerivation = "RAW",
-        walletType = null,
-        storageConfig = null,
-        storageCredentials = null,
-        rekey = null,
-        rekeyDerivationMethod = null
-    )
+    private val walletConfig = AskarWalletConfig(
+        dbUrl = "sqlite://:memory:",
+        keyMethod = KeyMethod.DeriveKey(AskarKdfMethod.Argon2i(ArgonLevel.INTERACTIVE)),
+        passKey = "test",
+        profile = "profile")
 
     suspend fun setupProfile(genesisFilePath: String) {
         withContext(Dispatchers.IO) {
@@ -102,8 +97,10 @@ class AppDemoController : ViewModel() {
             delay(500)
             val relayResponse = httpClient.newCall(pollRelayRequest).await()
             if (relayResponse.code == 200) {
+                Log.d("RELAY RESPONSE", "RELAY RESPONDED WITH 200")
                 val message = relayResponse.body!!.string()
                 Log.d("MESSAGE", "awaitConnectionCompletion: $message")
+                Log.d("PROFILE", "profile: ${profile.toString()}")
                 val unpackedMessage = unpackMessage(
                     profile!!,
                     message

diff --git a/aries/wrappers/uniffi-aries-vcx/scripts/android.build.cargo.ndk.sh b/aries/wrappers/uniffi-aries-vcx/scripts/android.build.cargo.ndk.sh
@@ -66,7 +66,7 @@ setup_linked_dependencies() {
 
 build_uniffi_for_demo() {
     export UNIFFI_ROOT="${ARIES_VCX_ROOT}/aries/wrappers/uniffi-aries-vcx"
-    export ANDROID_DEMO_DIR="${ARIES_VCX_ROOT}/aries/agents/rust/mobile_demo"
+    export ANDROID_DEMO_DIR="${ARIES_VCX_ROOT}/aries/agents/mobile_demo"
     export ABI_PATH=${ANDROID_DEMO_DIR}/app/src/main/jniLibs/${ABI}
     mkdir -p ${ABI_PATH}