T19745917 : MEET-2619 revert refactor and simplify feature

tomekkuzma-mega · tomekkuzma-mega · commit beee8370c06d · 2024-11-20T12:32:00.000+01:00
diff --git a/iMEGA/Chat Messages/ViewModel/ChatContentRouter.swift b/iMEGA/Chat Messages/ViewModel/ChatContentRouter.swift
@@ -49,8 +49,8 @@ enum ChatContentRoutingStyle: Int {
         self.presenter = presenter
         self.publicLink = publicLink
         self.showShareLinkViewAfterOpenChat = showShareLinkViewAfterOpenChat
-        self.tracker = DIContainer.tracker
         self.chatContentRoutingStyle = chatContentRoutingStyle
+        self.tracker = DIContainer.tracker
     }
     
     @objc static func chatViewController(
diff --git a/iMEGA/Chat/ArchivedChatRoomsViewController.m b/iMEGA/Chat/ArchivedChatRoomsViewController.m
@@ -338,7 +338,12 @@ - (void)showChatRoomAtIndexPath:(NSIndexPath *)indexPath {
     MEGAChatRoom *chatRoom         = [MEGAChatSdk.shared chatRoomForChatId:chatListItem.chatId];
     
     if (chatRoom != nil) {
-        [[ChatContentRouter.alloc initWithChatRoom:chatRoom presenter:self.navigationController publicLink:nil showShareLinkViewAfterOpenChat:NO chatContentRoutingStyle:ChatContentRoutingStylePush] start];
+        [[ChatContentRouter.alloc initWithChatRoom:chatRoom
+                                         presenter:self.navigationController
+                                        publicLink:nil
+                    showShareLinkViewAfterOpenChat:NO
+                           chatContentRoutingStyle:ChatContentRoutingStylePush
+         ] start];
     }
 }
 
diff --git a/iMEGA/My Account/Contacts/ContactDetailsViewController.m b/iMEGA/My Account/Contacts/ContactDetailsViewController.m
@@ -484,7 +484,12 @@ - (void)openChatRoom:(MEGAChatRoom *)chatRoom {
         return;
     }
     
-    [[ChatContentRouter.alloc initWithChatRoom:chatRoom presenter:self.navigationController publicLink:nil showShareLinkViewAfterOpenChat:NO chatContentRoutingStyle:ChatContentRoutingStylePush] start];
+    [[ChatContentRouter.alloc initWithChatRoom:chatRoom
+                                     presenter:self.navigationController
+                                    publicLink:nil
+                showShareLinkViewAfterOpenChat:NO
+                       chatContentRoutingStyle:ChatContentRoutingStylePush
+     ] start];
 }
 
 - (void)sendMessageToContact {
diff --git a/iMEGA/My Account/Contacts/ContactsViewController.m b/iMEGA/My Account/Contacts/ContactsViewController.m
@@ -1048,7 +1048,12 @@ - (void)openChatRoom:(MEGAChatRoom *)chatRoom {
         return;
     }
     
-    [[ChatContentRouter.alloc initWithChatRoom:chatRoom presenter:self.navigationController publicLink:nil showShareLinkViewAfterOpenChat:NO chatContentRoutingStyle:ChatContentRoutingStylePush] start];
+    [[ChatContentRouter.alloc initWithChatRoom:chatRoom
+                                     presenter:self.navigationController
+                                    publicLink:nil
+                showShareLinkViewAfterOpenChat:NO
+                       chatContentRoutingStyle:ChatContentRoutingStylePush
+     ] start];
 }
 
 - (void)setupContactsTableViewHeader {
diff --git a/iMEGA/Utils/MEGALinks/MEGALinkManager+Additions.swift b/iMEGA/Utils/MEGALinks/MEGALinkManager+Additions.swift
@@ -273,86 +273,6 @@ extension MEGALinkManager: MEGALinkManagerProtocol {
         mainTabBar.showCameraUploadsSettings()
     }
     
-    @objc class func autoRejoinAndOpenChatVC(
-        chatRoom: MEGAChatRoom,
-        request: MEGAChatRequest,
-        chatLinkUrl: URL
-    ) {
-    
-        guard !chatRoom.isPreview && !chatRoom.isActive else {
-            self.createChatAndShow(request.chatHandle, publicChatLink: chatLinkUrl)
-            return
-        }
-        
-        let chatSDK = MEGAChatSdk.shared
-        
-        chatSDK.autorejoinPublicChat(request.chatHandle,
-                                 publicHandle: request.userHandle,
-                                 delegate: ChatRequestDelegate(completion: { rejoinRequest, error in
-            guard error == nil else {
-                if let error {
-                    SVProgressHUD.setDefaultMaskType(.none)
-                    SVProgressHUD.showError(withStatus: "\(rejoinRequest?.requestString ?? "") \(NSLocalizedString(error.name ?? "", comment: ""))")
-                }
-                return
-            }
-            if let rejoinRequest {
-                if let base64Handle = MEGASdk.base64Handle(forUserHandle: rejoinRequest.chatHandle) {
-                    MEGALinkManager.joiningOrLeavingChatBase64Handles.remove(base64Handle)
-                }
-                MEGALinkManager.createChatAndShow(rejoinRequest.chatHandle, publicChatLink: chatLinkUrl)
-            }
-        }))
-                                 
-        if let base64Handle = MEGASdk.base64Handle(forUserHandle: request.chatHandle) {
-            MEGALinkManager.joiningOrLeavingChatBase64Handles.add(base64Handle)
-        }
-    }
-    
-    @objc class func createMeetingAndShow(chatId: UInt64, userHandle: UInt64, publicChatLink: URL) {
-        guard let rootViewController = UIApplication.mnz_keyWindow()?.rootViewController else {
-            return
-        }
-        
-        guard MEGAChatSdk.shared.chatRoom(forChatId: chatId) != nil else {
-            return
-        }
-        
-        guard !MEGAChatSdk.shared.mnz_existsActiveCall else {
-            MeetingAlreadyExistsAlert.show(presenter: rootViewController)
-            return
-        }
-        
-        let type: MeetingConfigurationType = self.isLoggedIn() ? .join : .guestJoin
-        guard let mainTabBar = UIApplication.mainTabBarVisibleController() as? MainTabBarController else {
-            let router = MeetingCreatingViewRouter(
-                viewControllerToPresent: UIApplication.mnz_visibleViewController(),
-                type: type,
-                link: publicChatLink.absoluteString,
-                userhandle: userHandle
-            )
-            router.start()
-            return
-        }
-        
-        let router = MeetingCreatingViewRouter(
-            viewControllerToPresent: mainTabBar,
-            type: type,
-            link: publicChatLink.absoluteString,
-            userhandle: userHandle
-        )
-        mainTabBar.selectedIndex = TabType.chat.rawValue
-        
-        if mainTabBar.presentedViewController != nil {
-            mainTabBar.dismiss(animated: false) {
-                router.start()
-            }
-        } else {
-            router.start()
-        }
-        
-    }
-    
     @objc class func showBackupLinkView() {
         guard Helper.hasSession_alertIfNot() else { return }
         RecoveryKeyViewRouter(presenter: UIApplication.mnz_visibleViewController()).presentView()
diff --git a/iMEGA/Utils/MEGALinks/MEGALinkManager.h b/iMEGA/Utils/MEGALinks/MEGALinkManager.h
@@ -50,8 +50,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (void)createChatAndShow:(uint64_t)chatId publicChatLink:(NSURL *)publicChatLink;
 
-+ (BOOL)isLoggedIn;
-
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/iMEGA/Utils/MEGALinks/MEGALinkManager.m b/iMEGA/Utils/MEGALinks/MEGALinkManager.m
@@ -308,7 +308,7 @@ + (void)processLinkURL:(NSURL * _Nullable)url {
         case URLTypeNewSignUpLink: {
             if ([SAMKeychain passwordForService:@"MEGA" account:@"sessionV3"]) {
                 [MEGALinkManager resetLinkAndURLType];
-                
+
                 UIAlertController *alreadyLoggedInAlertController = [UIAlertController alertControllerWithTitle:LocalizedString(@"error", @"") message:LocalizedString(@"This link is not related to this account. Please log in with the correct account.", @"Error message shown when opening a link with an account that not corresponds to the link") preferredStyle:UIAlertControllerStyleAlert];
                 [alreadyLoggedInAlertController addAction:[UIAlertAction actionWithTitle:LocalizedString(@"ok", @"Button title to accept something") style:UIAlertActionStyleDestructive handler:nil]];
                 
@@ -440,7 +440,7 @@ + (void)processLinkURL:(NSURL * _Nullable)url {
                 [mainTBC showAddContact];
             }
             break;
-            
+
         case URLTypePresentNode:
             self.nodeToPresentBase64Handle = [url.absoluteString componentsSeparatedByString:@"/"].lastObject;
             [self presentNode];
@@ -606,7 +606,7 @@ + (void)showFileLinkView {
                 photoBrowserVC.publicLink = fileLinkURLString;
                 photoBrowserVC.encryptedLink = MEGALinkManager.secondaryLinkURL.absoluteString;
                 photoBrowserVC.needsReload = YES;
-                
+
                 [self presentViewControllerWithAds:photoBrowserVC adsSlotViewController:photoBrowserVC presentationStyle:UIModalPresentationAutomatic];
             } else if ([FileExtensionGroupOCWrapper verifyIsMultiMedia:node.name] && node.mnz_isPlayable) {
                 [self initFullScreenPlayerWithNode:node fileLink:fileLinkURLString filePaths:nil isFolderLink:NO isFromSharedItem:NO presenter:UIApplication.mnz_visibleViewController];
@@ -663,7 +663,7 @@ + (void)handleContactLink {
     }
     NSString *contactLinkHandle = [path substringFromIndex:(rangeOfPrefix.location + rangeOfPrefix.length)];
     uint64_t handle = [MEGASdk handleForBase64Handle:contactLinkHandle];
-    
+
     MEGAContactLinkQueryRequestDelegate *delegate = [[MEGAContactLinkQueryRequestDelegate alloc] initWithCompletion:^(MEGARequest *request) {
         NSString *fullName = [NSString stringWithFormat:@"%@ %@", request.name, request.text];
         [MEGALinkManager presentInviteModalForEmail:request.email fullName:fullName contactLinkHandle:request.nodeHandle image:request.file];
@@ -674,7 +674,7 @@ + (void)handleContactLink {
     } onError:^(MEGAError *error) {
         [SVProgressHUD showErrorWithStatus:LocalizedString(@"linkNotValid", @"Message shown when the user clicks on an link that is not valid")];
     }];
-    
+
     [MEGASdk.shared contactLinkQueryWithHandle:handle delegate:delegate];
 }
 
@@ -767,9 +767,22 @@ + (void)handlePublicChatLink {
             }
         } else { // Chat link
             MEGAChatRoom *chatRoom = [MEGAChatSdk.shared chatRoomForChatId:request.chatHandle];
-            [MEGALinkManager autoRejoinAndOpenChatVCWithChatRoom:chatRoom
-                                          request: request
-                                      chatLinkUrl:chatLinkUrl];
+            if (!chatRoom.isPreview && !chatRoom.isActive) {
+                ChatRequestDelegate *autorejoinPublicChatDelegate = [[ChatRequestDelegate alloc] initWithCompletion:^(MEGAChatRequest * _Nonnull request, MEGAChatError * _Nonnull error) {
+                    if (error.type) {
+                        [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeNone];
+                        [SVProgressHUD showErrorWithStatus:[NSString stringWithFormat:@"%@ %@", request.requestString, LocalizedString(error.name, @"")]];
+                        return;
+                    }
+                    [MEGALinkManager.joiningOrLeavingChatBase64Handles removeObject:[MEGASdk base64HandleForUserHandle:request.chatHandle]];
+                    [MEGALinkManager createChatAndShow:request.chatHandle publicChatLink:chatLinkUrl];
+                }];
+                [MEGAChatSdk.shared autorejoinPublicChat:request.chatHandle publicHandle:request.userHandle delegate:autorejoinPublicChatDelegate];
+                [MEGALinkManager.joiningOrLeavingChatBase64Handles addObject:[MEGASdk base64HandleForUserHandle:request.chatHandle]];
+            } else {
+                [MEGALinkManager createChatAndShow:request.chatHandle publicChatLink:chatLinkUrl];
+            }
+            
             [SVProgressHUD dismiss];
         }
     }];
@@ -822,30 +835,68 @@ + (void)openMeetingWithRequest:(MEGAChatRequest * _Nonnull)request chatLinkURL:(
         if ([self isHostInWaitingRoomWithRequest:request chatSdk:MEGAChatSdk.shared]) {
             [self joinCallWithRequest:request];
         } else {
-            [self createMeetingAndShowWithChatId:request.chatHandle userHandle:request.userHandle publicChatLink:chatLinkUrl];
+            [self createMeetingAndShow:request.chatHandle userHandle:request.userHandle publicChatLink:chatLinkUrl];
         }
-    }
-    else {
-        // [MEET-2619] we jump straight to chat for ended or not began meetings
+    } else {
+        // Meeting ended or not yet began
         [SVProgressHUD dismiss];
         MEGAChatRoom *chatRoom = [[MEGAChatSdk shared] chatRoomForChatId:request.chatHandle];
-        if (chatRoom == nil) {
-            MEGALogError(@"Cannot join chat, missing chat room %llu", request.chatHandle);
-            return;
+        if (!chatRoom.isPreview && !chatRoom.isActive) {
+            ChatRequestDelegate *autorejoinPublicChatDelegate = [[ChatRequestDelegate alloc] initWithCompletion:^(MEGAChatRequest * _Nonnull request, MEGAChatError * _Nonnull error) {
+                if (error.type) {
+                    [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeNone];
+                    [SVProgressHUD showErrorWithStatus:[NSString stringWithFormat:@"%@ %@", request.requestString, LocalizedString(error.name, @"")]];
+                    return;
+                }
+                [MEGALinkManager.joiningOrLeavingChatBase64Handles removeObject:[MEGASdk base64HandleForUserHandle:request.chatHandle]];
+                [MEGALinkManager createChatAndShow:request.chatHandle publicChatLink:chatLinkUrl];
+            }];
+            [MEGAChatSdk.shared autorejoinPublicChat:request.chatHandle publicHandle:request.userHandle delegate:autorejoinPublicChatDelegate];
+            [MEGALinkManager.joiningOrLeavingChatBase64Handles addObject:[MEGASdk base64HandleForUserHandle:request.chatHandle]];
+        } else {
+            [MEGALinkManager createChatAndShow:request.chatHandle publicChatLink:chatLinkUrl];
         }
-        [MEGALinkManager autoRejoinAndOpenChatVCWithChatRoom:chatRoom
-                                      request:request
-                                  chatLinkUrl:chatLinkUrl];
     }
 }
 
-+ (BOOL)isLoggedIn{
++ (void)createMeetingAndShow:(uint64_t)chatId userHandle:(uint64_t)userHandle publicChatLink:(NSURL *)publicChatLink {
+    
+    UIViewController *rootViewController = UIApplication.mnz_keyWindow.rootViewController;
+    MEGAChatRoom *chatRoom = [MEGAChatSdk.shared chatRoomForChatId:chatId];
+    if (chatRoom == nil) {
+        return;
+    } else if (MEGAChatSdk.shared.mnz_existsActiveCall) {
+        [MeetingAlreadyExistsAlert showWithPresenter:rootViewController];
+        return;
+    }
     
     // If the application was deleted when the user is logged and then reinstalled.
     // The sdk says the user is logged in but the session is cleared.
     NSString *sessionV3 = [SAMKeychain passwordForService:@"MEGA" account:@"sessionV3"];
     BOOL isLoggedIn = MEGASdk.shared.isLoggedIn && sessionV3 != nil && !sessionV3.mnz_isEmpty;
-    return isLoggedIn;
+    MeetingConfigurationType type = isLoggedIn ? MeetingConfigurationTypeJoin : MeetingConfigurationTypeGuestJoin;
+    
+    if (UIApplication.mainTabBarRootViewController) {
+        MainTabBarController *mainTBC = (MainTabBarController *)UIApplication.mainTabBarRootViewController;
+        mainTBC.selectedIndex = TabTypeChat;
+        MeetingCreatingViewRouter *router = [[MeetingCreatingViewRouter alloc] initWithViewControllerToPresent:mainTBC
+                                                                                                          type:type
+                                                                                                          link:publicChatLink.absoluteString
+                                                                                                    userhandle:userHandle];
+        if (mainTBC.presentedViewController) {
+            [mainTBC dismissViewControllerAnimated:NO completion:^{
+                [router start];
+            }];
+        } else {
+            [router start];
+        }
+    } else {
+        MeetingCreatingViewRouter *router = [[MeetingCreatingViewRouter alloc] initWithViewControllerToPresent:UIApplication.mnz_visibleViewController
+                                                                                                          type:type
+                                                                                                          link:publicChatLink.absoluteString
+                                                                                                    userhandle:userHandle];
+        [router start];
+  }
 }
 
 + (void)createChatAndShow:(uint64_t)chatId publicChatLink:(NSURL *)publicChatLink {
@@ -877,14 +928,12 @@ + (void)createChatAndShow:(uint64_t)chatId publicChatLink:(NSURL *)publicChatLin
     } else {
         // there's no UINavigationController present when user is logged out
         // we do a present in that case
-        UIViewController *presenter = UIApplication.mnz_visibleViewController;
-        BOOL shouldPush = [presenter isKindOfClass:[UINavigationController class]];
-        ChatContentRouter *router = [[ChatContentRouter alloc] initWithChatRoom:chatRoom
-                                                                      presenter:presenter
-                                                                     publicLink:publicChatLink.absoluteString
-                                                 showShareLinkViewAfterOpenChat:NO
-                                                        chatContentRoutingStyle:shouldPush ? ChatContentRoutingStylePush : ChatContentRoutingStylePresent];
-        [router start];
+        [[ChatContentRouter.alloc initWithChatRoom:chatRoom
+                                         presenter:UIApplication.mnz_visibleViewController
+                                        publicLink:publicChatLink.absoluteString
+                    showShareLinkViewAfterOpenChat:NO
+                           chatContentRoutingStyle:ChatContentRoutingStylePresent
+         ] start];
     }
 }
 
@@ -899,7 +948,12 @@ + (void)pushChat:(MEGAChatRoom *)chatRoom publicChatLink:(NSURL *)publicChatLink
     }
     
     [chatNC popToRootViewControllerAnimated:NO];
-    [[ChatContentRouter.alloc initWithChatRoom:chatRoom presenter:chatNC publicLink:publicChatLink.absoluteString showShareLinkViewAfterOpenChat:NO chatContentRoutingStyle:ChatContentRoutingStylePush] start];
+    [[ChatContentRouter.alloc initWithChatRoom:chatRoom
+                                     presenter:chatNC
+                                    publicLink:publicChatLink.absoluteString
+                showShareLinkViewAfterOpenChat:NO
+                       chatContentRoutingStyle:ChatContentRoutingStylePush
+     ] start];
 }
 
 + (void)handleChatPeerOptionsLink {

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,8 @@ enum ChatContentRoutingStyle: Int {`
`49`	`49`	`self.presenter = presenter`
`50`	`50`	`self.publicLink = publicLink`
`51`	`51`	`self.showShareLinkViewAfterOpenChat = showShareLinkViewAfterOpenChat`
`52`		`- self.tracker = DIContainer.tracker`
`53`	`52`	`self.chatContentRoutingStyle = chatContentRoutingStyle`
	`53`	`+ self.tracker = DIContainer.tracker`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`@objc static func chatViewController(`
Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,12 @@ - (void)showChatRoomAtIndexPath:(NSIndexPath *)indexPath {`
`338`	`338`	`MEGAChatRoom *chatRoom = [MEGAChatSdk.shared chatRoomForChatId:chatListItem.chatId];`
`339`	`339`
`340`	`340`	`if (chatRoom != nil) {`
`341`		`- [[ChatContentRouter.alloc initWithChatRoom:chatRoom presenter:self.navigationController publicLink:nil showShareLinkViewAfterOpenChat:NO chatContentRoutingStyle:ChatContentRoutingStylePush] start];`
	`341`	`+ [[ChatContentRouter.alloc initWithChatRoom:chatRoom`
	`342`	`+ presenter:self.navigationController`
	`343`	`+ publicLink:nil`
	`344`	`+ showShareLinkViewAfterOpenChat:NO`
	`345`	`+ chatContentRoutingStyle:ChatContentRoutingStylePush`
	`346`	`+ ] start];`
`342`	`347`	`}`
`343`	`348`	`}`
`344`	`349`
Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,12 @@ - (void)openChatRoom:(MEGAChatRoom *)chatRoom {`
`484`	`484`	`return;`
`485`	`485`	`}`
`486`	`486`
`487`		`- [[ChatContentRouter.alloc initWithChatRoom:chatRoom presenter:self.navigationController publicLink:nil showShareLinkViewAfterOpenChat:NO chatContentRoutingStyle:ChatContentRoutingStylePush] start];`
	`487`	`+ [[ChatContentRouter.alloc initWithChatRoom:chatRoom`
	`488`	`+ presenter:self.navigationController`
	`489`	`+ publicLink:nil`
	`490`	`+ showShareLinkViewAfterOpenChat:NO`
	`491`	`+ chatContentRoutingStyle:ChatContentRoutingStylePush`
	`492`	`+ ] start];`
`488`	`493`	`}`
`489`	`494`
`490`	`495`	`- (void)sendMessageToContact {`
Original file line number	Diff line number	Diff line change
`@@ -1048,7 +1048,12 @@ - (void)openChatRoom:(MEGAChatRoom *)chatRoom {`
`1048`	`1048`	`return;`
`1049`	`1049`	`}`
`1050`	`1050`
`1051`		`- [[ChatContentRouter.alloc initWithChatRoom:chatRoom presenter:self.navigationController publicLink:nil showShareLinkViewAfterOpenChat:NO chatContentRoutingStyle:ChatContentRoutingStylePush] start];`
	`1051`	`+ [[ChatContentRouter.alloc initWithChatRoom:chatRoom`
	`1052`	`+ presenter:self.navigationController`
	`1053`	`+ publicLink:nil`
	`1054`	`+ showShareLinkViewAfterOpenChat:NO`
	`1055`	`+ chatContentRoutingStyle:ChatContentRoutingStylePush`
	`1056`	`+ ] start];`
`1052`	`1057`	`}`
`1053`	`1058`
`1054`	`1059`	`- (void)setupContactsTableViewHeader {`