diff --git a/app/macos/Runner/AppDelegate.swift b/app/macos/Runner/AppDelegate.swift index b3c17614..cd155ab5 100644 --- a/app/macos/Runner/AppDelegate.swift +++ b/app/macos/Runner/AppDelegate.swift @@ -3,6 +3,11 @@ import FlutterMacOS @main class AppDelegate: FlutterAppDelegate { + override func applicationWillFinishLaunching(_ notification: Notification) { + migrateSandboxedPreferences() + super.applicationWillFinishLaunching(notification) + } + override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { return true } @@ -10,4 +15,26 @@ class AppDelegate: FlutterAppDelegate { override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool { return true } + + /// The app ran sandboxed before self-update, so its settings (servers, + /// sign-in, preferences) live in its container. Copy them once into the + /// unsandboxed defaults so the update keeps them. + private func migrateSandboxedPreferences() { + let defaults = UserDefaults.standard + let marker = "pipelines.migratedFromSandbox" + guard !defaults.bool(forKey: marker), + let bundle = Bundle.main.bundleIdentifier + else { return } + if ProcessInfo.processInfo.environment["APP_SANDBOX_CONTAINER_ID"] != nil { + return // Still sandboxed: these defaults are the container's. + } + let path = NSHomeDirectory() + + "/Library/Containers/\(bundle)/Data/Library/Preferences/\(bundle).plist" + if let old = NSDictionary(contentsOfFile: path) as? [String: Any] { + for (key, value) in old where defaults.object(forKey: key) == nil { + defaults.set(value, forKey: key) + } + } + defaults.set(true, forKey: marker) + } } diff --git a/app/macos/Runner/DebugProfile.entitlements b/app/macos/Runner/DebugProfile.entitlements index 91f41fb6..db18b0f4 100644 --- a/app/macos/Runner/DebugProfile.entitlements +++ b/app/macos/Runner/DebugProfile.entitlements @@ -3,7 +3,7 @@ com.apple.security.app-sandbox - + com.apple.security.cs.allow-jit com.apple.security.files.downloads.read-write diff --git a/app/macos/Runner/Release.entitlements b/app/macos/Runner/Release.entitlements index 8fa9cdb1..f6698359 100644 --- a/app/macos/Runner/Release.entitlements +++ b/app/macos/Runner/Release.entitlements @@ -3,7 +3,7 @@ com.apple.security.app-sandbox - + com.apple.security.files.downloads.read-write com.apple.security.files.user-selected.read-write