Mirror/rayhunter
1
0
Fork 0
mirror of https://github.com/EFForg/rayhunter.git synced 2026-07-30 18:58:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add special case for PermissionDenied on macOS

Browse Source 
On macOS this can mean the device is busy.
This commit is contained in:
Sashanoraa
2025-05-15 13:44:29 -04:00
committed by Cooper Quintin
parent ec5bd81a70
commit 6a16ad7f15
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
installer/src/orbic.rs
+11
View File
@@ -24,6 +24,13 @@ const ORBIC_BUSY: &str = r#"The Orbic is plugged in but is being used by another
Please close any program that might be using your USB devices.
If you have adb installed you may need to kill the adb daemon"#;
#[cfg(target_os = "macos")]
const ORBIC_BUSY_MAC: &str = r#"Permission denied.
On macOS this might be caused by another program using the Orbic.
Please close any program that might be using your Orbic.
If you have adb installed you may need to kill the adb daemon"#;
const VENDOR_ID: u16 = 0x05c6;
const PRODUCT_ID: u16 = 0xf601;
@@ -251,6 +258,10 @@ async fn wait_for_adb_shell() -> Result<ADBUSBDevice> {
Err(RustADBError::IOError(e)) if e.kind() == ErrorKind::ResourceBusy => {
bail!(ORBIC_BUSY);
}
#[cfg(target_os = "macos")]
Err(RustADBError::IOError(e)) if e.kind() == ErrorKind::PermissionDenied => {
bail!(ORBIC_BUSY_MAC);
}
Err(RustADBError::DeviceNotFound(_)) => {
wait_for_usb_device(VENDOR_ID, PRODUCT_ID).await?;
}