Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 6 commits into from
Jul 22, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a8947fe
Updated unffi README.md
alberto-instnt Jul 8, 2024
b673e27
Merge pull request #1 from instnt-inc/alberto-uniffi-readme
alberto-instnt Jul 8, 2024
38d287d
Merge pull request #2 from hyperledger/main
alberto-instnt Jul 14, 2024
3dad2e0
Merge branch 'hyperledger:main' into main
alberto-instnt Jul 15, 2024
ae2607c
adjusted android script and added askar implementation on kotlin mobi…
alberto-instnt Jul 20, 2024
c5438cc
added AskarWalletConfig on mobile demo
alberto-instnt Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aries/agents/mobile_demo/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.3.2'
kotlinCompilerExtensionVersion '1.5.14'
}
packagingOptions {
resources {
Expand Down
17 changes: 7 additions & 10 deletions aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/AppDemoController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion aries/wrappers/uniffi-aries-vcx/scripts/android.build.cargo.ndk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
Loading