Merge pull request #4826 from 21pages/password

fix encrypt
This commit is contained in:
RustDesk
2023-07-02 22:56:43 +08:00
committed by GitHub
8 changed files with 14 additions and 12 deletions

View File

@@ -552,7 +552,7 @@ impl UI {
}
fn is_ok_change_id(&self) -> bool {
machine_uid::get().is_ok()
hbb_common::machine_uid::get().is_ok()
}
fn get_async_job_status(&self) -> String {

View File

@@ -1037,7 +1037,12 @@ pub async fn change_id_shared_(id: String, old_id: String) -> &'static str {
}
#[cfg(not(any(target_os = "android", target_os = "ios")))]
let uuid = Bytes::from(machine_uid::get().unwrap_or("".to_owned()).as_bytes().to_vec());
let uuid = Bytes::from(
hbb_common::machine_uid::get()
.unwrap_or("".to_owned())
.as_bytes()
.to_vec(),
);
#[cfg(any(target_os = "android", target_os = "ios"))]
let uuid = Bytes::from(hbb_common::get_uuid());