ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-10-31 08:15:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the ClientFactory pattern everywhere replacing raw ClientBuilders.

Browse Source 
# Conflicts:
#	ElementX/Sources/Services/UserSession/UserSessionStore.swift
#	NSE/Sources/NSEUserSession.swift
This commit is contained in:
Doug
2026-08-20 11:50:18 +01:00
committed by Doug
parent 5481f35727
commit 9c65d36101
22 changed files with 571 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NSE/Sources/NSEUserSession.swift
+9 -24
View File
@@ -18,7 +18,7 @@ nonisolated protocol NSEUserSessionProtocol {
final nonisolated class NSEUserSession: NSEUserSessionProtocol {
private let appSettings: CommonSettingsProtocol
private let baseClient: Client
private let baseClient: ClientProtocol
private let notificationClient: NotificationClient
private let userID: String
private(set) lazy var mediaProvider: MediaProviderProtocol = MediaProvider(mediaLoader: MediaLoader(client: baseClient),
@@ -55,29 +55,17 @@ final nonisolated class NSEUserSession: NSEUserSessionProtocol {
init(credentials: KeychainCredentials,
roomID: String,
clientSessionDelegate: ClientSessionDelegate,
appHooks: AppHooks,
appSettings: CommonSettingsProtocol) async throws {
clientFactory: ClientFactoryProtocol = ClientFactory(),
appSettings: CommonSettingsProtocol,
appHooks: AppHooks) async throws {
userID = credentials.userID
self.appSettings = appSettings
let homeserverURL = credentials.restorationToken.session.homeserverUrl
let clientBuilder = ClientBuilder
.baseBuilder(setupEncryption: false,
httpProxy: URL(string: homeserverURL)?.globalProxy,
slidingSync: .restored,
sessionDelegate: clientSessionDelegate,
appHooks: appHooks,
enableOnlySignedDeviceIsolationMode: appSettings.enableOnlySignedDeviceIsolationMode,
requestTimeout: 15000,
maxRequestRetryTime: 5000,
threadsEnabled: appSettings.threadsEnabled)
.systemIsMemoryConstrained()
.sqliteStore(config: .init(dataPath: credentials.restorationToken.sessionDirectories.dataPath,
cachePath: credentials.restorationToken.sessionDirectories.cachePath)
.passphrase(passphrase: credentials.restorationToken.passphrase))
.homeserverUrl(url: homeserverURL)
baseClient = try await clientBuilder.build()
baseClient = try await clientFactory.makeNSEClient(credentials: credentials,
roomID: roomID,
clientSessionDelegate: clientSessionDelegate,
appSettings: appSettings,
appHooks: appHooks)
do {
try await baseClient.setPresence(presence: .offline, immediate: false)
@@ -86,9 +74,6 @@ final nonisolated class NSEUserSession: NSEUserSessionProtocol {
}
delegateHandle = try baseClient.setDelegate(delegate: ClientDelegateWrapper())
try await baseClient.restoreSessionWith(session: credentials.restorationToken.session,
roomLoadSettings: .one(roomId: roomID))
// Inject the content scanner so the SDK gates the media it downloads whilst building the notification.
if let contentScannerURL = appSettings.contentScannerURL.publisher.value {
let contentScanner = ContentScanner(scannerUrl: contentScannerURL.absoluteString)
NSE/Sources/NotificationServiceExtension.swift
+2 -2
View File
@@ -177,8 +177,8 @@ actor NotificationServiceExtensionActor {
let userSession = try await NSEUserSession(credentials: credentials,
roomID: roomID,
clientSessionDelegate: keychainController,
appHooks: appHooks,
appSettings: settings)
appSettings: settings,
appHooks: appHooks)
notificationHandler = NotificationHandler(userSession: userSession,
settings: settings,