fix: alert on backup failure - WPB-15211

WireAPI/Sources/WireAPI/APIs/FeatureConfigsAPI/FeatureConfigsAPIBuilder.swift

@@ -26,7 +26,7 @@ public struct FeatureConfigsAPIBuilder {
 
     /// Create a new builder.
     ///
-    /// - Parameter httpClient: A http client.
+    /// - Parameter APIService: An api service.
 
     public init(apiService: any APIServiceProtocol) {
         self.apiService = apiService

WireDomain/Sources/WireDomain/UseCases/PullSelfUserClients.swift

@@ -0,0 +1,84 @@
+//
+// Wire
+// Copyright (C) 2025 Wire Swiss GmbH
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see http://www.gnu.org/licenses/.
+//
+
+import CoreData
+import WireAPI
+
+/// Pull self clients from backend and update local state
+public struct PullSelfUserClients: PullSelfUserClientsProtocol {
+    private let userClientsAPI: any UserClientsAPI
+    private let userClientsLocalStore: any UserClientsLocalStoreProtocol
+
+    init(userClientsAPI: any UserClientsAPI, userClientsLocalStore: any UserClientsLocalStoreProtocol) {
+        self.userClientsAPI = userClientsAPI
+        self.userClientsLocalStore = userClientsLocalStore
+    }
+
+    public func pullSelfClients() async throws {
+        let remoteSelfClients = try await userClientsAPI.getSelfClients()
+
+        for remoteSelfClient in remoteSelfClients {
+            let localUserClient = await userClientsLocalStore.fetchOrCreateClient(
+                id: remoteSelfClient.id
+            )
+
+            try await updateClient(
+                id: remoteSelfClient.id,
+                from: remoteSelfClient,
+                isNewClient: localUserClient.isNew
+            )
+        }
+
+        let deletedSelfClientsIDs = await userClientsLocalStore.deletedSelfClients(
+            newClients: remoteSelfClients.map(\.id)
+        )
+
+        for deletedSelfClientID in deletedSelfClientsIDs {
+            await userClientsLocalStore.deleteClient(id: deletedSelfClientID)
+        }
+    }
+
+    func updateClient(
+        id: String,
+        from remoteClient: WireAPI.SelfUserClient,
+        isNewClient: Bool
+    ) async throws {
+        await userClientsLocalStore.updateClient(
+            id: id,
+            isNewClient: isNewClient,
+            userClientInfo: remoteClient.toDomainModel()
+        )
+    }
+
+}
+
+public extension PullSelfUserClients {
+
+    static func make(
+        apiService: any APIServiceProtocol,
+        apiVersion: WireAPI.APIVersion,
+        context: NSManagedObjectContext
+    ) -> PullSelfUserClientsProtocol {
+        let userClientsAPI = UserClientsAPIBuilder(apiService: apiService).makeAPI(for: apiVersion)
+
+        let userLocalStore = UserLocalStore(context: context)
+        let userClientsLocalStore = UserClientsLocalStore(context: context, userLocalStore: userLocalStore)
+
+        return PullSelfUserClients(userClientsAPI: userClientsAPI, userClientsLocalStore: userClientsLocalStore)
+    }
+}

WireUI/Sources/WireDesign/Icons/Image+ImageResource.swift → WireDomain/Sources/WireDomain/UseCases/PullSelfUserClientsProtocol.swift

@@ -16,8 +16,8 @@
 // along with this program. If not, see http://www.gnu.org/licenses/.
 //
 
-import SwiftUI
+// sourcery: AutoMockable
+public protocol PullSelfUserClientsProtocol {
 
-public extension Image {
-    static let close = Image(.close)
+    func pullSelfClients() async throws
 }

WireDomain/Tests/WireDomainTests/UseCases/PullSelfUserClientsTests.swift

@@ -0,0 +1,111 @@
+//
+// Wire
+// Copyright (C) 2025 Wire Swiss GmbH
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see http://www.gnu.org/licenses/.
+//
+
+import WireAPISupport
+import WireDataModel
+import WireDataModelSupport
+import WireDomainSupport
+import WireTestingPackage
+import XCTest
+@testable import WireAPI
+@testable import WireDomain
+
+final class PullSelfUserClientsTests: XCTestCase {
+
+    private var sut: PullSelfUserClients!
+    private var userClientsAPI: MockUserClientsAPI!
+    private var userClientsLocalStore: MockUserClientsLocalStoreProtocol!
+    private var stack: CoreDataStack!
+    private var coreDataStackHelper: CoreDataStackHelper!
+    private var modelHelper: ModelHelper!
+
+    private var context: NSManagedObjectContext {
+        stack.syncContext
+    }
+
+    override func setUp() async throws {
+        coreDataStackHelper = CoreDataStackHelper()
+        modelHelper = ModelHelper()
+        stack = try await coreDataStackHelper.createStack()
+        userClientsAPI = MockUserClientsAPI()
+        userClientsLocalStore = MockUserClientsLocalStoreProtocol()
+
+        sut = PullSelfUserClients(
+            userClientsAPI: userClientsAPI,
+            userClientsLocalStore: userClientsLocalStore
+        )
+    }
+
+    override func tearDown() async throws {
+        stack = nil
+        userClientsAPI = nil
+        sut = nil
+        try coreDataStackHelper.cleanupDirectory()
+        coreDataStackHelper = nil
+        modelHelper = nil
+    }
+
+    // MARK: - Tests
+
+    func testPullSelfClients_It_Invokes_Local_Store_And_User_Repo_Methods() async throws {
+        // Mock
+
+        let selfUserClient = await context.perform { [self] in
+            return modelHelper.createSelfClient(
+                id: Scaffolding.otherUserClientID,
+                in: context
+            )
+        }
+
+        userClientsAPI.getSelfClients_MockValue = [
+            Scaffolding.selfUserClient
+        ]
+
+        userClientsLocalStore.fetchOrCreateClientId_MockValue = (selfUserClient, false)
+        userClientsLocalStore.updateClientIdIsNewClientUserClientInfo_MockMethod = { _, _, _ in }
+        userClientsLocalStore.deletedSelfClientsNewClients_MockValue = [Scaffolding.userClientID]
+        userClientsLocalStore.deleteClientId_MockMethod = { _ in }
+
+        // When
+
+        try await sut.pullSelfClients()
+
+        // Then
+
+        XCTAssertEqual(userClientsLocalStore.fetchOrCreateClientId_Invocations.count, 1)
+        XCTAssertEqual(userClientsLocalStore.updateClientIdIsNewClientUserClientInfo_Invocations.count, 1)
+        XCTAssertEqual(userClientsLocalStore.deletedSelfClientsNewClients_Invocations.count, 1)
+        XCTAssertEqual(userClientsLocalStore.deleteClientId_Invocations.count, 1)
+    }
+
+    private enum Scaffolding {
+        static let userClientID = UUID.mockID1.uuidString
+        static let otherUserClientID = UUID.mockID2.uuidString
+
+        static let selfUserClient = WireAPI.SelfUserClient(
+            id: userClientID,
+            type: .permanent,
+            activationDate: .now,
+            label: "test",
+            model: "test",
+            deviceClass: .phone,
+            capabilities: []
+        )
+    }
+
+}

WireUI/Sources/WireFolderPickerUI/FolderPicker.swift

@@ -63,14 +63,10 @@ public struct FolderPicker: View {
             .toolbar {
                 if showCloseButton {
                     ToolbarItem(placement: .topBarTrailing) {
-                        CloseButton(
-                            action: didTapClose,
-                            accessibilityLabel: String(
-                                localized: "folderPicker.close.label",
-                                table: "Accessibility",
-                                bundle: .module
+                        CloseButton(action: didTapClose)
+                            .accessibilityLabel(
+                                Text("folderPicker.close.label", tableName: "Accessibility", bundle: .module)
                             )
-                        )
                     }
                 }
             }

WireUI/Sources/WireMoveToFolderUI/Views/FolderPicker/FolderPicker.swift

@@ -50,14 +50,10 @@ public struct FolderPicker: View {
             .navigationBarTitleDisplayMode(.inline)
             .toolbar {
                 ToolbarItem(placement: .navigationBarLeading) {
-                    CloseButton(
-                        action: didTapClose,
-                        accessibilityLabel: String(
-                            localized: "folderPicker.close.label",
-                            table: "Accessibility",
-                            bundle: .module
+                    CloseButton(action: didTapClose)
+                        .accessibilityLabel(
+                            Text("folderPicker.close.label", tableName: "Accessibility", bundle: .module)
                         )
-                    )
                 }
                 ToolbarItem(placement: .navigationBarTrailing) {
                     NavigationLink {

WireUI/Sources/WireReusableUIComponents/BlockingActivityIndicator/BlockingActivityIndicator.swift

@@ -138,7 +138,7 @@ private extension UIView {
     }
 }
 
-private var stateKey = 0
+@MainActor private var stateKey = 0
 
 // MARK: - Previews
 

WireUI/Sources/WireReusableUIComponents/Buttons/CloseButton.swift

@@ -22,21 +22,18 @@ import WireDesign
 public struct CloseButton: View {
 
     private let action: () -> Void
-    private let accessibilityLabel: String
 
     public var body: some View {
         Button(action: action) {
-            Image.close
+            Image(.close)
         }
         .buttonStyle(.plain)
         .foregroundColor(Color(uiColor: SemanticColors.Icon.foregroundDefaultBlack))
-        .accessibilityLabel(Text(accessibilityLabel))
         .accessibilityIdentifier("close")
     }
 
-    public init(action: @escaping @MainActor () -> Void, accessibilityLabel: String) {
+    public init(action: @escaping @MainActor () -> Void) {
         self.action = action
-        self.accessibilityLabel = accessibilityLabel
     }
 
 }
@@ -46,7 +43,7 @@ public struct CloseButton: View {
         Text("Hello, World!")
             .toolbar {
                 ToolbarItem(placement: .topBarTrailing) {
-                    CloseButton(action: { print("Close") }, accessibilityLabel: "Close")
+                    CloseButton { print("Close") }
                 }
             }
     }