From fbdc290d884cb53002f24b0855bd1dd215cca953 Mon Sep 17 00:00:00 2001
From: Jackson Coxson <jkcoxson@gmail.com>
Date: Mon, 10 Nov 2025 11:16:40 -0700
Subject: [PATCH] Remove device_id argument for usbmuxd save pair record

---
 ffi/src/usbmuxd.rs         | 6 +-----
 idevice/src/usbmuxd/mod.rs | 2 --
 tools/src/pair.rs          | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/ffi/src/usbmuxd.rs b/ffi/src/usbmuxd.rs
index bdae2f3..ffe6ee4 100644
--- a/ffi/src/usbmuxd.rs
+++ b/ffi/src/usbmuxd.rs
@@ -325,7 +325,6 @@ pub unsafe extern "C" fn idevice_usbmuxd_get_pair_record(
 #[unsafe(no_mangle)]
 pub unsafe extern "C" fn idevice_usbmuxd_save_pair_record(
     usbmuxd_conn: *mut UsbmuxdConnectionHandle,
-    device_id: u32,
     udid: *const c_char,
     pair_record: *mut u8,
     pair_record_len: usize,
@@ -344,10 +343,7 @@ pub unsafe extern "C" fn idevice_usbmuxd_save_pair_record(
         }
     };
 
-    let res = run_sync_local(async {
-        conn.save_pair_record(device_id, udid_str, pair_record)
-            .await
-    });
+    let res = run_sync_local(async { conn.save_pair_record(udid_str, pair_record).await });
 
     match res {
         Ok(_) => null_mut(),
diff --git a/idevice/src/usbmuxd/mod.rs b/idevice/src/usbmuxd/mod.rs
index 020823a..7c611cd 100644
--- a/idevice/src/usbmuxd/mod.rs
+++ b/idevice/src/usbmuxd/mod.rs
@@ -303,14 +303,12 @@ impl UsbmuxdConnection {
     /// * `pair_record` - a serialized plist of the pair record
     pub async fn save_pair_record(
         &mut self,
-        device_id: u32,
         udid: &str,
         pair_record: Vec<u8>,
     ) -> Result<(), IdeviceError> {
         let req = crate::plist!(dict {
             "MessageType": "SavePairRecord",
             "PairRecordData": pair_record,
-            "DeviceID": device_id,
             "PairRecordID": udid,
         });
         self.write_plist(req).await?;
diff --git a/tools/src/pair.rs b/tools/src/pair.rs
index c801054..fae58e8 100644
--- a/tools/src/pair.rs
+++ b/tools/src/pair.rs
@@ -80,7 +80,7 @@ async fn main() {
     println!("{}", String::from_utf8(pairing_file.clone()).unwrap());
 
     // Save with usbmuxd
-    u.save_pair_record(dev.device_id, &dev.udid, pairing_file)
+    u.save_pair_record(&dev.udid, pairing_file)
         .await
         .expect("no save");
 }