feat: preparations for universal backup/restore - WPB-14616

WireDomain/Package.swift

@@ -16,7 +16,7 @@ let package = Package(
         .target(
             name: "WireDomainPkg",
             path: "./Sources/WireDomain",
-            sources: ["./UseCases/Protocols/IndividualToTeamMigrationUseCaseProtocol.swift"]
+            sources: ["./UseCases/Protocols"]
         )
     ]
 )

WireDomain/Sources/WireDomain/UseCases/Protocols/CreateLegacyBackupError.swift

@@ -0,0 +1,24 @@
+//
+// 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/.
+//
+
+public enum CreateLegacyBackupError: Error {
+    case noActiveAccountForExport
+    case compressionError
+    /// Failed to create `InputStream` or `OutputStream` from `URL`.
+    case failedToCreateStreamsForEncryption
+}

WireDomain/Sources/WireDomain/UseCases/Protocols/ImportBackupError.swift

@@ -0,0 +1,33 @@
+//
+// 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/.
+//
+
+public enum ImportBackupError: Error, Equatable, CaseIterable {
+    case noActiveAccountForImport
+    /// The backup file is encrypted and a password is needed for decryption.
+    case passwordRequired
+    /// E.g. if the file to import was created with a different (incompatible) version of the app.
+    case incompatibleFileFormat
+    case invalidAccountID
+    case compressionError
+    case invalidFileExtension
+    case keyCreationFailed
+    case decryptionError
+    case faildToBackUpUserClient
+    /// Failed to create `InputStream` or `OutputStream` from `URL`.
+    case failedToCreateStreamForDecryption
+}

wire-ios-sync-engine/Source/Use cases/ImportBackupUseCase/BackupRestoreError.swift → WireDomain/Sources/WireDomain/UseCases/Protocols/ImportBackupProgress.swift

@@ -16,11 +16,7 @@
 // along with this program. If not, see http://www.gnu.org/licenses/.
 //
 
-enum BackupRestoreError: Error {
-    case noActiveAccount
-    case compressionError
-    case invalidFileExtension
-    case keyCreationFailed
-    case decryptionError
-    case unknown
+public enum ImportBackupProgress: Equatable, Sendable {
+    case progress(Float)
+    case done
 }

wire-ios-sync-engine/Source/Use cases/ImportBackupUseCase/Protocols/ImportBackupUseCaseProtocol.swift → WireDomain/Sources/WireDomain/UseCases/Protocols/ImportBackupUseCaseProtocol.swift

@@ -19,6 +19,6 @@
 import Foundation
 
 // sourcery: AutoMockable
-public protocol ImportBackupUseCaseProtocol {
-    func invoke(url: URL, password: String) async throws
+public protocol ImportBackupUseCaseProtocol: Sendable {
+    func invoke(url: URL, password: String) -> AsyncThrowingStream<ImportBackupProgress, any Error>
 }

WireDomain/WireDomain Project.xcodeproj/project.pbxproj

@@ -13,6 +13,7 @@
 		5904B1B32D31582700E866D1 /* WireDomainSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 017F67822C207A3200B6E02D /* WireDomainSupport.framework */; };
 		591B6E452C8B09BA009F8A7B /* WireDataModel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01D0DCC32C1C8CC20076CB1C /* WireDataModel.framework */; };
 		591B6E472C8B09BD009F8A7B /* WireDataModelSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01BDA5442C20762200636E50 /* WireDataModelSupport.framework */; };
+		59202AD22D54D3D500143413 /* WireDomainPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 59202AD12D54D3D500143413 /* WireDomainPackage */; };
 		594904952D0710BF00238104 /* WireAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 594904942D0710BF00238104 /* WireAnalytics */; };
 		598D042D2C89C63100B64D71 /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 598D042C2C89C63100B64D71 /* WireFoundation */; };
 		59909A5E2C5BBEA8009C41DE /* WireAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 59909A5D2C5BBEA8009C41DE /* WireAPI */; };
@@ -70,7 +71,7 @@
 		59DBDB312D395B620069C64C /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
-				UseCases/Protocols/IndividualToTeamMigrationUseCaseProtocol.swift,
+				UseCases/Protocols,
 			);
 			target = 01D0DCA52C1C8C870076CB1C /* WireDomain */;
 		};
@@ -80,7 +81,7 @@
 		5904B7822D315AAC00E866D1 /* TestPlans */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = TestPlans; sourceTree = "<group>"; };
 		59EA78992D00CF1C002CA0B8 /* WireDomainTests */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = WireDomainTests; sourceTree = "<group>"; };
 		59EA78D42D00CF22002CA0B8 /* WireDomainSupport */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (5904B1B92D31586500E866D1 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = WireDomainSupport; sourceTree = "<group>"; };
-		59EA7A282D00CFB2002CA0B8 /* WireDomain */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (59DBDB312D395B620069C64C /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = WireDomain; sourceTree = "<group>"; };
+		59EA7A282D00CFB2002CA0B8 /* WireDomain */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (59DBDB312D395B620069C64C /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (UseCases/Protocols, ); path = WireDomain; sourceTree = "<group>"; };
 /* End PBXFileSystemSynchronizedRootGroup section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -89,6 +90,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				C97BCCAA2C98704B004F2D0D /* WireDomain.framework in Frameworks */,
+				59202AD22D54D3D500143413 /* WireDomainPackage in Frameworks */,
 				59909A692C5BC001009C41DE /* WireAPI in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -193,6 +195,7 @@
 			name = WireDomainSupport;
 			packageProductDependencies = (
 				59909A682C5BC001009C41DE /* WireAPI */,
+				59202AD12D54D3D500143413 /* WireDomainPackage */,
 			);
 			productName = WireDomainSupport;
 			productReference = 017F67822C207A3200B6E02D /* WireDomainSupport.framework */;
@@ -741,6 +744,10 @@
 /* End XCConfigurationList section */
 
 /* Begin XCSwiftPackageProductDependency section */
+		59202AD12D54D3D500143413 /* WireDomainPackage */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = WireDomainPackage;
+		};
 		594904942D0710BF00238104 /* WireAnalytics */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = WireAnalytics;

wire-ios-testing/Source/Public/XCTestCase+waitForPredicate.swift → WireFoundation/Sources/WireTesting/SDKExtensions/XCTest/XCTestCase+waitForPredicate.swift

@@ -16,7 +16,7 @@
 // along with this program. If not, see http://www.gnu.org/licenses/.
 //
 
-import XCTest
+public import XCTest
 
 public extension XCTestCase {
 

wire-ios-testing/Source/Public/XCTestExpectation+inverted.swift → WireFoundation/Sources/WireTesting/SDKExtensions/XCTest/XCTestExpectation+inverted.swift

@@ -16,7 +16,7 @@
 // along with this program. If not, see http://www.gnu.org/licenses/.
 //
 
-import XCTest
+public import XCTest
 
 public extension XCTestExpectation {
 

WireLogging/Sources/WireLogging/WireLogger+Instances.swift

@@ -24,9 +24,11 @@ public extension WireLogger {
     static let appLock = WireLogger(tag: "AppLock")
     static let assets = WireLogger(tag: "assets")
     static let authentication = WireLogger(tag: "authentication")
+    static let backend = WireLogger(tag: "backend")
+    static let backupExport = WireLogger(tag: "backup-export")
+    static let backupImport = WireLogger(tag: "backup-import")
     static let backgroundActivity = WireLogger(tag: "background-activity")
     static let badgeCount = WireLogger(tag: "badge-count")
-    static let backend = WireLogger(tag: "backend")
     static let calling = WireLogger(tag: "calling")
     static let conversation = WireLogger(tag: "conversation")
     static let coreCrypto = WireLogger(tag: "core-crypto")

WireUI/Package.swift

@@ -20,13 +20,15 @@ let package = Package(
         .library(name: "WireMoveToFolderUISupport", targets: ["WireMoveToFolderUISupport"]),
         .library(name: "WireReusableUIComponents", targets: ["WireReusableUIComponents"]),
         .library(name: "WireSettingsUI", targets: ["WireSettingsUI"]),
+        .library(name: "WireSettingsUISupport", targets: ["WireSettingsUISupport"]),
         .library(name: "WireSidebarUI", targets: ["WireSidebarUI"]),
     ],
     dependencies: [
         .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.1.0"),
         .package(path: "../WireAnalytics"),
         .package(name: "WireDomainPackage", path: "../WireDomain"),
         .package(name: "WireFoundation", path: "../WireFoundation"),
+        .package(path: "../WireLogging"),
         .package(path: "../WirePlugins")
     ],
     targets: [
@@ -78,8 +80,25 @@ let package = Package(
         ),
         .testTarget(name: "WireReusableUIComponentsTests", dependencies: ["WireReusableUIComponents"]),
 
-        .target(name: "WireSettingsUI"),
-        .testTarget(name: "WireSettingsUITests", dependencies: ["WireSettingsUI"]),
+        .target(
+            name: "WireSettingsUI",
+            dependencies: [
+                "WireDesign",
+                .product(name: "WireDomainPackage", package: "WireDomainPackage"),
+                "WireFoundation",
+                "WireLogging",
+                "WireReusableUIComponents",
+            ],
+            plugins: [.plugin(name: "SwiftGenPlugin", package: "WirePlugins")]
+        ),
+        .target(
+            name: "WireSettingsUISupport",
+            dependencies: ["WireSettingsUI"],
+            plugins: [
+                .plugin(name: "SourceryPlugin", package: "WirePlugins")
+            ]
+        ),
+        .testTarget(name: "WireSettingsUITests", dependencies: ["WireSettingsUI", "WireSettingsUISupport"]),
 
         .target(
             name: "WireSidebarUI",

WireUI/Sources/WireDesign/Buttons/UIButton.Configuration+ButtonStyles.swift

@@ -0,0 +1,45 @@
+//
+// 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 UIKit
+import WireFoundation
+
+public extension UIButton.Configuration {
+
+    static var primary: Self {
+
+        var configuration = shared
+        configuration.baseBackgroundColor = ColorTheme.Buttons.Primary.enabled
+        return configuration
+
+    }
+
+    private static var shared: Self {
+
+        var configuration = UIButton.Configuration.filled()
+        configuration.buttonSize = .large
+        configuration.titleTextAttributesTransformer = .init { attributeContainer in
+            var attributeContainer = attributeContainer
+            attributeContainer.font = .preferredFont(forTextStyle: .headline)
+            return attributeContainer
+        }
+        return configuration
+
+    }
+
+}

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/WireSettingsUI/.swiftgen.yml

@@ -0,0 +1,15 @@
+# Every input/output paths in the rest of the config will then be expressed relative to these.
+
+input_dir: ./
+output_dir: ${GENERATED}/
+
+# Generate constants for your localized strings.
+
+strings:
+  inputs:
+    - Resources/en.lproj/Accessibility.strings
+    - Resources/en.lproj/Localizable.strings
+  filter:
+  outputs:
+    - templateName: structured-swift5
+      output: Strings+Generated.swift