From a364ebd7fea0804f8edd0499928bdc4f91675728 Mon Sep 17 00:00:00 2001
From: Ivan Sein <ivan@nextcloud.com>
Date: Wed, 1 Feb 2023 11:01:05 +0100
Subject: [PATCH] Close/show chat before/after room switch.

Signed-off-by: Ivan Sein <ivan@nextcloud.com>
---
 NextcloudTalk/CallViewController.m | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/NextcloudTalk/CallViewController.m b/NextcloudTalk/CallViewController.m
index 7b400dd1d..b9f88705f 100644
--- a/NextcloudTalk/CallViewController.m
+++ b/NextcloudTalk/CallViewController.m
@@ -93,6 +93,7 @@ @interface CallViewController () <NCCallControllerDelegate, UICollectionViewDele
     BOOL _pushToTalkActive;
     BOOL _isHandRaised;
     BOOL _proximityState;
+    BOOL _showChatAfterRoomSwitch;
     UIImpactFeedbackGenerator *_buttonFeedbackGenerator;
     CGPoint _localVideoDragStartingPosition;
     CGPoint _localVideoOriginPosition;
@@ -1559,6 +1560,12 @@ -(void)collectionView:(UICollectionView *)collectionView willDisplayCell:(UIColl
 - (void)callControllerDidJoinCall:(NCCallController *)callController
 {
     [self setCallState:CallStateWaitingParticipants];
+
+    // Show chat if it was visible before room switch
+    if (_showChatAfterRoomSwitch && !_chatViewController) {
+        _showChatAfterRoomSwitch = NO;
+        [self toggleChatView];
+    }
 }
 
 - (void)callControllerDidFailedJoiningCall:(NCCallController *)callController statusCode:(NSNumber *)statusCode errorReason:(NSString *) errorReason
@@ -1736,6 +1743,12 @@ - (void)callController:(NCCallController *)callController isSwitchingToCall:(NSS
 {
     [self setCallState:CallStateSwitchingToAnotherRoom];
 
+    // Close chat before switching to another room
+    if (_chatViewController) {
+        _showChatAfterRoomSwitch = YES;
+        [self toggleChatView];
+    }
+
     // Connect to new call
     TalkAccount *activeAccount = [[NCDatabaseManager sharedInstance] activeAccount];
     [[NCAPIController sharedInstance] getRoomForAccount:activeAccount withToken:token withCompletionBlock:^(NSDictionary *roomDict, NSError *error) {