android issues

src/android.rs

@@ -2,12 +2,15 @@
 
 pub mod native {
 
-    use crate::error::{Error, Result};
+    use crate::{
+        error::{Error, Result},
+        ArgVerbosity,
+    };
     use crossbeam::channel::{unbounded, Receiver, Sender};
     use jni::{
         objects::{GlobalRef, JClass, JMethodID, JObject, JString, JValue},
         signature::{Primitive, ReturnType},
-        sys::{jboolean, jint},
+        sys::jint,
         JNIEnv, JavaVM,
     };
     use std::{
@@ -154,11 +157,11 @@ pub mod native {
         vpn_service: JObject,
         config_path: JString,
         stat_path: JString,
-        verbose: jboolean,
+        verbosity: jint,
     ) -> jint {
         let mut env = env;
 
-        let log_level = if verbose != 0 { "trace" } else { "info" };
+        let log_level = ArgVerbosity::try_from(verbosity).unwrap().to_string();
         let root = module_path!().split("::").next().unwrap();
         let filter_str = &format!("off,{root}={log_level}");
         let filter = android_logger::FilterBuilder::new().parse(filter_str).build();

src/cmdopt.rs

@@ -18,6 +18,22 @@ pub enum ArgVerbosity {
     Trace,
 }
 
+#[cfg(target_os = "android")]
+impl TryFrom<jni::sys::jint> for ArgVerbosity {
+    type Error = std::io::Error;
+    fn try_from(value: jni::sys::jint) -> Result<Self, <Self as TryFrom<jni::sys::jint>>::Error> {
+        match value {
+            0 => Ok(ArgVerbosity::Off),
+            1 => Ok(ArgVerbosity::Error),
+            2 => Ok(ArgVerbosity::Warn),
+            3 => Ok(ArgVerbosity::Info),
+            4 => Ok(ArgVerbosity::Debug),
+            5 => Ok(ArgVerbosity::Trace),
+            _ => Err(std::io::Error::new(std::io::ErrorKind::InvalidInput, "Invalid verbosity level")),
+        }
+    }
+}
+
 impl From<ArgVerbosity> for log::LevelFilter {
     fn from(verbosity: ArgVerbosity) -> Self {
         match verbosity {
@@ -43,6 +59,19 @@ impl From<log::Level> for ArgVerbosity {
     }
 }
 
+impl std::fmt::Display for ArgVerbosity {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ArgVerbosity::Off => write!(f, "off"),
+            ArgVerbosity::Error => write!(f, "error"),
+            ArgVerbosity::Warn => write!(f, "warn"),
+            ArgVerbosity::Info => write!(f, "info"),
+            ArgVerbosity::Debug => write!(f, "debug"),
+            ArgVerbosity::Trace => write!(f, "trace"),
+        }
+    }
+}
+
 /// Proxy tunnel over tls
 #[derive(clap::Parser, Debug, Clone, PartialEq, Eq)]
 #[command(author, version, about = "Proxy tunnel over tls.", long_about = None)]