mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2024-11-27 14:59:02 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #5353 from dignow/refact/remove_login_device_info_in_sciter

Browse Source 
refactor, remove login device info in sciter
This commit is contained in:
RustDesk 2023-08-11 22:19:10 +08:00 committed by GitHub
commit 53218409d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ui.rs
View File

@ -595,8 +595,8 @@ impl UI {
handle_relay_id(id) handle_relay_id(id)
} }
fn get_hostname(&self) -> String { fn get_login_device_info(&self) -> String {
get_hostname() get_login_device_info_json()
} }
} }
@ -682,7 +682,7 @@ impl sciter::EventHandler for UI {
fn get_langs(); fn get_langs();
fn default_video_save_directory(); fn default_video_save_directory();
fn handle_relay_id(String); fn handle_relay_id(String);
fn get_hostname(); fn get_login_device_info();
} }
} }

15
src/ui/index.tis
View File

@ -1323,18 +1323,5 @@ function getHttpHeaders() {
} }
function getDeviceInfo() { function getDeviceInfo() {
var os; return JSON.parse(handler.get_login_device_info());
if (is_win) {
os = 'windows';
} else if (is_linux) {
os = 'linux';
} else if (is_osx) {
os = 'macos';
}
return {
os: os,
type: 'client',
name: handler.get_hostname()
};
} }

6
src/ui_interface.rs
View File

@ -974,10 +974,6 @@ pub fn get_fingerprint() -> String {
return ipc::get_fingerprint(); return ipc::get_fingerprint();
} }
pub fn get_hostname() -> String {
crate::common::hostname()
}
#[inline] #[inline]
pub fn get_login_device_info() -> LoginDeviceInfo { pub fn get_login_device_info() -> LoginDeviceInfo {
LoginDeviceInfo { LoginDeviceInfo {
@ -990,7 +986,7 @@ pub fn get_login_device_info() -> LoginDeviceInfo {
#[inline] #[inline]
pub fn get_login_device_info_json() -> String { pub fn get_login_device_info_json() -> String {
serde_json::to_string(&get_login_device_info()).unwrap_or_default() serde_json::to_string(&get_login_device_info()).unwrap_or("{}".to_string())
} }
// notice: avoiding create ipc connection repeatedly, // notice: avoiding create ipc connection repeatedly,