fix: Crash unwrapping MainCoordinator.splitViewController - WPB-145…

…10 (#2209) Co-authored-by: Sam Wyndham <[email protected]>
wireapp · Nov 26, 2024 · 4a5aa1e · 4a5aa1e
1 parent 163ce55
commit 4a5aa1e
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 17 deletions.
diff --git a/wire-ios/Tests/Sourcery/generated/AutoMockable.generated.swift b/wire-ios/Tests/Sourcery/generated/AutoMockable.generated.swift
diff --git a/...sationListViewController+NavigationBar/ConversationListViewController+NavigationBar.swift b/...sationListViewController+NavigationBar/ConversationListViewController+NavigationBar.swift
@@ -341,7 +341,9 @@ extension ConversationListViewController: ConversationListContainerViewModelDele
     @objc
     private func presentProfile() {
         Task {
-            let selfProfileUI = UINavigationController(rootViewController: selfProfileViewControllerBuilder.build())
+            let selfProfileUI = UINavigationController(
+                rootViewController: selfProfileViewControllerBuilder.build(mainCoordinator: mainCoordinator)
+            )
             selfProfileUI.modalPresentationStyle = .formSheet
             await mainCoordinator.presentViewController(selfProfileUI)
         }

diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/MainController/SidebarViewControllerDelegate.swift b/wire-ios/Wire-iOS/Sources/UserInterface/MainController/SidebarViewControllerDelegate.swift
@@ -42,7 +42,9 @@ final class SidebarViewControllerDelegate: WireSidebarUI.SidebarViewControllerDe
     @MainActor
     public func sidebarViewControllerDidSelectAccountImage(_ viewController: SidebarViewController) {
         Task {
-            let selfProfileUI = UINavigationController(rootViewController: selfProfileUIBuilder.build())
+            let selfProfileUI = UINavigationController(
+                rootViewController: selfProfileUIBuilder.build(mainCoordinator: mainCoordinator)
+            )
             selfProfileUI.modalPresentationStyle = .formSheet
             await mainCoordinator.presentViewController(selfProfileUI)
         }

diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController.swift
@@ -285,8 +285,6 @@ final class ZClientViewController: UIViewController {
         mainSplitViewController.borderColor = ColorTheme.Strokes.outline
         mainSplitViewController.conversationListUI = conversationListViewController
 
-        selfProfileViewControllerBuilder.mainCoordinator = .init(mainCoordinator: mainCoordinator)
-
         settingsViewControllerBuilder.settingsPropertyFactoryDelegate = defaultSettingsPropertyFactoryDelegate
         mainTabBarController.archiveUI = archiveUI
         mainTabBarController.settingsUI = settingsViewControllerBuilder

diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/SelfProfile/SelfProfileViewControllerBuilder.swift b/wire-ios/Wire-iOS/Sources/UserInterface/SelfProfile/SelfProfileViewControllerBuilder.swift
@@ -26,7 +26,6 @@ final class SelfProfileViewControllerBuilder: SelfProfileViewControllerBuilderPr
     var selfUser: SettingsSelfUser
     var userRightInterfaceType: UserRightInterface.Type
     var userSession: UserSession
-    var mainCoordinator: AnyMainCoordinator!
     var accountSelector: AccountSelector?
     var trackingManager: TrackingManager?
 
@@ -42,7 +41,7 @@ final class SelfProfileViewControllerBuilder: SelfProfileViewControllerBuilderPr
         self.accountSelector = accountSelector
     }
 
-    func build() -> UIViewController {
+    func build(mainCoordinator: AnyMainCoordinator) -> UIViewController {
         SelfProfileViewController(
             selfUser: selfUser,
             userRightInterfaceType: userRightInterfaceType,

diff --git a/...Wire-iOS/Sources/UserInterface/SelfProfile/SelfProfileViewControllerBuilderProtocol.swift b/...Wire-iOS/Sources/UserInterface/SelfProfile/SelfProfileViewControllerBuilderProtocol.swift
@@ -21,5 +21,5 @@ import UIKit
 // sourcery: AutoMockable
 protocol SelfProfileViewControllerBuilderProtocol {
     @MainActor
-    func build() -> UIViewController
+    func build(mainCoordinator: AnyMainCoordinator) -> UIViewController
 }
diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileViewController.swift
@@ -381,7 +381,9 @@ extension ProfileViewController: ProfileFooterViewDelegate, IncomingRequestFoote
 
     private func openSelfProfile() {
         Task {
-            let selfProfileUI = UINavigationController(rootViewController: selfProfileUIBuilder.build())
+            let selfProfileUI = UINavigationController(
+                rootViewController: selfProfileUIBuilder.build(mainCoordinator: mainCoordinator)
+            )
             selfProfileUI.modalPresentationStyle = .formSheet
             await mainCoordinator.presentViewController(selfProfileUI)
         }