Skip to content

Your Android phone and your Windows PC, working as one. Local-first, end-to-end encrypted, no account.

Dependencies: sha2 0.11.1, tokio 1.53.3, jni-sys 0.4

Bee77f2d2650a41
diff --git a/Cargo.lock b/Cargo.lock
index 30878ed..671a8fc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1089,7 +1089,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
dependencies = [
"libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
]
[[package]]
@@ -2411,7 +2411,7 @@ dependencies = [
name = "nectarlink-ffi"
version = "0.1.4"
dependencies = [
- "jni-sys 0.3.1",
+ "jni-sys 0.4.1",
"nectarlink-core",
"paranoid-android",
"thiserror 2.0.21",
@@ -3330,7 +3330,7 @@ dependencies = [
"errno",
"libc",
"linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
]
[[package]]
@@ -3388,7 +3388,7 @@ dependencies = [
"security-framework",
"security-framework-sys",
"webpki-root-certs",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
]
[[package]]
@@ -3612,9 +3612,9 @@ checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d"
[[package]]
name = "sha2"
-version = "0.11.0"
+version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4"
+checksum = "47d7069beb7d6ac7b9acd1039986e73443f24234f41074da099d6f994ac9ad19"
dependencies = [
"cfg-if",
"cpufeatures 0.3.1",
@@ -3898,7 +3898,7 @@ dependencies = [
"getrandom 0.3.4",
"once_cell",
"rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
]
[[package]]
@@ -4018,9 +4018,9 @@ checksum = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee"
[[package]]
name = "tokio"
-version = "1.53.2"
+version = "1.53.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e95f91fcc7a621e8b030f6aa23c71fe9838ae2fb4d8118b75602a328f5144044"
+checksum = "ce3335fa71841cda333a58d7615b03901380ecf09d59b3296d21f8bbac0dde4e"
dependencies = [
"bytes",
"libc",
@@ -4696,7 +4696,7 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
]
[[package]]
diff --git a/core/nectarlink-ffi/Cargo.toml b/core/nectarlink-ffi/Cargo.toml
index eed7810..76eae0e 100644
--- a/core/nectarlink-ffi/Cargo.toml
+++ b/core/nectarlink-ffi/Cargo.toml
@@ -30,7 +30,7 @@ tracing-subscriber.workspace = true
uniffi.workspace = true
[target.'cfg(target_os = "android")'.dependencies]
-jni-sys = "0.3"
+jni-sys = "0.4"
paranoid-android = "0.2"
[lints]
diff --git a/core/nectarlink-ffi/src/lib.rs b/core/nectarlink-ffi/src/lib.rs
index 53b4b3d..453189e 100644
--- a/core/nectarlink-ffi/src/lib.rs
+++ b/core/nectarlink-ffi/src/lib.rs
@@ -4604,14 +4604,11 @@ pub extern "system" fn Java_app_nectarlink_android_core_AndroidContext_nativeIns
// and the JavaVM lives as long as the process.
unsafe {
let functions = &**env;
- let (Some(get_vm), Some(new_global)) = (functions.GetJavaVM, functions.NewGlobalRef) else {
- return;
- };
let mut vm: *mut jni_sys::JavaVM = std::ptr::null_mut();
- if get_vm(env, &mut vm) != jni_sys::JNI_OK || vm.is_null() {
+ if (functions.v1_1.GetJavaVM)(env, &mut vm) != jni_sys::JNI_OK || vm.is_null() {
return;
}
- let global = new_global(env, context);
+ let global = (functions.v1_1.NewGlobalRef)(env, context);
if global.is_null() {
return;
}