Merge branch 'beta' into fix/onboarding

app/build.gradle

@@ -16,7 +16,7 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 2046
+        versionCode 2047
         versionName "3.0.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true

app/src/main/java/chat/rocket/android/authentication/loginoptions/presentation/LoginOptionsPresenter.kt

@@ -68,6 +68,7 @@ class LoginOptionsPresenter @Inject constructor(
     fun toLoginWithEmail() = navigator.toLogin(currentServer)
 
     fun authenticateWithOauth(oauthToken: String, oauthSecret: String) {
+        setupConnectionInfo(currentServer)
         credentialToken = oauthToken
         credentialSecret = oauthSecret
         loginMethod = AuthenticationEvent.AuthenticationWithOauth
@@ -76,6 +77,7 @@ class LoginOptionsPresenter @Inject constructor(
     }
 
     fun authenticateWithCas(casToken: String) {
+        setupConnectionInfo(currentServer)
         credentialToken = casToken
         loginMethod = AuthenticationEvent.AuthenticationWithCas
         setupConnectionInfo(currentServer)
@@ -83,6 +85,7 @@ class LoginOptionsPresenter @Inject constructor(
     }
 
     fun authenticateWithSaml(samlToken: String) {
+        setupConnectionInfo(currentServer)
         credentialToken = samlToken
         loginMethod = AuthenticationEvent.AuthenticationWithSaml
         setupConnectionInfo(currentServer)

app/src/main/java/chat/rocket/android/chatinformation/ui/MessageInfoFragment.kt

@@ -17,6 +17,7 @@ import chat.rocket.android.chatinformation.presentation.MessageInfoView
 import chat.rocket.android.chatinformation.viewmodel.ReadReceiptViewModel
 import chat.rocket.android.util.extensions.setVisible
 import chat.rocket.android.util.extensions.showToast
+import chat.rocket.android.util.extensions.ui
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_message_info.*
 import javax.inject.Inject
@@ -84,16 +85,22 @@ class MessageInfoFragment : Fragment(), MessageInfoView {
     }
 
     override fun showLoading() {
-        view_loading.setVisible(true)
-        view_loading.show()
+        ui {
+            view_loading.setVisible(true)
+            view_loading.show()
+        }
     }
 
     override fun hideLoading() {
-        view_loading.hide()
-        view_loading.setVisible(false)
+        ui {
+            view_loading.hide()
+            view_loading.setVisible(false)
+        }
     }
 
     override fun showReadReceipts(messageReceipts: List<ReadReceiptViewModel>) {
-        adapter.addAll(messageReceipts)
+        ui {
+            adapter.addAll(messageReceipts)
+        }
     }
 }

app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt

@@ -85,9 +85,10 @@ class UiModelMapper @Inject constructor(
     suspend fun map(
         message: Message,
         roomUiModel: RoomUiModel = RoomUiModel(roles = emptyList(), isBroadcast = true)
-    ): List<BaseUiModel<*>> {
-        return translate(message, roomUiModel)
-    }
+    ): List<BaseUiModel<*>> =
+        withContext(CommonPool) {
+            return@withContext translate(message, roomUiModel)
+        }
 
     suspend fun map(
         messages: List<Message>,

app/src/main/java/chat/rocket/android/helper/MessageParser.kt

@@ -33,7 +33,6 @@ import org.commonmark.node.ListItem
 import org.commonmark.node.Node
 import org.commonmark.node.OrderedList
 import org.commonmark.node.StrongEmphasis
-import org.commonmark.node.Text
 import org.commonmark.parser.Parser
 import ru.noties.markwon.SpannableBuilder
 import ru.noties.markwon.SpannableConfiguration
@@ -223,7 +222,7 @@ class MessageParser @Inject constructor(
 
     class LinkVisitor(private val builder: SpannableBuilder) : AbstractVisitor() {
 
-        override fun visit(text: Text) {
+        override fun visit(document: Document) {
             // Replace all url links to markdown url syntax.
             val matcher = PatternsCompat.AUTOLINK_WEB_URL.matcher(builder.text())
             val consumed = mutableListOf<String>()

build.gradle

@@ -10,7 +10,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0-alpha13'
+        classpath 'com.android.tools.build:gradle:3.3.0-alpha12'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
         classpath 'com.google.gms:google-services:4.0.2'