Use the ClientFactory pattern everywhere replacing raw ClientBuilders.

# Conflicts: # ElementX/Sources/Services/UserSession/UserSessionStore.swift # NSE/Sources/NSEUserSession.swift
2026-11-03 06:55:59 +00:00 · 2026-08-20 11:50:18 +01:00
parent 5481f35727
commit 9c65d36101
22 changed files with 571 additions and 377 deletions
@@ -1,73 +0,0 @@
-//
-// Copyright 2025 Element Creations Ltd.
-// Copyright 2024-2025 New Vector Ltd.
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
-// Please see LICENSE files in the repository root for full details.
-//
-
-import Foundation
-import MatrixRustSDK
-
-nonisolated extension ClientBuilder {
-    /// A helper method that applies the common builder modifiers needed for the app.
-    static func baseBuilder(setupEncryption: Bool = true,
-                            httpProxy: String? = nil,
-                            slidingSync: ClientBuilderSlidingSync,
-                            sessionDelegate: ClientSessionDelegate,
-                            appHooks: AppHooks,
-                            enableOnlySignedDeviceIsolationMode: Bool,
-                            requestTimeout: UInt64? = 30000,
-                            maxRequestRetryTime: UInt64? = nil,
-                            threadsEnabled: Bool) -> ClientBuilder {
-        var builder = ClientBuilder()
-            .crossProcessLockConfig(crossProcessLockConfig: .multiProcess(holderName: InfoPlistReader.main.bundleIdentifier))
-            .setSessionDelegate(sessionDelegate: sessionDelegate)
-            .userAgent(userAgent: UserAgentBuilder.makeASCIIUserAgent())
-            .threadsEnabled(enabled: threadsEnabled, threadSubscriptions: threadsEnabled)
-            .requestConfig(config: .init(retryLimit: 3, // Must be non-zero for the SDK to retry API calls when rate-limited.
-                                         timeout: requestTimeout,
-                                         maxConcurrentRequests: nil,
-                                         maxRetryTime: maxRequestRetryTime))
-            .dmRoomDefinition(dmRoomDefinition: .twoMembers)
-        
-        builder = switch slidingSync {
-        case .restored: builder
-        case .discover: builder.slidingSyncVersionBuilder(versionBuilder: .discoverNative)
-        }
-        
-        if setupEncryption {
-            builder = builder
-                .autoEnableCrossSigning(autoEnableCrossSigning: true)
-                .backupDownloadStrategy(backupDownloadStrategy: .afterDecryptionFailure)
-                .enableShareHistoryOnInvite(enableShareHistoryOnInvite: true)
-                .autoEnableBackups(autoEnableBackups: true)
-        }
-        
-        // Set recipient strategy and trust requirement even if `setupEncryption` is false to ensure messages
-        // from insecure devices aren't displayed in push notifications.
-        // See https://github.com/element-hq/element-x-ios/issues/4702.
-        if enableOnlySignedDeviceIsolationMode {
-            builder = builder
-                .roomKeyRecipientStrategy(strategy: .identityBasedStrategy)
-                .decryptionSettings(decryptionSettings: .init(senderDeviceTrustRequirement: .crossSignedOrLegacy))
-        } else {
-            builder = builder
-                .roomKeyRecipientStrategy(strategy: .errorOnVerifiedUserProblem)
-                .decryptionSettings(decryptionSettings: .init(senderDeviceTrustRequirement: .untrusted))
-        }
-        
-        if let httpProxy {
-            builder = builder.proxy(url: httpProxy)
-        }
-        
-        return appHooks.clientBuilderHook.configure(builder)
-    }
-}
-
-enum ClientBuilderSlidingSync {
-    /// Sliding sync will be configured when restoring the Session.
-    case restored
-    /// Sliding sync must be discovered whilst building the session.
-    case discover
-}