Add a new UserHooks container and move some AppHooks. (#6332)

* Add a UserHooks system with just the CreateRoomScreenHook for now.

* Move more hooks into UserHooks.

* Pass the ClientProxy to makeUserHooks instead of calling AppHooks.configure(with:).

* Update the Enterprise submodule.

ElementX/Sources/AppHooks/AppHooks.swift

@@ -12,10 +12,6 @@ import Synchronization
 
 final nonisolated class AppHooks: AppHooksProtocol {
     #if IS_MAIN_APP
-    func configure(with userSession: UserSessionProtocol?) async {
-        await userSessionHook.configure(with: userSession)
-    }
-    
     @AppHook(default: DefaultAppSettingsHook())
     var appSettingsHook: AppSettingsHookProtocol
     
@@ -28,29 +24,8 @@ final nonisolated class AppHooks: AppHooksProtocol {
     @AppHook(default: DefaultOAuthPresenterHook())
     var oAuthPresenterHook: OAuthPresenterHookProtocol
     
-    @AppHook(default: DefaultRoomScreenHook())
-    var roomScreenHook: RoomScreenHookProtocol
-    
-    @AppHook(default: DefaultRoomDetailsScreenHook())
-    var roomDetailsScreenHook: RoomDetailsScreenHookProtocol
-    
-    @AppHook(default: DefaultRoomMemberDetailsScreenHook())
-    var roomMemberDetailsScreenHook: RoomMemberDetailsScreenHookProtocol
-    
-    @AppHook(default: DefaultUserProfileScreenHook())
-    var userProfileScreenHook: UserProfileScreenHookProtocol
-    
     @AppHook(default: DefaultDeveloperOptionsScreenHook())
     var developerOptionsScreenHook: DeveloperOptionsScreenHookProtocol
-    
-    @AppHook(default: DefaultRecoveryKeyScreenHook())
-    var recoveryKeyScreenHook: RecoveryKeyScreenHookProtocol
-    
-    @AppHook(default: DefaultCreateRoomScreenHook())
-    var createRoomScreenHook: CreateRoomScreenHookProtocol
-    
-    @AppHook(default: DefaultSecurityAndPrivacyScreenHook())
-    var securityAndPrivacyScreenHook: SecurityAndPrivacyScreenHookProtocol
     #endif
     
     @AppHook(default: DefaultTracingHook())

ElementX/Sources/AppHooks/Hooks/UserSessionHook.swift

@@ -9,7 +9,7 @@ import MatrixRustSDK
 
 nonisolated protocol UserSessionHookProtocol: Sendable {
     #if IS_MAIN_APP
-    func configure(with userSession: UserSessionProtocol?) async
+    @MainActor func makeUserHooks(for clientProxy: ClientProxyProtocol) -> UserHooks
     #endif
     
     func configure(_ userSettings: UserSettings, forHomeserver homeserver: String) -> UserSettings
@@ -17,7 +17,9 @@ nonisolated protocol UserSessionHookProtocol: Sendable {
 
 nonisolated struct DefaultUserSessionHook: UserSessionHookProtocol {
     #if IS_MAIN_APP
-    func configure(with userSession: UserSessionProtocol?) async { }
+    func makeUserHooks(for clientProxy: ClientProxyProtocol) -> UserHooks {
+        UserHooks()
+    }
     #endif
     
     func configure(_ userSettings: UserSettings, forHomeserver homeserver: String) -> UserSettings {

ElementX/Sources/AppHooks/UserHooks.swift

@@ -0,0 +1,34 @@
+//
+// Copyright 2026 Element Creations 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
+
+nonisolated struct UserHooks: Sendable {
+    let roomScreenHook: RoomScreenHookProtocol
+    let roomDetailsScreenHook: RoomDetailsScreenHookProtocol
+    let roomMemberDetailsScreenHook: RoomMemberDetailsScreenHookProtocol
+    let userProfileScreenHook: UserProfileScreenHookProtocol
+    let recoveryKeyScreenHook: RecoveryKeyScreenHookProtocol
+    let createRoomScreenHook: CreateRoomScreenHookProtocol
+    let securityAndPrivacyScreenHook: SecurityAndPrivacyScreenHookProtocol
+    
+    init(roomScreenHook: RoomScreenHookProtocol = DefaultRoomScreenHook(),
+         roomDetailsScreenHook: RoomDetailsScreenHookProtocol = DefaultRoomDetailsScreenHook(),
+         roomMemberDetailsScreenHook: RoomMemberDetailsScreenHookProtocol = DefaultRoomMemberDetailsScreenHook(),
+         userProfileScreenHook: UserProfileScreenHookProtocol = DefaultUserProfileScreenHook(),
+         recoveryKeyScreenHook: RecoveryKeyScreenHookProtocol = DefaultRecoveryKeyScreenHook(),
+         createRoomScreenHook: CreateRoomScreenHookProtocol = DefaultCreateRoomScreenHook(),
+         securityAndPrivacyScreenHook: SecurityAndPrivacyScreenHookProtocol = DefaultSecurityAndPrivacyScreenHook()) {
+        self.roomScreenHook = roomScreenHook
+        self.roomDetailsScreenHook = roomDetailsScreenHook
+        self.roomMemberDetailsScreenHook = roomMemberDetailsScreenHook
+        self.userProfileScreenHook = userProfileScreenHook
+        self.recoveryKeyScreenHook = recoveryKeyScreenHook
+        self.createRoomScreenHook = createRoomScreenHook
+        self.securityAndPrivacyScreenHook = securityAndPrivacyScreenHook
+    }
+}