mirror of
https://github.com/jkcoxson/idevice.git
synced 2026-03-02 06:26:15 +01:00
Remove device_id argument for usbmuxd save pair record
This commit is contained in:
@@ -325,7 +325,6 @@ pub unsafe extern "C" fn idevice_usbmuxd_get_pair_record(
|
|||||||
#[unsafe(no_mangle)]
|
#[unsafe(no_mangle)]
|
||||||
pub unsafe extern "C" fn idevice_usbmuxd_save_pair_record(
|
pub unsafe extern "C" fn idevice_usbmuxd_save_pair_record(
|
||||||
usbmuxd_conn: *mut UsbmuxdConnectionHandle,
|
usbmuxd_conn: *mut UsbmuxdConnectionHandle,
|
||||||
device_id: u32,
|
|
||||||
udid: *const c_char,
|
udid: *const c_char,
|
||||||
pair_record: *mut u8,
|
pair_record: *mut u8,
|
||||||
pair_record_len: usize,
|
pair_record_len: usize,
|
||||||
@@ -344,10 +343,7 @@ pub unsafe extern "C" fn idevice_usbmuxd_save_pair_record(
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let res = run_sync_local(async {
|
let res = run_sync_local(async { conn.save_pair_record(udid_str, pair_record).await });
|
||||||
conn.save_pair_record(device_id, udid_str, pair_record)
|
|
||||||
.await
|
|
||||||
});
|
|
||||||
|
|
||||||
match res {
|
match res {
|
||||||
Ok(_) => null_mut(),
|
Ok(_) => null_mut(),
|
||||||
|
|||||||
@@ -303,14 +303,12 @@ impl UsbmuxdConnection {
|
|||||||
/// * `pair_record` - a serialized plist of the pair record
|
/// * `pair_record` - a serialized plist of the pair record
|
||||||
pub async fn save_pair_record(
|
pub async fn save_pair_record(
|
||||||
&mut self,
|
&mut self,
|
||||||
device_id: u32,
|
|
||||||
udid: &str,
|
udid: &str,
|
||||||
pair_record: Vec<u8>,
|
pair_record: Vec<u8>,
|
||||||
) -> Result<(), IdeviceError> {
|
) -> Result<(), IdeviceError> {
|
||||||
let req = crate::plist!(dict {
|
let req = crate::plist!(dict {
|
||||||
"MessageType": "SavePairRecord",
|
"MessageType": "SavePairRecord",
|
||||||
"PairRecordData": pair_record,
|
"PairRecordData": pair_record,
|
||||||
"DeviceID": device_id,
|
|
||||||
"PairRecordID": udid,
|
"PairRecordID": udid,
|
||||||
});
|
});
|
||||||
self.write_plist(req).await?;
|
self.write_plist(req).await?;
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ async fn main() {
|
|||||||
println!("{}", String::from_utf8(pairing_file.clone()).unwrap());
|
println!("{}", String::from_utf8(pairing_file.clone()).unwrap());
|
||||||
|
|
||||||
// Save with usbmuxd
|
// Save with usbmuxd
|
||||||
u.save_pair_record(dev.device_id, &dev.udid, pairing_file)
|
u.save_pair_record(&dev.udid, pairing_file)
|
||||||
.await
|
.await
|
||||||
.expect("no save");
|
.expect("no save");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user