From a30d90ed29d82c062c62017a57c620858377bc9d Mon Sep 17 00:00:00 2001
From: Mikunj Varsani <mikunj@live.com.au>
Date: Fri, 13 Mar 2020 10:22:59 +1100
Subject: [PATCH] Fix joining public chat crashing.

---
 .../activities/JoinPublicChatActivity.kt      | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/JoinPublicChatActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/JoinPublicChatActivity.kt
index 9364419d24..38970a1f9c 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/JoinPublicChatActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/JoinPublicChatActivity.kt
@@ -18,9 +18,9 @@ import nl.komponents.kovenant.ui.failUi
 import nl.komponents.kovenant.ui.successUi
 import org.thoughtcrime.securesms.BaseActionBarActivity
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
-import org.thoughtcrime.securesms.loki.redesign.utilities.OpenGroupUtilities
 import org.thoughtcrime.securesms.loki.redesign.fragments.ScanQRCodeWrapperFragment
 import org.thoughtcrime.securesms.loki.redesign.fragments.ScanQRCodeWrapperFragmentDelegate
+import org.thoughtcrime.securesms.loki.redesign.utilities.OpenGroupUtilities
 import org.thoughtcrime.securesms.sms.MessageSender
 
 class JoinPublicChatActivity : PassphraseRequiredActionBarActivity(), ScanQRCodeWrapperFragmentDelegate {
@@ -62,19 +62,22 @@ class JoinPublicChatActivity : PassphraseRequiredActionBarActivity(), ScanQRCode
     }
 
     fun joinPublicChatIfPossible(url: String) {
-        if (!Patterns.WEB_URL.matcher(url).matches() || !url.startsWith("https://")) {
-            return Toast.makeText(this, "Invalid URL", Toast.LENGTH_SHORT).show()
-        }
-        showLoader()
-
-        val channel: Long = 1
-        OpenGroupUtilities.addGroup(this, url, channel).success {
-            MessageSender.syncAllOpenGroups(this)
-        }.successUi {
-            finish()
-        }.failUi {
-            hideLoader()
-            Toast.makeText(this, "Couldn't join channel", Toast.LENGTH_SHORT).show()
+        runOnUiThread {
+            if (!Patterns.WEB_URL.matcher(url).matches() || !url.startsWith("https://")) {
+                Toast.makeText(this, "Invalid URL", Toast.LENGTH_SHORT).show()
+                return@runOnUiThread
+            }
+            showLoader()
+
+            val channel: Long = 1
+            OpenGroupUtilities.addGroup(this, url, channel).success {
+                MessageSender.syncAllOpenGroups(this)
+            }.successUi {
+                finish()
+            }.failUi {
+                hideLoader()
+                Toast.makeText(this, "Couldn't join channel", Toast.LENGTH_SHORT).show()
+            }
         }
     }
     // endregion