From 58843413b50965993bddc3f6bf478db6941ca422 Mon Sep 17 00:00:00 2001
From: Cooper Quintin <cooperq@eff.org>
Date: Thu, 29 May 2025 15:00:23 -0700
Subject: [PATCH] update adb version which fixes adb key missing error. Fixes
 #330

---
 .gitignore                     | 1 +
 Cargo.lock                     | 2 +-
 doc/installing-from-release.md | 4 ++--
 installer/Cargo.toml           | 8 ++++----
 installer/src/orbic.rs         | 8 --------
 5 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 11e2b4a..1cd3acf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /target
 /book
+.DS_Store
diff --git a/Cargo.lock b/Cargo.lock
index 8f14ca7..18cf325 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,7 +5,7 @@ version = 4
 [[package]]
 name = "adb_client"
 version = "2.1.11"
-source = "git+https://github.com/gaykitty/adb_client.git?rev=1fb0f4f5cbcc95bbbb98db4ee2f1e53a1005aa81#1fb0f4f5cbcc95bbbb98db4ee2f1e53a1005aa81"
+source = "git+https://github.com/cooperq/adb_client.git?rev=88b3a3a24fe91d16101e44cebd84bd0ecc74ecdf#88b3a3a24fe91d16101e44cebd84bd0ecc74ecdf"
 dependencies = [
  "async-io",
  "base64",
diff --git a/doc/installing-from-release.md b/doc/installing-from-release.md
index 31d4e52..6f8d588 100644
--- a/doc/installing-from-release.md
+++ b/doc/installing-from-release.md
@@ -20,8 +20,8 @@ Make sure you've got one of Rayhunter's [supported devices](./supported-devices.
     First, enter the correct subfolder for your operating system:
     - for Ubuntu on x64 arhitecture: `cd installer-ubuntu-24`
     - for Ubuntu on ARM64 arhitecture: `cd installer-ubuntu-24-aarch64`
-    - for MacOS on Intel architecture: `cd installer-macos-intel`
-    - for MacOS on ARM achitecture: `cd installer-macos-arm`
+    - for MacOS on Intel (old macbooks) architecture: `cd installer-macos-intel`
+    - for MacOS on ARM (M1/M2 etc.) achitecture: `cd installer-macos-arm`
     - for Windows: `cd installer-windows-x86_64`
 
     ```bash
diff --git a/installer/Cargo.toml b/installer/Cargo.toml
index bd27784..ea7ce27 100644
--- a/installer/Cargo.toml
+++ b/installer/Cargo.toml
@@ -21,13 +21,13 @@ tokio-retry2 = "0.5.7"
 tokio-stream = "0.1.17"
 
 [target.'cfg(target_os = "linux")'.dependencies.adb_client]
-git = "https://github.com/gaykitty/adb_client.git"
-rev = "1fb0f4f5cbcc95bbbb98db4ee2f1e53a1005aa81"
+git = "https://github.com/cooperq/adb_client.git"
+rev = "88b3a3a24fe91d16101e44cebd84bd0ecc74ecdf"
 default-features = false
 features = ["trans-nusb"]
 
 [target.'cfg(any(target_os = "windows", target_os = "macos"))'.dependencies.adb_client]
-git = "https://github.com/gaykitty/adb_client.git"
-rev = "1fb0f4f5cbcc95bbbb98db4ee2f1e53a1005aa81"
+git = "https://github.com/cooperq/adb_client.git"
+rev = "88b3a3a24fe91d16101e44cebd84bd0ecc74ecdf"
 default-features = false
 features = ["trans-libusb"]
diff --git a/installer/src/orbic.rs b/installer/src/orbic.rs
index 291037d..7f8dff5 100644
--- a/installer/src/orbic.rs
+++ b/installer/src/orbic.rs
@@ -434,14 +434,6 @@ pub fn open_orbic() -> Result<Option<Interface>> {
         return Ok(Some(interface));
     }
 
-    // Another device with rndis enabled as well
-    if let Some(device) = open_usb_device(VENDOR_ID, 0xf626)? {
-        let interface = device
-            .detach_and_claim_interface(1) // will reattach drivers on release
-            .context("detach_and_claim_interface(1) failed")?;
-        return Ok(Some(interface));
-    }
-
     Ok(None)
 }