Merge pull request #7710 from vector-im/mauroromito/fix_for_confernce…

…_terminated

Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m

@@ -321,26 +321,25 @@ - (void)conferenceJoined:(NSDictionary *)data
 
 - (void)conferenceTerminated:(NSDictionary *)data
 {
+    // If the call is terminated by a moderator the error key contains the "conference.destroyed" value
     if (data[kJitsiDataErrorKey] != nil)
     {
         MXLogDebug(@"[JitsiViewController] conferenceTerminated - data: %@", data);
     }
-    else
-    {
-        dispatch_async(dispatch_get_main_queue(), ^{
-
-            // The conference is over. Let the delegate close this view controller.
-            if (self.delegate)
-            {
-                [self.delegate jitsiViewController:self dismissViewJitsiController:nil];
-            }
-            else
-            {
-                // Do it ourself
-                [self dismissViewControllerAnimated:YES completion:nil];
-            }
-        });
-    }
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+
+        // The conference is over. Let the delegate close this view controller.
+        if (self.delegate)
+        {
+            [self.delegate jitsiViewController:self dismissViewJitsiController:nil];
+        }
+        else
+        {
+            // Do it ourself
+            [self dismissViewControllerAnimated:YES completion:nil];
+        }
+    });
 }
 
 - (void)enterPictureInPicture:(NSDictionary *)data

changelog.d/7709.bugfix

@@ -0,0 +1 @@
+If a moderator ends a Jitsi call for everyone the call is now dismissed.