Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into new/send-typing-status

app/build.gradle

@@ -13,7 +13,7 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion 21
         targetSdkVersion versions.targetSdk
-        versionCode 2019
+        versionCode 2020
         versionName "2.2.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true

app/src/main/java/chat/rocket/android/chatroom/adapter/UrlPreviewViewHolder.kt

@@ -5,6 +5,7 @@ import android.net.Uri
 import android.view.View
 import chat.rocket.android.chatroom.viewmodel.UrlPreviewViewModel
 import chat.rocket.android.util.extensions.content
+import chat.rocket.android.util.extensions.openTabbedUrl
 import chat.rocket.android.util.extensions.setVisible
 import chat.rocket.android.widget.emoji.EmojiReactionListener
 import kotlinx.android.synthetic.main.message_url_preview.view.*
@@ -32,10 +33,17 @@ class UrlPreviewViewHolder(itemView: View,
             text_title.content = data.title
             text_description.content = data.description ?: ""
 
-            url_preview_layout.setOnClickListener { view ->
-                view.context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(data.rawData.url)))
-            }
+            url_preview_layout.setOnClickListener(onClickListener)
+            text_host.setOnClickListener(onClickListener)
+            text_title.setOnClickListener(onClickListener)
+            image_preview.setOnClickListener(onClickListener)
+            text_description.setOnClickListener(onClickListener)
         }
     }
 
+    private val onClickListener = { view: View ->
+        if (data != null) {
+            view.openTabbedUrl(Uri.parse(data!!.rawData.url))
+        }
+    }
 }
\ No newline at end of file

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

@@ -6,7 +6,6 @@ import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.RectF
 import android.net.Uri
-import android.support.customtabs.CustomTabsIntent
 import android.support.v4.content.res.ResourcesCompat
 import android.text.Spanned
 import android.text.style.ClickableSpan
@@ -16,6 +15,7 @@ import android.view.View
 import chat.rocket.android.R
 import chat.rocket.android.server.domain.PublicSettings
 import chat.rocket.android.server.domain.useRealName
+import chat.rocket.android.util.extensions.openTabbedUrl
 import chat.rocket.android.widget.emoji.EmojiParser
 import chat.rocket.android.widget.emoji.EmojiRepository
 import chat.rocket.android.widget.emoji.EmojiTypefaceSpan
@@ -151,12 +151,7 @@ class MessageParser @Inject constructor(
                 if (!link.startsWith("@") && link !in consumed) {
                     builder.setSpan(object : ClickableSpan() {
                         override fun onClick(view: View) {
-                            with(view) {
-                                val tabsbuilder = CustomTabsIntent.Builder()
-                                tabsbuilder.setToolbarColor(ResourcesCompat.getColor(context.resources, R.color.colorPrimary, context.theme))
-                                val customTabsIntent = tabsbuilder.build()
-                                customTabsIntent.launchUrl(context, getUri(link))
-                            }
+                            view.openTabbedUrl(getUri(link))
                         }
                     }, matcher.start(0), matcher.end(0))
                     consumed.add(link)

app/src/main/java/chat/rocket/android/util/extensions/View.kt

+package chat.rocket.android.util.extensions
+
+import android.net.Uri
+import android.support.customtabs.CustomTabsIntent
+import android.support.v4.content.res.ResourcesCompat
+import android.view.View
+import chat.rocket.android.R
+
+fun View.openTabbedUrl(url: Uri) {
+    with(this) {
+        val tabsbuilder = CustomTabsIntent.Builder()
+        tabsbuilder.setToolbarColor(ResourcesCompat.getColor(context.resources, R.color.colorPrimary, context.theme))
+        val customTabsIntent = tabsbuilder.build()
+        customTabsIntent.launchUrl(context, url)
+    }
+}
\ No newline at end of file