TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-03-28 15:41:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5719 from fufesou/fix/remove_nested_read_calls

Browse Source 
Refactor/remove nested read calls
This commit is contained in:
RustDesk
2023-09-17 16:30:49 +08:00
committed by GitHub
parent 348ed268c3 72f5fbd6ad
commit 74be6af3e6
6 changed files with 73 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/common.rs
View File

@@ -1050,24 +1050,6 @@ pub async fn get_key(sync: bool) -> String {
key
}
pub fn is_peer_version_ge(v: &str) -> bool {
#[cfg(not(any(feature = "flutter", feature = "cli")))]
if let Some(session) = crate::ui::CUR_SESSION.lock().unwrap().as_ref() {
return session.get_peer_version() >= hbb_common::get_version_number(v);
}
#[cfg(feature = "flutter")]
if let Some(session) = crate::flutter::SESSIONS
.read()
.unwrap()
.get(&*crate::flutter::CUR_SESSION_ID.read().unwrap())
{
return session.get_peer_version() >= hbb_common::get_version_number(v);
}
false
}
pub fn pk_to_fingerprint(pk: Vec<u8>) -> String {
let s: String = pk.iter().map(|u| format!("{:02x}", u)).collect();
s.chars()