make JavaVM Atomic

shiroedev2024 · Apr 23, 2024 · 1c02b40 · 1c02b40
1 parent 71d1bb7
commit 1c02b40
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 53 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/doh/src/mobile/callback.rs b/doh/src/mobile/callback.rs
@@ -41,20 +41,21 @@
 #[cfg(target_os = "android")]
 pub mod android {
     use std::os::unix::io::RawFd;
+    use std::sync::{Arc, Mutex};
 
     use anyhow::{anyhow, Result};
     use jni::{objects::*, JavaVM};
     use std::sync::RwLock;
 
-    static JVM: RwLock<Option<JavaVM>> = RwLock::new(None);
+    static JVM: RwLock<Option<Arc<JavaVM>>> = RwLock::new(None);
     static CALLBACK_PROTECT_SOCKET: RwLock<Option<CallbackProtectSocket>> = RwLock::new(None);
 
     struct CallbackProtectSocket {
         class: GlobalRef,
         name: String,
     }
 
-    pub fn set_jvm(vm: JavaVM) {
+    pub fn set_jvm(vm: Arc<JavaVM>) {
         *JVM.write().unwrap() = Some(vm);
     }