Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Add JnaInitializer logic (#1404)
Leendert de Borst6164687994ce
diff --git a/apps/mobile-app/android/app/build.gradle b/apps/mobile-app/android/app/build.gradleindex 096c926ea..cb6cc12a4 100644--- a/apps/mobile-app/android/app/build.gradle+++ b/apps/mobile-app/android/app/build.gradle@@ -205,8 +205,14 @@ dependencies {// Add ZXing library for QR code scanning (F-Droid compatible)implementation("com.journeyapps:zxing-android-embedded:4.3.0")- // Add JNA library for UniFFI native bindings- implementation("net.java.dev.jna:jna:5.14.0@aar")+ // Add JNA library for UniFFI native bindings (Android-specific AAR with native libs)+ // Version 5.17.0+ required for Android 15 16KB page size support+ // See: https://github.com/java-native-access/jna/issues/1647+ implementation("net.java.dev.jna:jna:5.17.0") {+ artifact {+ type = "aar"+ }+ }// Test dependenciestestImplementation 'junit:junit:4.13.2'diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/autofill/utils/RustCredentialMatcher.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/autofill/utils/RustCredentialMatcher.ktindex db225f92e..96dc236c0 100644--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/autofill/utils/RustCredentialMatcher.kt+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/autofill/utils/RustCredentialMatcher.kt@@ -1,6 +1,7 @@package net.aliasvault.app.autofill.utilsimport android.util.Log+import net.aliasvault.app.rustcore.JnaInitializerimport net.aliasvault.app.vaultstore.models.Credentialimport org.json.JSONArrayimport org.json.JSONObject@@ -11,6 +12,11 @@ import org.json.JSONObjectobject RustCredentialMatcher {private const val TAG = "RustCredentialMatcher"+ init {+ // Ensure JNA is initialized before any UniFFI calls+ JnaInitializer.ensureInitialized()+ }+/*** Filter credentials based on app/website info using the Rust core credential matcher.*diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/rustcore/JnaInitializer.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/rustcore/JnaInitializer.ktnew file mode 100644index 000000000..602ff4545--- /dev/null+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/rustcore/JnaInitializer.kt@@ -0,0 +1,36 @@+package net.aliasvault.app.rustcore++/**+ * Initializes JNA for Android before any UniFFI code runs.+ *+ * On Android, JNA needs to be configured to use Android's native library loading+ * instead of trying to unpack libraries from JAR resources (which doesn't work on Android).+ *+ * This object should be referenced before any UniFFI calls to ensure proper initialization.+ */+object JnaInitializer {+ @Volatile+ private var initialized = false++ init {+ ensureInitialized()+ }++ /**+ * Ensures JNA is properly initialized for Android.+ * This is idempotent and safe to call multiple times.+ */+ @Synchronized+ fun ensureInitialized() {+ if (initialized) return++ // Configure JNA to use Android's native library loading instead of unpacking from JAR+ System.setProperty("jna.nounpack", "true")+ System.setProperty("jna.noclasspath", "true")++ // Load the JNA dispatch library before any JNA code runs+ System.loadLibrary("jnidispatch")++ initialized = true+ }+}diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/rustcore/VaultMergeService.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/rustcore/VaultMergeService.ktindex b137608f9..2477ff150 100644--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/rustcore/VaultMergeService.kt+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/rustcore/VaultMergeService.kt@@ -16,6 +16,8 @@ object VaultMergeService {private const val TAG = "VaultMergeService"init {+ // Ensure JNA is initialized before loading the Rust library+ JnaInitializer.ensureInitialized()System.loadLibrary("aliasvault_core")Log.d(TAG, "Rust core library loaded")}