chore: merge dev into backend cleanup

src-tauri/Cargo.toml

@@ -79,7 +79,7 @@ tauri-plugin-fs = "2.7.1"
 tauri-plugin-process = "2.4.0"
 tauri-plugin-deep-link = "2.6.2"
 tauri-plugin-window-state = "2.5.0"
-zip = "9.0.4"
+zip = "9.1.3"
 flate2 = "1.1.10"
 reqwest_dav = "0.3.3"
 aes-gcm = { version = "0.11.1" }
@@ -154,7 +154,7 @@ windows-sys.workspace = true
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
 tauri-plugin-autostart = "2.7.0"
 tauri-plugin-global-shortcut = "2.4.1"
-tauri-plugin-updater = "2.14.0"
+tauri-plugin-updater = "2.14.1"
 
 [dev-dependencies]
 criterion = { workspace = true }

src-tauri/src/core/auto_backup.rs

@@ -106,14 +106,14 @@ impl AutoBackupManager {
 
     pub async fn init(&self) -> Result<()> {
         let settings = Self::load_settings().await;
-        let _ = self.settings_tx.send(settings);
+        let _ = self.settings_tx.send_replace(settings);
         self.maybe_start_runner(settings);
         Ok(())
     }
 
     pub async fn refresh_settings(&self) -> Result<()> {
         let settings = Self::load_settings().await;
-        let _ = self.settings_tx.send(settings);
+        let _ = self.settings_tx.send_replace(settings);
         self.maybe_start_runner(settings);
         Ok(())
     }

src-tauri/src/feat/config.rs

@@ -27,7 +27,7 @@ pub async fn patch_verge(patch: &IVerge, not_save_file: bool) -> Result<()> {
 
 /// Apply a patch without post-update reconciliation.
 pub(super) async fn apply_verge_patch(patch: &IVerge, not_save_file: bool) -> Result<()> {
-    let config_write = Config::try_lock_config_write()?;
+    let config_write = Config::lock_config_write().await;
     apply_verge_patch_locked(&config_write, patch, not_save_file).await
 }
 

src-tauri/src/feat/window.rs

@@ -321,7 +321,6 @@ pub async fn hide() {
     {
         let _ = window.hide();
     }
-    handle::Handle::global().set_activation_policy_accessory();
 }
 
 #[cfg(test)]

src-tauri/src/lib.rs

@@ -289,9 +289,6 @@ pub fn run() -> std::process::ExitCode {
         }
 
         pub fn handle_window_close(api: &tauri::WindowEvent) {
-            #[cfg(target_os = "macos")]
-            handle::Handle::global().set_activation_policy_accessory();
-
             if core::handle::Handle::global().is_exiting() {
                 return;
             }