Fix ctrl+q keyboard shortcut

package.json

@@ -64,6 +64,7 @@
     "@tauri-apps/plugin-notification": "^2.3.1",
     "@tauri-apps/plugin-opener": "^2.5.0",
     "@tauri-apps/plugin-os": "^2.3.1",
+    "@tauri-apps/plugin-process": "^2.3.0",
     "@tauri-apps/plugin-window-state": "^2.4.0",
     "@types/byte-size": "^8.1.2",
     "@use-gesture/react": "^10.3.1",
@@ -92,6 +93,7 @@
     "react-click-away-listener": "^2.4.0",
     "react-dom": "^19.1.1",
     "react-hook-form": "^7.63.0",
+    "react-hotkeys-hook": "^5.2.1",
     "react-loading-skeleton": "^3.5.0",
     "react-markdown": "^10.1.0",
     "react-qr-code": "^2.0.18",

src-tauri/Cargo.toml

@@ -110,7 +110,7 @@ x25519-dalek = { version = "2", features = [
     "serde",
     "static_secrets",
 ] }
-tauri-plugin-global-shortcut = "2.3.0"
+tauri-plugin-process = "2.3.0"
 
 [target.'cfg(unix)'.dependencies]
 hyper-util = "0.1"

src-tauri/capabilities/default.json

@@ -48,6 +48,7 @@
     "os:allow-hostname",
     "dialog:default",
     "clipboard-manager:allow-write-text",
+    "process:allow-exit",
     {
       "identifier": "http:default",
       "allow": [

src-tauri/deny.toml

@@ -87,6 +87,11 @@ ignore = [
     { id = "RUSTSEC-2024-0420", reason = "Tauri v2 GTK3 dependency (unmaintained)" },
     { id = "RUSTSEC-2025-0052", reason = "Discontinued, but dark-light v2.0.0 needs it" },
     { id = "RUSTSEC-2025-0057", reason = "Tauri needs it" },
+    { id = "RUSTSEC-2025-0075", reason = "Tauri v2 dependency (unmaintained)" },
+    { id = "RUSTSEC-2025-0080", reason = "Tauri v2 dependency (unmaintained)" },
+    { id = "RUSTSEC-2025-0081", reason = "Tauri v2 dependency (unmaintained)" },
+    { id = "RUSTSEC-2025-0098", reason = "Tauri v2 dependency (unmaintained)" },
+    { id = "RUSTSEC-2025-0100", reason = "Tauri v2 dependency (unmaintained)" },
 ]
 # If this is true, then cargo deny will use the git executable to fetch advisory database.
 # If this is false, then it uses a built-in git library.

src-tauri/src/bin/defguard-client.rs

@@ -28,7 +28,6 @@ use log::{Level, LevelFilter};
 #[cfg(target_os = "macos")]
 use tauri::{process, Env};
 use tauri::{AppHandle, Builder, Manager, RunEvent, WindowEvent};
-use tauri_plugin_global_shortcut::{Code, GlobalShortcutExt, Modifiers, Shortcut, ShortcutState};
 use tauri_plugin_log::{Target, TargetKind};
 
 #[macro_use]
@@ -185,6 +184,7 @@ fn main() {
         .plugin(tauri_plugin_window_state::Builder::new().build())
         .plugin(tauri_plugin_opener::init())
         .plugin(tauri_plugin_os::init())
+        .plugin(tauri_plugin_process::init())
         .setup(|app| {
             // Register for linux and dev windows builds
             #[cfg(any(target_os = "linux", all(debug_assertions, windows)))]
@@ -264,20 +264,6 @@ fn main() {
                     .build(),
             )?;
 
-            // Setup ctrl-q keyboard shortcut
-            let ctrl_q_shortcut = Shortcut::new(Some(Modifiers::CONTROL), Code::KeyQ);
-            app_handle.plugin(
-                tauri_plugin_global_shortcut::Builder::new()
-                    .with_handler(move |app, shortcut, event| {
-                        if shortcut == &ctrl_q_shortcut && event.state() == ShortcutState::Pressed {
-                            info!("Ctrl-Q pressed, closing active connections and exiting");
-                            app.exit(0);
-                        }
-                    })
-                    .build(),
-            )?;
-            app.global_shortcut().register(ctrl_q_shortcut)?;
-
             let state = AppState::new(config);
             app.manage(state);
 

src/components/App/App.tsx

@@ -4,7 +4,7 @@ import '../../shared/scss/index.scss';
 
 import { QueryClient } from '@tanstack/query-core';
 import { QueryClientProvider } from '@tanstack/react-query';
-import { debug } from '@tauri-apps/plugin-log';
+import { debug, info } from '@tauri-apps/plugin-log';
 import { openUrl } from '@tauri-apps/plugin-opener';
 import dayjs from 'dayjs';
 import customParseData from 'dayjs/plugin/customParseFormat';
@@ -38,6 +38,8 @@ import { useTheme } from '../../shared/defguard-ui/hooks/theme/useTheme';
 import { ThemeProvider } from '../../shared/providers/ThemeProvider/ThemeProvider';
 import { routes } from '../../shared/routes';
 import { ApplicationUpdateManager } from '../ApplicationUpdateManager/ApplicationUpdateManager';
+import { exit } from '@tauri-apps/plugin-process';
+import { useHotkeys } from 'react-hotkeys-hook';
 
 dayjs.extend(duration);
 dayjs.extend(utc);
@@ -186,6 +188,12 @@ export const App = () => {
     };
   }, []);
 
+  // register ctrl+q keyboard shortcut
+  useHotkeys('ctrl+q', () => {
+      info("Ctrl-Q pressed, exiting.");
+      exit(0);
+  });
+
   if (!appLoaded) return null;
 
   return (