Tauri: unify serial implementation

Author: haslinghuis

src-tauri/Cargo.lock

@@ -18,15 +18,12 @@ tauri-build = { version = "2.5", features = [] }
 [dependencies]
 tauri = { version = "2.9", features = [] }
 tauri-plugin-shell = "2.3"
-# Allow newer serial plugin releases (2.21+) which may include Android fixes
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-
-[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
-tauri-plugin-serialplugin = "2.21"
-
-[target.'cfg(target_os = "android")'.dependencies]
-serialport = "4.8"
+# Pin exact version to avoid pulling 2.21.x which is incompatible with current Android/Kotlin setup
+# Try an older plugin version that matches tauri-android 2.9 API surface (avoid onDetach override)
+# Further downgrade to avoid onDetach override incompatibility
+tauri-plugin-serialplugin = "=2.15.0"
 
 [features]
 default = ["custom-protocol"]

src-tauri/Cargo.toml

@@ -4,25 +4,9 @@
 )]
 
 fn main() {
-    let mut builder = tauri::Builder::default()
-        .plugin(tauri_plugin_shell::init());
-
-    #[cfg(target_os = "android")]
-    {
-        // Local Android serial plugin that mirrors the commands used by the frontend
-        builder = builder.plugin(crate::serial_android::init_android());
-    }
-
-    #[cfg(not(target_os = "android"))]
-    {
-        // Desktop: use official plugin for now
-        builder = builder.plugin(tauri_plugin_serialplugin::init());
-    }
-
-    builder
+    tauri::Builder::default()
+        .plugin(tauri_plugin_shell::init())
+        .plugin(tauri_plugin_serialplugin::init())
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
 }
-
-#[cfg(target_os = "android")]
-mod serial_android;

src-tauri/src/main.rs

@@ -2243,7 +2243,7 @@
   resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.9.1.tgz#d7c8512dd70f9aa8203f2011322542ec11f76b66"
   integrity sha512-/JHlOzpUDhjBOO9w167bcYxfJbcMQv7ykS/Y07xjtcga8np0rzUzVGWYmLMH7orKcDMC7wjhheEW1x8cbGma/Q==
 
-"@tauri-apps/cli@^2.9.1":
+"@tauri-apps/cli@^2.11.0":
   version "2.9.1"
   resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-2.9.1.tgz#cdc1cc6a005fef017b2a8f1a96d32537afc74579"
   integrity sha512-kKi2/WWsNXKoMdatBl4xrT7e1Ce27JvsetBVfWuIb6D3ep/Y0WO5SIr70yarXOSWam8NyDur4ipzjZkg6m7VDg==