Version 0.2.3

Author: wuwbobo2021

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changes
 
+## 0.2.3
+* Bump `jni-min-helper` to 0.3. Threatened by the UB found in <https://github.com/wuwbobo2021/android-bluetooth-serial-rs/issues/2>.
+* `check_attached_intent()` no longer returns the device if the permission is lost.
+* Added default `serialport` feature which can be turned off (this choice will be removed in 0.3.0, see <https://github.com/kevinmehall/nusb/pull/150>).
+
 ## 0.2.2
 * Fixed support for newest Android versions: `check_attached_intent()` does not work, `PermissionRequest` never returns the result of being permitted, both are caused by the bad implementation of `PartialEq` for `DeviceInfo`.
 * Added `UsbSerial` trait to prepare for driver implementations of non-CDC serial adapters.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "android-usbser"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["wuwbobo2021 <wuwbobo@outlook.com>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"
@@ -12,11 +12,8 @@ Android host driver for USB serial adapters, currently works with CDC-ACM device
 keywords = ["usb", "serial", "serialport", "uart", "android"]
 categories = ["api-bindings", "hardware-support"]
 
-[package.metadata.android.sdk]
-min_sdk_version = 16
-target_sdk_version = 30
-
 [package.metadata.docs.rs]
+features = ["serialport"]
 default-target = "aarch64-linux-android"
 targets = [
     "aarch64-linux-android",
@@ -25,14 +22,18 @@ targets = [
     "x86_64-linux-android",
 ]
 
+[features]
+default = ["serialport"]
+serialport = ["dep:serialport"]
+
 [dependencies]
 log = "0.4"
 getset = "0.1"
 nusb = "0.1.12"
-serialport = "4.6"
 futures-core = "0.3"
 futures-lite = "2.5"
-jni-min-helper = { version = "0.2.6", features = ["futures"] }
+jni-min-helper = { version = "0.3", features = ["futures"] }
+serialport = { version = "4.7", optional = true }
 
 [lib]
 name = "android_usbser"

lib.rs

@@ -11,16 +11,20 @@
 //! The initial version of this crate performs USB transfers through JNI calls but not `nusb`,
 //! do not use it except you have encountered compatibility problems.
 
-mod ser_cdc;
 mod usb_conn;
 mod usb_info;
 mod usb_sync;
+
+#[cfg(feature = "serialport")]
+mod ser_cdc;
+#[cfg(feature = "serialport")]
 pub use ser_cdc::*;
 
 /// Equals `std::io::Error`.
 pub type Error = std::io::Error;
 
-/// Android helper for `nusb`. It may be merged into that crate in the future.
+/// Android helper for `nusb`. It may be removed in version 0.3.0 (this is blocked by
+/// <https://github.com/kevinmehall/nusb/pull/150>).
 ///
 /// Reference:
 /// - <https://developer.android.com/develop/connectivity/usb/host>
@@ -40,26 +44,27 @@ pub mod usb {
         use jni_min_helper::*;
         if let JavaException = err {
             let err = jni_clear_ex(err);
-            jni_last_cleared_ex()
-                .ok_or(JavaException)
-                .and_then(|ex| Ok((ex, jni_attach_vm()?)))
-                .and_then(|(ex, ref mut env)| {
-                    Ok((ex.get_class_name(env)?, ex.get_throwable_msg(env)?))
-                })
-                .map(|(cls, msg)| Error::other(format!("{cls}: {msg}")))
-                .unwrap_or(Error::other(err))
+            if let Some(ex) = jni_last_cleared_ex() {
+                jni_with_env(|env| Ok((ex.get_class_name(env)?, ex.get_throwable_msg(env)?)))
+                    .map(|(cls, msg)| Error::other(format!("{cls}: {msg}")))
+                    .unwrap_or(Error::other(err))
+            } else {
+                Error::other(err)
+            }
         } else {
             Error::other(err)
         }
     }
 }
 
+#[cfg(feature = "serialport")]
 use nusb::transfer::{Queue, RequestBuffer};
 
 /// Serial driver implementations inside this crate should implement this trait.
 ///
 /// TODO: add crate-level functions `probe() -> Result<Vec<DeviceInfo>, Error>`
 /// and `open(dev_info: &DeviceInfo, timeout: Duration) -> Result<Box<dyn UsbSerial>, Error>`.
+#[cfg(feature = "serialport")]
 pub trait UsbSerial: serialport::SerialPort {
     /// Sets baudrate, parity check mode, data bits and stop bits.
     fn configure(&mut self, conf: &SerialConfig) -> std::io::Result<()>;
@@ -72,9 +77,11 @@ pub trait UsbSerial: serialport::SerialPort {
     fn sealer(_: private::Internal);
 }
 
+#[cfg(feature = "serialport")]
 use serialport::{DataBits, Parity, StopBits};
 
 /// Serial parameters including baudrate, parity check mode, data bits and stop bits.
+#[cfg(feature = "serialport")]
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub struct SerialConfig {
     pub baud_rate: u32,
@@ -83,6 +90,7 @@ pub struct SerialConfig {
     pub stop_bits: StopBits,
 }
 
+#[cfg(feature = "serialport")]
 impl Default for SerialConfig {
     fn default() -> Self {
         Self {
@@ -94,6 +102,7 @@ impl Default for SerialConfig {
     }
 }
 
+#[cfg(feature = "serialport")]
 impl std::str::FromStr for SerialConfig {
     type Err = Error;
 
@@ -153,6 +162,7 @@ impl std::str::FromStr for SerialConfig {
     }
 }
 
+#[cfg(feature = "serialport")]
 impl std::fmt::Display for SerialConfig {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let baud_rate = self.baud_rate;
@@ -175,6 +185,7 @@ impl std::fmt::Display for SerialConfig {
     }
 }
 
+#[allow(unused)]
 mod private {
     /// Used as a parameter of the hidden function in sealed traits.
     #[derive(Debug)]

ser_cdc.rs

@@ -67,9 +67,9 @@ impl CdcSerial {
             let endps: Vec<_> = alt.endpoints().collect();
             let endp_r = endps.iter().find(|endp| endp.direction() == Direction::In);
             let endp_w = endps.iter().find(|endp| endp.direction() == Direction::Out);
-            if endp_r.is_some() && endp_w.is_some() {
-                addr_r = Some(endp_r.unwrap().address());
-                addr_w = Some(endp_w.unwrap().address());
+            if let (Some(endp_r), Some(endp_w)) = (endp_r, endp_w) {
+                addr_r = Some(endp_r.address());
+                addr_w = Some(endp_w.address());
                 break;
             }
         }