From d949e0cced75dff32b4df280dbe85d3a6da04501 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 5 Feb 2021 17:20:22 +0100
Subject: [PATCH] Do not finish the Activity if there is an error, Jitsi is
 probably displaying a popup to the user (#2729)

---
 .../app/features/call/conference/VectorJitsiActivity.kt      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
index c0975cd6d0..4851afaed0 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
@@ -156,7 +156,10 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
 
     override fun onConferenceTerminated(p0: MutableMap<String, Any>?) {
         Timber.v("JitsiMeetViewListener.onConferenceTerminated()")
-        finish()
+        // Do not finish if there is an error
+        if (p0?.get("error") == null) {
+            finish()
+        }
     }
 
     override fun onConferenceJoined(p0: MutableMap<String, Any>?) {