From df55c04e85c5aa2be255f265cea067552c934c76 Mon Sep 17 00:00:00 2001
From: Sashanoraa <sasha@noraa.gay>
Date: Tue, 2 Sep 2025 15:40:45 -0400
Subject: [PATCH] Test: Disable adb auth

---
 Cargo.lock                 | 3 +--
 installer/Cargo.toml       | 4 ++--
 installer/src/orbic.rs     | 2 +-
 installer/src/pinephone.rs | 4 ++--
 installer/src/uz801.rs     | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2454807..0e2d26f 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/EFForg/adb_client.git?rev=e511662394e4fa32865c154c40f81a3d846f700c#e511662394e4fa32865c154c40f81a3d846f700c"
+source = "git+https://github.com/EFForg/adb_client.git?rev=208a302367727554d7530e937ca8aee20a74fa51#208a302367727554d7530e937ca8aee20a74fa51"
 dependencies = [
  "async-io",
  "base64",
@@ -22,7 +22,6 @@ dependencies = [
  "nusb",
  "rand 0.9.1",
  "regex",
- "rsa",
  "rusb",
  "rustls-pki-types",
  "serde",
diff --git a/installer/Cargo.toml b/installer/Cargo.toml
index 2190cd0..b6d3367 100644
--- a/installer/Cargo.toml
+++ b/installer/Cargo.toml
@@ -26,12 +26,12 @@ tokio-stream = "0.1.17"
 
 [target.'cfg(target_os = "linux")'.dependencies.adb_client]
 git = "https://github.com/EFForg/adb_client.git"
-rev = "e511662394e4fa32865c154c40f81a3d846f700c"
+rev = "208a302367727554d7530e937ca8aee20a74fa51"
 default-features = false
 features = ["trans-nusb"]
 
 [target.'cfg(any(target_os = "windows", target_os = "macos"))'.dependencies.adb_client]
 git = "https://github.com/EFForg/adb_client.git"
-rev = "e511662394e4fa32865c154c40f81a3d846f700c"
+rev = "208a302367727554d7530e937ca8aee20a74fa51"
 default-features = false
 features = ["trans-libusb"]
diff --git a/installer/src/orbic.rs b/installer/src/orbic.rs
index aa3d375..0e2c53b 100644
--- a/installer/src/orbic.rs
+++ b/installer/src/orbic.rs
@@ -246,7 +246,7 @@ async fn get_adb() -> Result<ADBUSBDevice> {
     const MAX_FAILURES: u32 = 10;
     let mut failures = 0;
     loop {
-        match ADBUSBDevice::new(VENDOR_ID, PRODUCT_ID) {
+        match ADBUSBDevice::new_no_auth(VENDOR_ID, PRODUCT_ID) {
             Ok(dev) => match adb_echo_test(dev).await {
                 Ok(dev) => return Ok(dev),
                 Err(e) => {
diff --git a/installer/src/pinephone.rs b/installer/src/pinephone.rs
index c988b36..5f2dc4d 100644
--- a/installer/src/pinephone.rs
+++ b/installer/src/pinephone.rs
@@ -22,7 +22,7 @@ pub async fn install() -> Result<()> {
     echo!("Unlocking modem ... ");
     start_adb().await?;
     sleep(Duration::from_secs(3)).await;
-    let mut adb = ADBUSBDevice::new(USB_VENDOR_ID, USB_PRODUCT_ID).unwrap();
+    let mut adb = ADBUSBDevice::new_no_auth(USB_VENDOR_ID, USB_PRODUCT_ID).unwrap();
     println!("ok");
 
     adb.run_command(&["mount", "-o", "remount,rw", "/"], "exit code 0")?;
@@ -57,7 +57,7 @@ pub async fn install() -> Result<()> {
     echo!("Unlocking modem ... ");
     start_adb().await?;
     sleep(Duration::from_secs(3)).await;
-    let mut adb = ADBUSBDevice::new(USB_VENDOR_ID, USB_PRODUCT_ID).unwrap();
+    let mut adb = ADBUSBDevice::new_no_auth(USB_VENDOR_ID, USB_PRODUCT_ID).unwrap();
     println!("ok");
 
     echo!("Testing rayhunter ... ");
diff --git a/installer/src/uz801.rs b/installer/src/uz801.rs
index 2d66375..acf30e5 100644
--- a/installer/src/uz801.rs
+++ b/installer/src/uz801.rs
@@ -94,7 +94,7 @@ async fn wait_for_adb() -> Result<ADBUSBDevice> {
 
         // UZ801 USB vendor and product IDs.
         // TODO: Research if other variants use different IDs.
-        match ADBUSBDevice::new(0x05c6, 0x90b6) {
+        match ADBUSBDevice::new_no_auth(0x05c6, 0x90b6) {
             Ok(mut device) => {
                 // Test ADB connection
                 if test_adb_connection(&mut device).await.is_ok() {