Merge pull request #891 from tchapgouv/837-inviter-a-rejoindre-tchap-…

…erreur-avec-le-mainlining-1-83 837 inviter a rejoindre tchap erreur avec le mainlining 1 83
tchapgouv · Oct 12, 2023 · ff44486 · ff44486
2 parents 5109571 + 52e76b0
commit ff44486
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 424 deletions.
diff --git a/Riot/Modules/Application/AppCoordinator.swift b/Riot/Modules/Application/AppCoordinator.swift
@@ -591,9 +591,6 @@ extension AppCoordinator: SplitViewCoordinatorDelegate {
 // MARK: - SideMenuCoordinatorDelegate
 extension AppCoordinator: SideMenuCoordinatorDelegate {
     func sideMenuCoordinator(_ coordinator: SideMenuCoordinatorType, didTapMenuItem menuItem: SideMenuItem, fromSourceView sourceView: UIView) {
-        if menuItem == .inviteFriends {
-            self.splitViewCoordinator?.presentInvitePeople()
-        }
     }
 }
 

diff --git a/Riot/Modules/Home/AllChats/AllChatsCoordinator.swift b/Riot/Modules/Home/AllChats/AllChatsCoordinator.swift
@@ -30,11 +30,6 @@ class AllChatsCoordinatorParameters {
 }
 
 class AllChatsCoordinator: NSObject, SplitViewMasterCoordinatorProtocol {
-    func presentInvitePeople() {
-        //
-    }
-
-
     // MARK: Properties
 
     // MARK: Private
@@ -80,8 +75,6 @@ class AllChatsCoordinator: NSObject, SplitViewMasterCoordinatorProtocol {
 
     private var indicators = [UserIndicator]()
     private var signOutFlowPresenter: SignOutFlowPresenter?
-    // Tchap: Add invite service for user invitation
-    private var inviteService: InviteServiceType?
     private var errorPresenter: ErrorPresenter?
     private weak var currentAlertController: UIAlertController?
 
@@ -361,7 +354,7 @@ class AllChatsCoordinator: NSObject, SplitViewMasterCoordinatorProtocol {
                 !UserService.isExternalUser(for: userID) {
                 subMenuActions.append(UIAction(title: TchapL10n.sideMenuActionInviteFriends, image: UIImage(systemName: "square.and.arrow.up.fill")) { [weak self] action in
                     guard let self = self else { return }
-                    self.showInviteFriends(from: self.avatarMenuButton)
+                    self.allChatsViewController.startChat()
                 })
             }
         }
@@ -653,17 +646,14 @@ class AllChatsCoordinator: NSObject, SplitViewMasterCoordinatorProtocol {
 //    }
 
     private func showInviteFriends(from sourceView: UIView?) {
-        // Tchap: Use Tchap specific mechanism.
-        promptUserToFillAnEmailToInvite { [weak self] email in
-            self?.sendEmailInvite(to: email)
-        }
-
-//        let myUserId = self.parameters.userSessionsService.mainUserSession?.userId ?? ""
-//
-//        let inviteFriendsPresenter = InviteFriendsPresenter()
-//        inviteFriendsPresenter.present(for: myUserId, from: self.navigationRouter.toPresentable(), sourceView: sourceView, animated: true)
-    }
-
+ // Tchap: commented because Tchap now uses Element Direct Message mechanism
+
+ //        let myUserId = self.parameters.userSessionsService.mainUserSession?.userId ?? ""
+ //
+ //        let inviteFriendsPresenter = InviteFriendsPresenter()
+ //        inviteFriendsPresenter.present(for: myUserId, from: self.navigationRouter.toPresentable(), sourceView: sourceView, animated: true)
+     }
+
     private func showBugReport() {
         let bugReportViewController = BugReportViewController()
 
@@ -918,73 +908,6 @@ extension AllChatsCoordinator {
 
         self.navigationRouter.toPresentable().present(alertController, animated: true)
     }
-
-    private func sendEmailInvite(to email: String) {
-        guard let session = self.currentMatrixSession else { return }
-        if self.inviteService == nil {
-            self.inviteService = InviteService(session: session)
-        }
-        guard let inviteService = self.inviteService else { return }
-
-        self.activityIndicatorPresenter.presentActivityIndicator(on: self.navigationRouter.toPresentable().view, animated: true)
-        inviteService.sendEmailInvite(to: email) { [weak self] (response) in
-            guard let sself = self else {
-                return
-            }
-
-            sself.activityIndicatorPresenter.removeCurrentActivityIndicator(animated: true)
-            switch response {
-            case .success(let result):
-                var message: String
-                var discoveredUserID: String?
-                switch result {
-                case .inviteHasBeenSent(roomID: _):
-                    message = TchapL10n.inviteSendingSucceeded
-                case .inviteAlreadySent(roomID: _):
-                    message = TchapL10n.inviteAlreadySentByEmail(email)
-                case .inviteIgnoredForDiscoveredUser(userID: let userID):
-                    discoveredUserID = userID
-                    message = TchapL10n.inviteNotSentForDiscoveredUser
-                case .inviteIgnoredForUnauthorizedEmail:
-                    message = TchapL10n.inviteNotSentForUnauthorizedEmail(email)
-                }
-
-                sself.currentAlertController?.dismiss(animated: false)
-
-                let alert = UIAlertController(title: TchapL10n.inviteInformationTitle, message: message, preferredStyle: .alert)
-
-                let okTitle = VectorL10n.ok
-                let okAction = UIAlertAction(title: okTitle, style: .default, handler: { action in
-                    if let userID = discoveredUserID {
-                        // Open the discussion
-                        AppDelegate.theDelegate().startDirectChat(withUserId: userID, completion: nil)
-                    }
-                })
-                alert.addAction(okAction)
-                sself.currentAlertController = alert
-
-                sself.navigationRouter.toPresentable().present(alert, animated: true, completion: nil)
-            case .failure(let error):
-                let errorPresentable = sself.inviteErrorPresentable(from: error)
-                sself.errorPresenter?.present(errorPresentable: errorPresentable, animated: true)
-            }
-        }
-    }
-
-    private func inviteErrorPresentable(from error: Error) -> ErrorPresentable {
-        let errorTitle = TchapL10n.inviteSendingFailedTitle
-        let errorMessage: String
-
-        let nsError = error as NSError
-
-        if let message = nsError.userInfo[NSLocalizedDescriptionKey] as? String {
-            errorMessage = message
-        } else {
-            errorMessage = TchapL10n.errorMessageDefault
-        }
-
-        return ErrorPresentableImpl(title: errorTitle, message: errorMessage)
-    }
 }
 
 // Tchap: Add delegate for Room Preview

diff --git a/Riot/Modules/SideMenu/SideMenuCoordinator.swift b/Riot/Modules/SideMenu/SideMenuCoordinator.swift
@@ -239,6 +239,8 @@ final class SideMenuCoordinator: NSObject, SideMenuCoordinatorType {
     }
 
     private func showInviteFriends(from sourceView: UIView?) {
+// Tchap: commented because Tchap now uses Element Direct Message mechanism
+
 //        let myUserId = self.parameters.userSessionsService.mainUserSession?.userId ?? ""
 //
 //        let inviteFriendsPresenter = InviteFriendsPresenter()

diff --git a/Riot/Modules/SplitView/SplitViewCoordinator.swift b/Riot/Modules/SplitView/SplitViewCoordinator.swift
@@ -167,10 +167,6 @@ final class SplitViewCoordinator: NSObject, SplitViewCoordinatorType {
     func showAppStateIndicator(with text: String, icon: UIImage?, action: ToastViewState.Action? = nil) {
         masterCoordinator?.showAppStateIndicator(with: text, icon: icon, action: action) // Tchap : add tap action
     }
-
-    func presentInvitePeople() {
-        masterCoordinator?.presentInvitePeople()
-    }
 
     // MARK: - Private methods
 

diff --git a/Riot/Modules/SplitView/SplitViewCoordinatorType.swift b/Riot/Modules/SplitView/SplitViewCoordinatorType.swift
@@ -45,8 +45,4 @@ protocol SplitViewCoordinatorType: Coordinator, Presentable {
 
     /// Hide the message related to the application state currently displayed.
     func hideAppStateIndicator()
-
-    // Tchap: redirect to invite people alert
-    /// Present invite people alert (with textField)
-    func presentInvitePeople()
 }
diff --git a/Riot/Modules/TabBar/SplitViewMasterCoordinatorProtocol.swift b/Riot/Modules/TabBar/SplitViewMasterCoordinatorProtocol.swift
@@ -46,8 +46,4 @@ protocol SplitViewMasterCoordinatorProtocol: Coordinator, SplitViewMasterPresent
 
     /// Hide the message related to the application state currently displayed.
     func hideAppStateIndicator()
-
-    // Tchap: redirect to invite people alert
-    /// Present invite people alert (with textField)
-    func presentInvitePeople()
 }
diff --git a/Riot/Modules/TabBar/TabBarCoordinator.swift b/Riot/Modules/TabBar/TabBarCoordinator.swift
@@ -70,8 +70,6 @@ final class TabBarCoordinator: NSObject, SplitViewMasterCoordinatorProtocol {
     }
 
     private var indicators = [UserIndicator]()
-    // Tchap: Add invite service for user invitation
-    private var inviteService: InviteServiceType?
     private var errorPresenter: ErrorPresenter?
     private weak var currentAlertController: UIAlertController?
 
@@ -239,12 +237,6 @@ final class TabBarCoordinator: NSObject, SplitViewMasterCoordinatorProtocol {
         appSateIndicator = nil
     }
 
-    func presentInvitePeople() {
-        promptUserToFillAnEmailToInvite { [weak self] email in
-            self?.sendEmailInvite(to: email)
-        }
-    }
-
     // MARK: - SplitViewMasterPresentable
 
     var selectedNavigationRouter: NavigationRouterType? {
@@ -263,10 +255,12 @@ final class TabBarCoordinator: NSObject, SplitViewMasterCoordinatorProtocol {
     }
 
     private func showInviteFriends(from sourceView: UIView?) {
-        let myUserId = self.parameters.userSessionsService.mainUserSession?.userId ?? ""
-
-        let inviteFriendsPresenter = InviteFriendsPresenter()
-        inviteFriendsPresenter.present(for: myUserId, from: self.navigationRouter.toPresentable(), sourceView: sourceView, animated: true)
+// Tchap: commented because Tchap now uses Element Direct Message mechanism
+
+//        let myUserId = self.parameters.userSessionsService.mainUserSession?.userId ?? ""
+//        
+//        let inviteFriendsPresenter = InviteFriendsPresenter()
+//        inviteFriendsPresenter.present(for: myUserId, from: self.navigationRouter.toPresentable(), sourceView: sourceView, animated: true)
     }
 
     private func showBugReport() {
@@ -798,7 +792,7 @@ final class TabBarCoordinator: NSObject, SplitViewMasterCoordinatorProtocol {
         var subMenuActions: [UIAction] = []
         if BuildSettings.sideMenuShowInviteFriends {
             subMenuActions.append(UIAction(title: VectorL10n.inviteTo(AppInfo.current.displayName), image: UIImage(systemName: "envelope")) { [weak self] action in
-                        self?.showInviteFriends(from: nil)
+                self?.showInviteFriends(from: nil)
             })
         }
 
@@ -1019,73 +1013,6 @@ extension TabBarCoordinator {
 
         masterTabBarController.present(alertController, animated: true)
     }
-
-    private func sendEmailInvite(to email: String) {
-        guard let session = self.currentMatrixSession else { return }
-        if self.inviteService == nil {
-            self.inviteService = InviteService(session: session)
-        }
-        guard let inviteService = self.inviteService else { return }
-
-        self.activityIndicatorPresenter.presentActivityIndicator(on: masterTabBarController.view, animated: true)
-        inviteService.sendEmailInvite(to: email) { [weak self] (response) in
-            guard let sself = self else {
-                return
-            }
-
-            sself.activityIndicatorPresenter.removeCurrentActivityIndicator(animated: true)
-            switch response {
-            case .success(let result):
-                var message: String
-                var discoveredUserID: String?
-                switch result {
-                case .inviteHasBeenSent(roomID: _):
-                    message = TchapL10n.inviteSendingSucceeded
-                case .inviteAlreadySent(roomID: _):
-                    message = TchapL10n.inviteAlreadySentByEmail(email)
-                case .inviteIgnoredForDiscoveredUser(userID: let userID):
-                    discoveredUserID = userID
-                    message = TchapL10n.inviteNotSentForDiscoveredUser
-                case .inviteIgnoredForUnauthorizedEmail:
-                    message = TchapL10n.inviteNotSentForUnauthorizedEmail(email)
-                }
-
-                sself.currentAlertController?.dismiss(animated: false)
-
-                let alert = UIAlertController(title: TchapL10n.inviteInformationTitle, message: message, preferredStyle: .alert)
-
-                let okTitle = VectorL10n.ok
-                let okAction = UIAlertAction(title: okTitle, style: .default, handler: { action in
-                    if let userID = discoveredUserID {
-                        // Open the discussion
-                        AppDelegate.theDelegate().startDirectChat(withUserId: userID, completion: nil)
-                    }
-                })
-                alert.addAction(okAction)
-                sself.currentAlertController = alert
-
-                sself.masterTabBarController.present(alert, animated: true, completion: nil)
-            case .failure(let error):
-                let errorPresentable = sself.inviteErrorPresentable(from: error)
-                sself.errorPresenter?.present(errorPresentable: errorPresentable, animated: true)
-            }
-        }
-    }
-
-    private func inviteErrorPresentable(from error: Error) -> ErrorPresentable {
-        let errorTitle = TchapL10n.inviteSendingFailedTitle
-        let errorMessage: String
-
-        let nsError = error as NSError
-
-        if let message = nsError.userInfo[NSLocalizedDescriptionKey] as? String {
-            errorMessage = message
-        } else {
-            errorMessage = TchapL10n.errorMessageDefault
-        }
-
-        return ErrorPresentableImpl(title: errorTitle, message: errorMessage)
-    }
 }
 
 // MARK: - MasterTabBarControllerDelegate