chore: remove dead non multibackend code paths - WPB-12140

WireAuthentication/Sources/WireAuthentication/Components/DetermineAuthMethodComponent.swift

@@ -31,8 +31,6 @@ protocol DetermineAuthMethodComponentDependency: Dependency {
     var preferredAPIVersion: APIVersion? { get }
     var minTLSVersion: TLSVersion { get }
     var ssoCallbackURLScheme: String { get }
-    var isMultibackendEnabled: Bool { get }
-
 }
 
 final class DetermineAuthMethodComponent: Component<DetermineAuthMethodComponentDependency> {
@@ -97,8 +95,7 @@ extension DetermineAuthMethodComponent: DetermineAuthMethodViewModel.Factory {
             router: dependency.router,
             bridge: dependency.bridge,
             environment: networkStack.backendEnvironment,
-            existsAnotherAccount: existsAnotherAccount,
-            isMultibackendEnabled: dependency.isMultibackendEnabled
+            existsAnotherAccount: existsAnotherAccount
         )
     }
 

WireAuthentication/Sources/WireAuthentication/Components/RootComponent.swift

@@ -41,7 +41,6 @@ final class RootComponent: BootstrapComponent {
     public let ssoCallbackURLScheme: String
     public let appStoreURL: URL
     public let accountsPublisher: CurrentValuePublisher<[AccountUIModel]>
-    public let isMultibackendEnabled: Bool
     public let registrationAnalyticsTracker: (any RegistrationAnalyticsTrackerProtocol)?
 
     @MainActor public var bridge: WireAuthenticationBridge {
@@ -69,7 +68,6 @@ final class RootComponent: BootstrapComponent {
         ssoCallbackURLScheme: String,
         appStoreURL: URL,
         accountsPublisher: CurrentValuePublisher<[AccountUIModel]>,
-        isMultibackendEnabled: Bool,
         registrationAnalyticsTracker: (any RegistrationAnalyticsTrackerProtocol)?
     ) {
         self.authenticationType = authenticationType
@@ -85,7 +83,6 @@ final class RootComponent: BootstrapComponent {
         self.ssoCallbackURLScheme = ssoCallbackURLScheme
         self.appStoreURL = appStoreURL
         self.accountsPublisher = accountsPublisher
-        self.isMultibackendEnabled = isMultibackendEnabled
         self.registrationAnalyticsTracker = registrationAnalyticsTracker
     }
 
@@ -119,7 +116,6 @@ extension RootComponent: RootViewModel.Factory {
                 bridge: bridge,
                 environment: environment,
                 authenticationType: authenticationType,
-                isMultibackendEnabled: isMultibackendEnabled,
                 hasOtherAccountsProvider: { [accountsPublisher] in
                     !accountsPublisher.value.isEmpty
                 }

WireAuthentication/Sources/WireAuthentication/WireAuthenticationAssembly.swift

@@ -50,7 +50,6 @@ public struct WireAuthenticationAssembly {
         ssoCallbackURLScheme: String,
         appStoreURL: URL,
         accountsPublisher: CurrentValuePublisher<[AccountUIModel]>,
-        isMultibackendEnabled: Bool,
         registrationAnalyticsTracker: (any RegistrationAnalyticsTrackerProtocol)?
     ) -> (view: some View, bridge: WireAuthenticationBridge) {
         let rootComponent = RootComponent(
@@ -66,7 +65,6 @@ public struct WireAuthenticationAssembly {
             ssoCallbackURLScheme: ssoCallbackURLScheme,
             appStoreURL: appStoreURL,
             accountsPublisher: accountsPublisher,
-            isMultibackendEnabled: isMultibackendEnabled,
             registrationAnalyticsTracker: registrationAnalyticsTracker
         )
 

WireAuthentication/Sources/WireAuthenticationUI/Mocks/FakeDetermineAuthMethodFactory.swift

@@ -39,8 +39,7 @@ struct FakeDetermineAuthMethodFactory: DetermineAuthMethodFactory,
             router: FakeRootFactory().viewModel,
             bridge: WireAuthenticationBridge(),
             environment: mockDependencies.backendEnvironment,
-            existsAnotherAccount: existsAnotherAccount,
-            isMultibackendEnabled: false
+            existsAnotherAccount: existsAnotherAccount
         )
         viewModel.emailOrSSOCode = emailOrSSOCode
         return viewModel

WireAuthentication/Sources/WireAuthenticationUI/Mocks/FakeRootFactory.swift

@@ -31,7 +31,6 @@ struct FakeRootFactory: RootFactory, OpenAppStoreUseCaseFactory {
             bridge: WireAuthenticationBridge(),
             environment: mockDependencies.backendEnvironment,
             authenticationType: .new,
-            isMultibackendEnabled: false,
             hasOtherAccountsProvider: { true },
         )
     }

WireAuthentication/Sources/WireAuthenticationUI/Views/DetermineAuthMethod/DetermineAuthMethodViewModel.swift

@@ -56,7 +56,6 @@ package final class DetermineAuthMethodViewModel: ObservableObject {
     private let bridge: WireAuthenticationBridge
     package let environment: BackendEnvironment2
     private var cancellable: AnyCancellable?
-    private let isMultibackendEnabled: Bool
 
     // MARK: - Life cycle
 
@@ -68,7 +67,6 @@ package final class DetermineAuthMethodViewModel: ObservableObject {
         emailOrSSOCode: String = "",
         existsAnotherAccount: Bool,
         isLoading: Bool = false,
-        isMultibackendEnabled: Bool
     ) {
         self.factory = factory
         self.router = router
@@ -77,7 +75,6 @@ package final class DetermineAuthMethodViewModel: ObservableObject {
         self.emailOrSSOCode = emailOrSSOCode
         self.existsAnotherAccount = existsAnotherAccount
         self.isLoading = isLoading
-        self.isMultibackendEnabled = isMultibackendEnabled
 
         self.cancellable = bridge.inboundEvents.sink { [weak self] event in
             switch event {
@@ -206,7 +203,7 @@ package final class DetermineAuthMethodViewModel: ObservableObject {
         email: String?,
         backendConfigURL: URL
     ) async {
-        guard isMultibackendEnabled || !existsAnotherAccount else {
+        guard !existsAnotherAccount else { // double check this
             alert = .switchBackendFailed
             return
         }

WireAuthentication/Sources/WireAuthenticationUI/Views/Root/RootView.swift

@@ -65,8 +65,8 @@ package struct RootView: View {
                             switch alert {
                             case .obsoleteClient:
                                 Text(
-                                    viewModel.isMultibackendEnabled ? L10n.Localizable.ObsoleteClientMultibackend.Alert
-                                        .title : L10n.Localizable.ObsoleteClient.Alert.title
+                                    L10n.Localizable.ObsoleteClientMultibackend.Alert
+                                        .title
                                 )
                             default:
                                 Text(alert.title)
@@ -75,15 +75,10 @@ package struct RootView: View {
                         message: { alert in
                             switch alert {
                             case .obsoleteBackend:
-                                Text(
-                                    viewModel.isMultibackendEnabled ? L10n.Localizable.ObsoleteBackendMultibackend.Alert
-                                        .message : L10n.Localizable.ObsoleteBackend.Alert.message
-                                )
+                                Text(L10n.Localizable.ObsoleteBackendMultibackend.Alert.message)
                             case .obsoleteClient:
-                                Text(
-                                    viewModel.isMultibackendEnabled ? L10n.Localizable.ObsoleteClientMultibackend
-                                        .Alert.message : L10n.Localizable.ObsoleteClient.Alert.message
-                                )
+                                Text(L10n.Localizable.ObsoleteClientMultibackend
+                                    .Alert.message)
                             default:
                                 Text(alert.message)
                             }
@@ -92,7 +87,7 @@ package struct RootView: View {
                             switch alert {
                             case .obsoleteClient:
                                 obsoleteClientAlertActions()
-                            case .obsoleteBackend where viewModel.isMultibackendEnabled:
+                            case .obsoleteBackend:
                                 obsoleteBackendAlertActions()
                             case .logoutConfirmation:
                                 logoutConfirmationButtons
@@ -165,17 +160,15 @@ package struct RootView: View {
     @ViewBuilder
     private func obsoleteClientAlertActions() -> some View {
         Button(
-            viewModel.isMultibackendEnabled ? Strings.Obsolete.Alert.updateButton : Strings.ObsoleteClient.Alert
-                .okButton,
+            Strings.Obsolete.Alert.updateButton,
             action: viewModel.goToAppStore
         )
         switchAccountsAlertButtonIfNeeded()
-        if viewModel.isMultibackendEnabled {
-            Button(
-                Strings.Obsolete.Alert.cancel,
-                action: viewModel.dismissAlert
-            )
-        }
+
+        Button(
+            Strings.Obsolete.Alert.cancel,
+            action: viewModel.dismissAlert
+        )
     }
 
     @ViewBuilder private var logoutConfirmationButtons: some View {

WireAuthentication/Sources/WireAuthenticationUI/Views/Root/RootViewModel.swift

@@ -35,11 +35,10 @@ package final class RootViewModel: ObservableObject, Router {
     @Published var modalDestination: RootViewSheet?
     @Published var alert: Alert?
 
-    let isMultibackendEnabled: Bool
     let hasOtherAccountsProvider: () -> Bool
 
     var shouldShowSwitchAccountsAlertButton: Bool {
-        isMultibackendEnabled && hasOtherAccountsProvider()
+        hasOtherAccountsProvider()
     }
 
     // MARK: - Dependencies
@@ -56,11 +55,9 @@ package final class RootViewModel: ObservableObject, Router {
         bridge: WireAuthenticationBridge,
         environment: BackendEnvironment2,
         authenticationType: AuthenticationType,
-        isMultibackendEnabled: Bool,
         hasOtherAccountsProvider: @escaping () -> Bool
     ) {
         self.factory = factory
-        self.isMultibackendEnabled = isMultibackendEnabled
         self.hasOtherAccountsProvider = hasOtherAccountsProvider
         self.bridge = bridge
 

WirePreviewApps/WireAuthenticationApp/ContentView.swift

@@ -32,6 +32,7 @@ struct ContentView: View {
     var body: some View {
         WireAuthenticationAssembly()
             .assemble(
+                authenticationType: .new,
                 environmentType: configuration.defaultBackendEnvironment,
                 environment: BackendEnvironment2(
                     title: "Mock backend",
@@ -79,7 +80,6 @@ struct ContentView: View {
                         ]
                     )
                 ),
-                isMultibackendEnabled: true,
                 registrationAnalyticsTracker: MockPersonalAccountCreationAnalyticsTracker()
             ).view
     }

wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack.swift

@@ -132,7 +132,11 @@ public final class CoreDataStack: NSObject, CoreDataStackProtocol, ContextProvid
         #endif
     }
 
-    public lazy var syncContext: NSManagedObjectContext = messagesContainer.newBackgroundContext()
+    public lazy var syncContext: NSManagedObjectContext = {
+        let context = messagesContainer.newBackgroundContext()
+        context.markAsSyncContext()
+        return context
+    }()
 
     public lazy var searchContext: NSManagedObjectContext = messagesContainer.newBackgroundContext()
 
@@ -391,7 +395,7 @@ public final class CoreDataStack: NSObject, CoreDataStackProtocol, ContextProvid
     }
 
     func configureSyncContext(_ context: NSManagedObjectContext) async {
-        context.markAsSyncContext()
+        // Note: markAsSyncContext() is now called in the lazy initializer
         await context.perform {
             context.localDomain = self.localDomain
             context.isFederationEnabled = self.isFederationEnabled

wire-ios-data-model/Source/Model/Conversation/ZMConversation+Creation.swift

@@ -60,9 +60,9 @@ public extension ZMConversation {
         created: UnsafeMutablePointer<Bool>
     ) -> ZMConversation {
         // We must only ever call this on the sync context. Otherwise, there's a race condition
-        // where the UI and sync contexts could both insert the same user (same UUID) and we'd end up
-        // having two duplicates of that user, and we'd have a really hard time recovering from that.
-        require(context.zm_isSyncContext, "Users are only allowed to be created on sync context")
+        // where the UI and sync contexts could both insert the same conversation (same UUID) and we'd end up
+        // having two duplicates of that conversation, and we'd have a really hard time recovering from that.
+        require(context.zm_isSyncContext, "Conversations are only allowed to be created on sync context")
         let domain: String? = context.isFederationEnabled ? domain : nil
 
         if let conversation = fetch(with: remoteIdentifier, domain: domain, in: context) {