refactor updater initialization and settings management in FlitroApp and SettingsView

Author: l2fprod

Flitro/FlitroApp.swift

@@ -16,8 +16,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
     }
 
     func applicationDidFinishLaunching(_ notification: Notification) {
-        updaterController = SPUStandardUpdaterController(startingUpdater: true, updaterDelegate: nil, userDriverDelegate: nil)
-
         if let window = NSApp.windows.first {
             window.delegate = self
         }
@@ -57,6 +55,14 @@ struct ContentView: View {
 @main
 struct FlitroApp: App {
     @NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
+
+    init() {
+        // Ensure updaterController is initialized before any scene
+        if appDelegate.updaterController == nil {
+            appDelegate.updaterController = SPUStandardUpdaterController(startingUpdater: true, updaterDelegate: nil, userDriverDelegate: nil)
+        }
+    }
+
     var body: some Scene {
         WindowGroup {
             ContentView()
@@ -80,7 +86,11 @@ struct FlitroApp: App {
             MenuBarExtraContents().environmentObject(ContextManager.shared)
         }
         Settings {
-            SettingsView()
+            if let updater = appDelegate.updaterController?.updater {
+                SettingsView(updater: updater)
+            } else {
+                Text("Updater not available")
+            }
         }
         WindowGroup("About Flitro", id: "about") {
             AboutView()

Flitro/SettingsView.swift

@@ -1,17 +1,36 @@
 import SwiftUI
 import ServiceManagement
+import Sparkle
 
 struct SettingsView: View {
+    let updater: SPUUpdater
     @AppStorage("startAtLogin") private var startAtLogin: Bool = false
+    @State private var automaticallyChecksForUpdates: Bool
+    @State private var automaticallyDownloadsUpdates: Bool
+
+    init(updater: SPUUpdater) {
+        self.updater = updater
+        _automaticallyChecksForUpdates = State(wrappedValue: updater.automaticallyChecksForUpdates)
+        _automaticallyDownloadsUpdates = State(wrappedValue: updater.automaticallyDownloadsUpdates)
+    }
 
     var body: some View {
         Form {
             Toggle(isOn: $startAtLogin) {
                 Text("Start Flitro at login")
             }
-            .onChange(of: startAtLogin) {
-                setLaunchAtLogin(enabled: startAtLogin)
+            .onChange(of: startAtLogin) { newValue, _ in
+                setLaunchAtLogin(enabled: newValue)
             }
+            Toggle("Automatically check for updates", isOn: $automaticallyChecksForUpdates)
+                .onChange(of: automaticallyChecksForUpdates) { newValue, _ in
+                    updater.automaticallyChecksForUpdates = newValue
+                }
+            Toggle("Automatically download updates", isOn: $automaticallyDownloadsUpdates)
+                .disabled(!automaticallyChecksForUpdates)
+                .onChange(of: automaticallyDownloadsUpdates) { newValue, _ in
+                    updater.automaticallyDownloadsUpdates = newValue
+                }
         }
         .padding()
         .frame(width: 320)
@@ -28,4 +47,4 @@ struct SettingsView: View {
             // Handle error (e.g., show an alert)
         }
     }
-} 
+}