diff --git a/flutter/lib/web/bridge.dart b/flutter/lib/web/bridge.dart index d28e0c26a..c99ef140d 100644 --- a/flutter/lib/web/bridge.dart +++ b/flutter/lib/web/bridge.dart @@ -1063,7 +1063,7 @@ class RustdeskImpl { () => js.context.callMethod('getByName', ['option', 'last_remote_id'])); } - Future mainGetSoftwareUpdateUrl({dynamic hint}) { + Future mainGetSoftwareUpdateUrl({dynamic hint}) { throw UnimplementedError(); } diff --git a/src/common.rs b/src/common.rs index c02aea45e..f53dd703f 100644 --- a/src/common.rs +++ b/src/common.rs @@ -828,17 +828,16 @@ async fn check_software_update_() -> hbb_common::ResultType<()> { let response_url = latest_release_response.url().to_string(); if get_version_number(&latest_release_version) > get_version_number(crate::VERSION) { - *SOFTWARE_UPDATE_URL.lock().unwrap() = response_url; - } - #[cfg(feature = "flutter")] - { - let mut m = HashMap::new(); - m.insert("name", "check_software_update_finish"); - let url = SOFTWARE_UPDATE_URL.lock().unwrap().clone(); - m.insert("url", url.as_str()); - if let Ok(data) = serde_json::to_string(&m) { - let _ = crate::flutter::push_global_event(crate::flutter::APP_TYPE_MAIN, data); + #[cfg(feature = "flutter")] + { + let mut m = HashMap::new(); + m.insert("name", "check_software_update_finish"); + m.insert("url", &response_url); + if let Ok(data) = serde_json::to_string(&m) { + let _ = crate::flutter::push_global_event(crate::flutter::APP_TYPE_MAIN, data); + } } + *SOFTWARE_UPDATE_URL.lock().unwrap() = response_url; } Ok(()) } diff --git a/src/flutter_ffi.rs b/src/flutter_ffi.rs index 72b0e5b37..020bc98aa 100644 --- a/src/flutter_ffi.rs +++ b/src/flutter_ffi.rs @@ -61,7 +61,6 @@ fn initialize(app_dir: &str, custom_client_config: &str) { scrap::mediacodec::check_mediacodec(); crate::common::test_rendezvous_server(); crate::common::test_nat_type(); - crate::common::check_software_update(); } #[cfg(target_os = "ios")] { @@ -1376,11 +1375,10 @@ pub fn main_get_last_remote_id() -> String { LocalConfig::get_remote_id() } -pub fn main_get_software_update_url() -> String { +pub fn main_get_software_update_url() { if get_local_option("enable-check-update".to_string()) != "N" { crate::common::check_software_update(); } - crate::common::SOFTWARE_UPDATE_URL.lock().unwrap().clone() } pub fn main_get_home_dir() -> String { diff --git a/src/main.rs b/src/main.rs index 44ace8a76..f295363aa 100644 --- a/src/main.rs +++ b/src/main.rs @@ -12,8 +12,6 @@ fn main() { } common::test_rendezvous_server(); common::test_nat_type(); - #[cfg(target_os = "android")] - crate::common::check_software_update(); common::global_clean(); }