Swift 6 / Concurrency fixes (#578)

* Enable language mode * WIP * WIP * Fix concurrency issues in SmartCardStore * Switch to SMAppService * Bump runners * Base * Finish Testing migration * Tweak async for updater * More * Backport mutex * Revert "Backport mutex" This reverts commit 9b02afb20c. * WIP * Reenable * Fix preview. * Update package. * Bump to latest public macOS and Xcode * Bump back down to 6.1 * Update to Xcode 26. * Fixed tests. * More cleanup * Env fixes * var->let * Cleanup * Persist auth async * Whitespace. * Whitespace. * Cleanup. * Cleanup * Redoing locks in actors bc of observable * Actors. * . * Specify b5 * Update package to 6.2 * Fix disabled updater * Remove preconcurrency warning * Move updater init
2026-03-06 09:47:22 +01:00 · 2025-08-17 12:38:18 -05:00
parent 5cc62b628a
commit 0e6b218f1f
59 changed files with 834 additions and 857 deletions
--- a/Sources/Secretive/Views/ContentView.swift
+++ b/Sources/Secretive/Views/ContentView.swift
@@ -4,18 +4,18 @@ import SecureEnclaveSecretKit
 import SmartCardSecretKit
 import Brief

-struct ContentView<UpdaterType: UpdaterProtocol, AgentStatusCheckerType: AgentStatusCheckerProtocol>: View {
+struct ContentView: View {

    @Binding var showingCreation: Bool
    @Binding var runningSetup: Bool
    @Binding var hasRunSetup: Bool
    @State var showingAgentInfo = false
-    @State var activeSecret: AnySecret.ID?
+    @State var activeSecret: AnySecret?
    @Environment(\.colorScheme) var colorScheme

-    @EnvironmentObject private var storeList: SecretStoreList
-    @EnvironmentObject private var updater: UpdaterType
-    @EnvironmentObject private var agentStatusChecker: AgentStatusCheckerType
+    @Environment(\.secretStoreList) private var storeList
+    @Environment(\.updater) private var updater: any UpdaterProtocol
+    @Environment(\.agentStatusChecker) private var agentStatusChecker: any AgentStatusCheckerProtocol

    @State private var selectedUpdate: Release?
    @State private var showingAppPathNotice = false
@@ -106,7 +106,7 @@ extension ContentView {
                if let modifiable = storeList.modifiableStore {
                    CreateSecretView(store: modifiable, showing: $showingCreation)
                        .onDisappear {
-                            guard let newest = modifiable.secrets.last?.id else { return }
+                            guard let newest = modifiable.secrets.last else { return }
                            activeSecret = newest
                        }
                }
@@ -197,34 +197,18 @@ extension ContentView {

 struct ContentView_Previews: PreviewProvider {

-    private static let storeList: SecretStoreList = {
-        let list = SecretStoreList()
-        list.add(store: SecureEnclave.Store())
-        list.add(store: SmartCard.Store())
-        return list
-    }()
-    private static let agentStatusChecker = AgentStatusChecker()
-    private static let justUpdatedChecker = JustUpdatedChecker()
-
-    @State var hasRunSetup = false
-    @State private var showingSetup = false
-    @State private var showingCreation = false
-
    static var previews: some View {
        Group {
            // Empty on modifiable and nonmodifiable
-            ContentView<PreviewUpdater, AgentStatusChecker>(showingCreation: .constant(false), runningSetup: .constant(false), hasRunSetup: .constant(true))
-                .environmentObject(Preview.storeList(stores: [Preview.Store(numberOfRandomSecrets: 0)], modifiableStores: [Preview.StoreModifiable(numberOfRandomSecrets: 0)]))
-                .environmentObject(PreviewUpdater())
-                .environmentObject(agentStatusChecker)
+            ContentView(showingCreation: .constant(false), runningSetup: .constant(false), hasRunSetup: .constant(true))
+                .environment(Preview.storeList(stores: [Preview.Store(numberOfRandomSecrets: 0)], modifiableStores: [Preview.StoreModifiable(numberOfRandomSecrets: 0)]))
+                .environment(PreviewUpdater())

            // 5 items on modifiable and nonmodifiable
-            ContentView<PreviewUpdater, AgentStatusChecker>(showingCreation: .constant(false), runningSetup: .constant(false), hasRunSetup: .constant(true))
-                .environmentObject(Preview.storeList(stores: [Preview.Store()], modifiableStores: [Preview.StoreModifiable()]))
-                .environmentObject(PreviewUpdater())
-                .environmentObject(agentStatusChecker)
+            ContentView(showingCreation: .constant(false), runningSetup: .constant(false), hasRunSetup: .constant(true))
+                .environment(Preview.storeList(stores: [Preview.Store()], modifiableStores: [Preview.StoreModifiable()]))
+                .environment(PreviewUpdater())
        }
-        .environmentObject(agentStatusChecker)

    }
 }
--- a/Sources/Secretive/Views/CreateSecretView.swift
+++ b/Sources/Secretive/Views/CreateSecretView.swift
@@ -3,7 +3,7 @@ import SecretKit

 struct CreateSecretView<StoreType: SecretStoreModifiable>: View {

-    @ObservedObject var store: StoreType
+    @State var store: StoreType
    @Binding var showing: Bool

    @State private var name = ""
@@ -45,8 +45,10 @@ struct CreateSecretView<StoreType: SecretStoreModifiable>: View {
    }

    func save() {
-        try! store.create(name: name, requiresAuthentication: requiresAuthentication)
-        showing = false
+        Task {
+            try! await store.create(name: name, requiresAuthentication: requiresAuthentication)
+            showing = false
+        }
    }

 }
@@ -93,14 +95,14 @@ struct ThumbnailPickerView<ValueType: Hashable>: View {

 extension ThumbnailPickerView {

-    struct Item<ValueType: Hashable>: Identifiable {
+    struct Item<InnerValueType: Hashable>: Identifiable {
        let id = UUID()
-        let value: ValueType
+        let value: InnerValueType
        let name: LocalizedStringKey
        let description: LocalizedStringKey
        let thumbnail: AnyView

-        init<ViewType: View>(value: ValueType, name: LocalizedStringKey, description: LocalizedStringKey, thumbnail: ViewType) {
+        init<ViewType: View>(value: InnerValueType, name: LocalizedStringKey, description: LocalizedStringKey, thumbnail: ViewType) {
            self.value = value
            self.name = name
            self.description = description
@@ -110,10 +112,10 @@ extension ThumbnailPickerView {

 }

-@MainActor class SystemBackground: ObservableObject {
+@MainActor @Observable class SystemBackground {

    static let shared = SystemBackground()
-    @Published var image: NSImage?
+    var image: NSImage?

    private init() {
        if let mainScreen = NSScreen.main, let imageURL = NSWorkspace.shared.desktopImageURL(for: mainScreen) {
--- a/Sources/Secretive/Views/DeleteSecretView.swift
+++ b/Sources/Secretive/Views/DeleteSecretView.swift
@@ -3,7 +3,7 @@ import SecretKit

 struct DeleteSecretView<StoreType: SecretStoreModifiable>: View {

-    @ObservedObject var store: StoreType
+    @State var store: StoreType
    let secret: StoreType.SecretType
    var dismissalBlock: (Bool) -> ()

@@ -49,8 +49,10 @@ struct DeleteSecretView<StoreType: SecretStoreModifiable>: View {
    }
    
    func delete() {
-        try! store.delete(secret: secret)
-        dismissalBlock(true)
+        Task {
+            try! await store.delete(secret: secret)
+            dismissalBlock(true)
+        }
    }

 }
--- a/Sources/Secretive/Views/EmptyStoreView.swift
+++ b/Sources/Secretive/Views/EmptyStoreView.swift
@@ -3,31 +3,17 @@ import SecretKit

 struct EmptyStoreView: View {

-    @ObservedObject var store: AnySecretStore
-    @Binding var activeSecret: AnySecret.ID?
-
+    @State var store: AnySecretStore?
+    
    var body: some View {
        if store is AnySecretStoreModifiable {
-            NavigationLink(destination: EmptyStoreModifiableView(), tag: Constants.emptyStoreModifiableTag, selection: $activeSecret) {
-                Text("empty_store_modifiable_title")
-            }
+            EmptyStoreModifiableView()
        } else {
-            NavigationLink(destination: EmptyStoreImmutableView(), tag: Constants.emptyStoreTag, selection: $activeSecret) {
-                Text("empty_store_nonmodifiable_title")
-            }
+            EmptyStoreImmutableView()
        }
    }
 }

-extension EmptyStoreView {
-    
-    enum Constants {
-        static let emptyStoreModifiableTag: AnyHashable = "emptyStoreModifiableTag"
-        static let emptyStoreTag: AnyHashable = "emptyStoreTag"
-    }
-
-}
-
 struct EmptyStoreImmutableView: View {
    
    var body: some View {
--- a/Sources/Secretive/Views/RenameSecretView.swift
+++ b/Sources/Secretive/Views/RenameSecretView.swift
@@ -3,7 +3,7 @@ import SecretKit

 struct RenameSecretView<StoreType: SecretStoreModifiable>: View {

-    @ObservedObject var store: StoreType
+    @State var store: StoreType
    let secret: StoreType.SecretType
    var dismissalBlock: (_ renamed: Bool) -> ()

@@ -44,7 +44,9 @@ struct RenameSecretView<StoreType: SecretStoreModifiable>: View {
    }

    func rename() {
-        try? store.update(secret: secret, name: newName)
-        dismissalBlock(true)
+        Task {
+            try? await store.update(secret: secret, name: newName)
+            dismissalBlock(true)
+        }
    }
 }
--- a/Sources/Secretive/Views/SecretDetailView.swift
+++ b/Sources/Secretive/Views/SecretDetailView.swift
@@ -3,7 +3,7 @@ import SecretKit

 struct SecretDetailView<SecretType: Secret>: View {
    
-    @State var secret: SecretType
+    let secret: SecretType

    private let keyWriter = OpenSSHKeyWriter()
    private let publicKeyFileStoreController = PublicKeyFileStoreController(homeDirectory: NSHomeDirectory().replacingOccurrences(of: Bundle.main.hostBundleID, with: Bundle.main.agentBundleID))
--- a/Sources/Secretive/Views/SecretListItemView.swift
+++ b/Sources/Secretive/Views/SecretListItemView.swift
@@ -2,24 +2,30 @@ import SwiftUI
 import SecretKit

 struct SecretListItemView: View {
-
-    @ObservedObject var store: AnySecretStore
+    
+    @State var store: AnySecretStore
    var secret: AnySecret
-    @Binding var activeSecret: AnySecret.ID?
-
+    
    @State var isDeleting: Bool = false
    @State var isRenaming: Bool = false
-
+    
    var deletedSecret: (AnySecret) -> Void
    var renamedSecret: (AnySecret) -> Void
-
-    var body: some View {
-        let showingPopupWrapped = Binding(
+    
+    private var showingPopup: Binding<Bool> {
+        Binding(
            get: { isDeleting || isRenaming },
-            set: { if $0 == false { isDeleting = false; isRenaming = false } }
+            set: {
+                if $0 == false {
+                    isDeleting = false
+                    isRenaming = false
+                }
+            }
        )
-
-        return NavigationLink(destination: SecretDetailView(secret: secret), tag: secret.id, selection: $activeSecret) {
+    }
+    
+    var body: some View {
+        NavigationLink(value: secret) {
            if secret.requiresAuthentication {
                HStack {
                    Text(secret.name)
@@ -40,7 +46,7 @@ struct SecretListItemView: View {
                }
            }
        }
-        .popover(isPresented: showingPopupWrapped) {
+        .popover(isPresented: showingPopup) {
            if let modifiable = store as? AnySecretStoreModifiable {
                if isDeleting {
                    DeleteSecretView(store: modifiable, secret: secret) { deleted in
--- a/Sources/Secretive/Views/SetupView.swift
+++ b/Sources/Secretive/Views/SetupView.swift
@@ -55,7 +55,7 @@ struct StepView: View {
                .foregroundColor(.green)
                .frame(width: max(0, ((width - (Constants.padding * 2)) / Double(numberOfSteps - 1)) * Double(currentStep) - (Constants.circleWidth / 2)), height: 5)
            HStack {
-                ForEach(0..<numberOfSteps) { index in
+                ForEach(Array(0..<numberOfSteps), id: \.self) { index in
                    ZStack {
                        if currentStep > index {
                            Circle()
@@ -156,8 +156,10 @@ struct SecretAgentSetupView: View {
    }

    func install() {
-        LaunchAgentController().install()
-        buttonAction()
+        Task {
+            await LaunchAgentController().install()
+            buttonAction()
+        }
    }

 }
--- a/Sources/Secretive/Views/StoreListView.swift
+++ b/Sources/Secretive/Views/StoreListView.swift
@@ -4,60 +4,60 @@ import SecretKit

 struct StoreListView: View {

-    @Binding var activeSecret: AnySecret.ID?
-    
-    @EnvironmentObject private var storeList: SecretStoreList
+    @Binding var activeSecret: AnySecret?
+
+    @Environment(\.secretStoreList) private var storeList

    private func secretDeleted(secret: AnySecret) {
        activeSecret = nextDefaultSecret
    }

    private func secretRenamed(secret: AnySecret) {
-        activeSecret = secret.id
+        activeSecret = secret
    }

    var body: some View {
-        NavigationView {
+        NavigationSplitView {
            List(selection: $activeSecret) {
                ForEach(storeList.stores) { store in
                    if store.isAvailable {
                        Section(header: Text(store.name)) {
-                            if store.secrets.isEmpty {
-                                EmptyStoreView(store: store, activeSecret: $activeSecret)
-                            } else {
-                                ForEach(store.secrets) { secret in
-                                    SecretListItemView(
-                                        store: store,
-                                        secret: secret,
-                                        activeSecret: $activeSecret,
-                                        deletedSecret: self.secretDeleted,
-                                        renamedSecret: self.secretRenamed
-                                    )
-                                }
+                            ForEach(store.secrets) { secret in
+                                SecretListItemView(
+                                    store: store,
+                                    secret: secret,
+                                    deletedSecret: secretDeleted,
+                                    renamedSecret: secretRenamed
+                                )
                            }
                        }
                    }
                }
            }
-            .listStyle(SidebarListStyle())
-            .onAppear {
-                activeSecret = nextDefaultSecret
+        } detail: {
+            if let activeSecret {
+                SecretDetailView(secret: activeSecret)
+            } else if let nextDefaultSecret {
+                // This just means onAppear hasn't executed yet.
+                // Do this to avoid a blip.
+                SecretDetailView(secret: nextDefaultSecret)
+            } else {
+                EmptyStoreView(store: storeList.modifiableStore ?? storeList.stores.first)
            }
-            .frame(minWidth: 100, idealWidth: 240)
        }
+        .navigationSplitViewStyle(.balanced)
+        .onAppear {
+            activeSecret = nextDefaultSecret
+        }
+        .frame(minWidth: 100, idealWidth: 240)
+
    }
 }

 extension StoreListView {

-    var nextDefaultSecret: AnyHashable? {
-        let fallback: AnyHashable
-        if storeList.modifiableStore?.isAvailable ?? false {
-            fallback = EmptyStoreView.Constants.emptyStoreModifiableTag
-        } else {
-            fallback = EmptyStoreView.Constants.emptyStoreTag
-        }
-        return storeList.stores.compactMap(\.secrets.first).first?.id ?? fallback
+    private var nextDefaultSecret: AnySecret? {
+        return storeList.stores.first(where: { !$0.secrets.isEmpty })?.secrets.first
    }
    
 }
--- a/Sources/Secretive/Views/UpdateView.swift
+++ b/Sources/Secretive/Views/UpdateView.swift
@@ -1,9 +1,9 @@
 import SwiftUI
 import Brief

-struct UpdateDetailView<UpdaterType: Updater>: View {
+struct UpdateDetailView: View {

-    @EnvironmentObject var updater: UpdaterType
+    @Environment(\.updater) var updater: any UpdaterProtocol

    let update: Release

@@ -18,7 +18,9 @@ struct UpdateDetailView<UpdaterType: Updater>: View {
            HStack {
                if !update.critical {
                    Button("update_ignore_button") {
-                        updater.ignore(release: update)
+                        Task {
+                            await updater.ignore(release: update)
+                        }
                    }
                    Spacer()
                }