add stop vpn on quit setting

ethanndickson · ethanndickson · commit b7c9f582a646 · 2025-02-10T13:36:06.000+11:00
diff --git a/Coder Desktop/Coder Desktop/Coder_DesktopApp.swift b/Coder Desktop/Coder Desktop/Coder_DesktopApp.swift
@@ -48,7 +48,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     }
 
     // MUST eventually call `NSApp.reply(toApplicationShouldTerminate: true)`
+    // or return `.terminateNow`
     func applicationShouldTerminate(_: NSApplication) -> NSApplication.TerminateReply {
+        if !settings.stopVPNOnQuit { return .terminateNow }
         Task {
             await vpn.stop()
             NSApp.reply(toApplicationShouldTerminate: true)
diff --git a/Coder Desktop/Coder Desktop/State.swift b/Coder Desktop/Coder Desktop/State.swift
@@ -104,6 +104,8 @@ class Settings: ObservableObject {
         }
     }
 
+    @AppStorage(Keys.stopVPNOnQuit) var stopVPNOnQuit = true
+
     init(store: UserDefaults = .standard) {
         self.store = store
         _literalHeaders = Published(
@@ -116,6 +118,7 @@ class Settings: ObservableObject {
     enum Keys {
         static let useLiteralHeaders = "UseLiteralHeaders"
         static let literalHeaders = "LiteralHeaders"
+        static let stopVPNOnQuit = "StopVPNOnQuit"
     }
 }
 
diff --git a/Coder Desktop/Coder Desktop/Views/Settings/GeneralTab.swift b/Coder Desktop/Coder Desktop/Views/Settings/GeneralTab.swift
@@ -2,11 +2,17 @@ import LaunchAtLogin
 import SwiftUI
 
 struct GeneralTab: View {
+    @EnvironmentObject var settings: Settings
     var body: some View {
         Form {
             Section {
                 LaunchAtLogin.Toggle("Launch at Login")
             }
+            Section {
+                Toggle(isOn: $settings.stopVPNOnQuit) {
+                    Text("Stop VPN on Quit")
+                }
+            }
         }.formStyle(.grouped)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	// MUST eventually call `NSApp.reply(toApplicationShouldTerminate: true)`
	`51`	+ // or return `.terminateNow`
`51`	`52`	`func applicationShouldTerminate(_: NSApplication) -> NSApplication.TerminateReply {`
	`53`	`+ if !settings.stopVPNOnQuit { return .terminateNow }`
`52`	`54`	`Task {`
`53`	`55`	`await vpn.stop()`
`54`	`56`	`NSApp.reply(toApplicationShouldTerminate: true)`
Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,8 @@ class Settings: ObservableObject {`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`
	`107`	`+ @AppStorage(Keys.stopVPNOnQuit) var stopVPNOnQuit = true`
	`108`	`+`
`107`	`109`	`init(store: UserDefaults = .standard) {`
`108`	`110`	`self.store = store`
`109`	`111`	`_literalHeaders = Published(`
`@@ -116,6 +118,7 @@ class Settings: ObservableObject {`
`116`	`118`	`enum Keys {`
`117`	`119`	`static let useLiteralHeaders = "UseLiteralHeaders"`
`118`	`120`	`static let literalHeaders = "LiteralHeaders"`
	`121`	`+ static let stopVPNOnQuit = "StopVPNOnQuit"`
`119`	`122`	`}`
`120`	`123`	`}`
`121`	`124`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,17 @@ import LaunchAtLogin`
`2`	`2`	`import SwiftUI`
`3`	`3`
`4`	`4`	`struct GeneralTab: View {`
	`5`	`+ @EnvironmentObject var settings: Settings`
`5`	`6`	`var body: some View {`
`6`	`7`	`Form {`
`7`	`8`	`Section {`
`8`	`9`	`LaunchAtLogin.Toggle("Launch at Login")`
`9`	`10`	`}`
	`11`	`+ Section {`
	`12`	`+ Toggle(isOn: $settings.stopVPNOnQuit) {`
	`13`	`+ Text("Stop VPN on Quit")`
	`14`	`+ }`
	`15`	`+ }`
`10`	`16`	`}.formStyle(.grouped)`
`11`	`17`	`}`
`12`	`18`	`}`