Merge pull request #1820 from RocketChat/beta

[RELEASE] Merge BETA into MASTER

.circleci/config.yml

 version: 2
+build:
+  machine:
+    java: oraclejdk8
 jobs:
   build-kotlin-sdk:
     docker:
-      - image: circleci/android:api-27-alpha
+      - image: circleci/android:api-28-alpha
     environment:
-      JVM_OPTS: -Xmx3200m
+      JAVA_TOOL_OPTIONS: -Xmx5024m
     steps:
       - checkout
       - run:
@@ -18,8 +21,9 @@ jobs:
           command: pushd app/ ; ./build-sdk.sh ; popd
       - save_cache:
           paths:
-            - ~/.gradle
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
+            - ~/.gradle/caches
+            - ~/.gradle/wrapper
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}-{{ checksum "core/build.gradle" }}-{{ checksum "util/build.gradle" }}-{{ checksum "draw/build.gradle" }}-{{ checksum "emoji/build.gradle" }}-{{ checksum "suggestions/build.gradle" }}
       - save_cache:
           paths:
             - app/libs/
@@ -30,47 +34,51 @@ jobs:
           destination: libs
   code-analysis:
     docker:
-      - image: circleci/android:api-27-alpha
+      - image: circleci/android:api-28-alpha
     environment:
-      JVM_OPTS: -Xmx3200m
+      JAVA_TOOL_OPTIONS: -Xmx5024m
     steps:
       - checkout
       - run:
           name: ANDROID_HOME
-          command: echo "sdk.dir="$ANDROID_HOME > local.properties 
+          command: echo "sdk.dir="$ANDROID_HOME > local.properties
       - run:
           name: checkout Rocket.Chat.Kotlin.SDK
           command: git clone https://github.com/RocketChat/Rocket.Chat.Kotlin.SDK.git ../Rocket.Chat.Kotlin.SDK
       - restore_cache:
           key: kotlin-sdk-{{ .Revision }}
       - restore_cache:
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}-{{ checksum "core/build.gradle" }}-{{ checksum "util/build.gradle" }}-{{ checksum "draw/build.gradle" }}-{{ checksum "emoji/build.gradle" }}-{{ checksum "suggestions/build.gradle" }}
       - run:
           name: Download Dependencies
-          command: ./gradlew androidDependencies --quiet --console=plain
+          command: ./gradlew --no-daemon androidDependencies --quiet --console=plain
       - save_cache:
           paths:
-            - ~/.gradle
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
+            - ~/.gradle/caches
+            - ~/.gradle/wrapper
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}-{{ checksum "core/build.gradle" }}-{{ checksum "util/build.gradle" }}-{{ checksum "draw/build.gradle" }}-{{ checksum "emoji/build.gradle" }}-{{ checksum "suggestions/build.gradle" }}
       - run:
           name: Run Lint #, Checkstyles, PMD, Findbugs...
-          command: ./gradlew lint
+          command: ./gradlew --no-daemon lint
       - run:
           name: Run Unit test
-          command: ./gradlew test
+          command: ./gradlew --no-daemon test
       - run:
           name: Compile Instrumentation test
-          command: ./gradlew assembleAndroidTest
+          command: ./gradlew --no-daemon assembleAndroidTest
       - store_artifacts:
           path: app/build/reports/
           destination: reports
   build-play-apk:
     docker:
-      - image: circleci/android:api-27-alpha
+      - image: circleci/android:api-28-alpha
     environment:
-      JVM_OPTS: -Xmx3200m
+      JAVA_TOOL_OPTIONS: -Xmx5024m
     steps:
       - checkout
+      - run:
+          name: ANDROID_HOME
+          command: echo "sdk.dir="$ANDROID_HOME > local.properties
       - run:
           name: restore files from ENV
           command: |
@@ -82,28 +90,32 @@ jobs:
       - restore_cache:
           key: kotlin-sdk-{{ .Revision }}
       - restore_cache:
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}-{{ checksum "core/build.gradle" }}-{{ checksum "util/build.gradle" }}-{{ checksum "draw/build.gradle" }}-{{ checksum "emoji/build.gradle" }}-{{ checksum "suggestions/build.gradle" }}
       - run:
           name: Download Dependencies
-          command: ./gradlew androidDependencies --quiet --console=plain
+          command: ./gradlew --no-daemon androidDependencies --quiet --console=plain
       - save_cache:
           paths:
-            - ~/.gradle
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
+            - ~/.gradle/caches
+            - ~/.gradle/wrapper
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}-{{ checksum "core/build.gradle" }}-{{ checksum "util/build.gradle" }}-{{ checksum "draw/build.gradle" }}-{{ checksum "emoji/build.gradle" }}-{{ checksum "suggestions/build.gradle" }}
       - run:
           name: Build APK
           command: |
-            ./gradlew assemblePlayRelease --info --console=plain --stacktrace
+            ./gradlew --no-daemon assemblePlayRelease --info --console=plain --stacktrace
       - store_artifacts:
           path: app/build/outputs/apk
           destination: apks
   build-foss-apk:
     docker:
-      - image: circleci/android:api-27-alpha
+      - image: circleci/android:api-28-alpha
     environment:
-      JVM_OPTS: -Xmx3200m
+      JAVA_TOOL_OPTIONS: -Xmx5024m
     steps:
       - checkout
+      - run:
+          name: ANDROID_HOME
+          command: echo "sdk.dir="$ANDROID_HOME > local.properties
       - run:
           name: restore files from ENV
           command: |
@@ -115,18 +127,19 @@ jobs:
       - restore_cache:
           key: kotlin-sdk-{{ .Revision }}
       - restore_cache:
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}-{{ checksum "core/build.gradle" }}-{{ checksum "util/build.gradle" }}-{{ checksum "draw/build.gradle" }}-{{ checksum "emoji/build.gradle" }}-{{ checksum "suggestions/build.gradle" }}
       - run:
           name: Download Dependencies
-          command: ./gradlew androidDependencies --quiet --console=plain
+          command: ./gradlew --no-daemon androidDependencies --quiet --console=plain
       - save_cache:
           paths:
-            - ~/.gradle
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
+            - ~/.gradle/caches
+            - ~/.gradle/wrapper
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}-{{ checksum "core/build.gradle" }}-{{ checksum "util/build.gradle" }}-{{ checksum "draw/build.gradle" }}-{{ checksum "emoji/build.gradle" }}-{{ checksum "suggestions/build.gradle" }}
       - run:
           name: Build APK
           command: |
-            ./gradlew assembleFossRelease --info --console=plain --stacktrace
+            ./gradlew --no-daemon assembleFossRelease --info --console=plain --stacktrace
       - store_artifacts:
           path: app/build/outputs/apk
           destination: apks

README.md

@@ -11,7 +11,7 @@ This repository contains all the code related to the Android native application
 
 ## How to build
 
-- You need to download the latest [Android Studio Preview](https://developer.android.com/studio/preview/) version since the stable IDE version does not support the [JetPack](https://developer.android.com/jetpack/) that is beeing used on this application. 
+- You need to download the latest [Android Studio Preview](https://developer.android.com/studio/preview/) version since the stable IDE version does not support the [JetPack](https://developer.android.com/jetpack/) that is being used on this application. 
 - Make sure that you have the latest **gradle** and the **android plugin** versions installed. Go to `File > Project Structure > Project` and make sure that you have the latest versions installed. Refer [this](https://developer.android.com/studio/releases/gradle-plugin.html#updating-gradle) to see the compatible versions.
 - Kotlin is already configured in the project. To check, go to `Tools > Kotlin > Configure Kotlin in project`. A message saying kotlin is already configured in the project pops up. You can update kotlin to the latest version by going to `Tools > Kotlin > Configure Kotlin updates` and download the latest version of kotlin.
 

app/build-sdk.sh

@@ -94,8 +94,8 @@ if ! check_git_dirty && ! check_last_commit && [ -f "${CURRENT_DIR}"/libs/common
 	exit 0
 fi
 
-cd "${SDK_DIR}" && ./gradlew common:assemble && cd "${CURRENT_DIR}"
-cd "${SDK_DIR}" && ./gradlew core:assemble && cd "${CURRENT_DIR}"
+cd "${SDK_DIR}" && ./gradlew --no-daemon common:assemble && cd "${CURRENT_DIR}"
+cd "${SDK_DIR}" && ./gradlew --no-daemon core:assemble && cd "${CURRENT_DIR}"
 
 rm "${CURRENT_DIR}"/libs/common* "${CURRENT_DIR}"/libs/core*
 

app/build.gradle

@@ -16,8 +16,8 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 2048
-        versionName "3.0.0"
+        versionCode 2049
+        versionName "3.1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 

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

@@ -113,25 +113,26 @@ interface LoginOptionsView : LoadingView, MessageView {
 
     // CAS account.
     /**
-     * Shows the CAS button if the sign in/sign out via CAS protocol is enabled by the server
-     * settings.
+     * Adds a CAS button into accounts container.
      *
-     * REMARK: We must set up the CAS button listener before showing it [setupCasButtonListener].
+     * @param casUrl The CAS url.
+     * @param casToken The CAS token
+     * @param serviceName The SAML service name.
+     * @param serviceNameColor The SAML service name color (just stylizing).
+     * @param buttonColor The SAML button color (just stylizing).
      * @see [showAccountsView]
      */
-    fun enableLoginByCas()
-
-    /**
-     * Setups the CAS button.
-     *
-     * @param casUrl The CAS URL to authenticate with.
-     * @param casToken The requested token to be sent to the CAS server.
-     */
-    fun setupCasButtonListener(casUrl: String, casToken: String)
+    fun addCasButton(
+        caslUrl: String,
+        casToken: String,
+        serviceName: String,
+        serviceNameColor: Int,
+        buttonColor: Int
+    )
 
     // Custom OAuth account.
     /**
-     * Adds a custom OAuth button in the accounts container.
+     * Adds a custom OAuth button into accounts container.
      *
      * @customOauthUrl The custom OAuth url.
      * @state A random string generated by the app, which you'll verify later
@@ -151,12 +152,13 @@ interface LoginOptionsView : LoadingView, MessageView {
 
     // SAML account.
     /**
-     *  Adds a SAML button in the accounts container.
+     * Adds a SAML button into accounts container.
      *
-     * @samlUrl The SAML url.
-     * @serviceName The SAML service name.
-     * @serviceNameColor The SAML service name color (just stylizing).
-     * @buttonColor The SAML button color (just stylizing).
+     * @param samlUrl The SAML url.
+     * @param samlToken The SAML token.
+     * @param serviceName The SAML service name.
+     * @param serviceNameColor The SAML service name color (just stylizing).
+     * @param buttonColor The SAML button color (just stylizing).
      * @see [showAccountsView]
      */
     fun addSamlButton(

app/src/main/java/chat/rocket/android/authentication/loginoptions/ui/LoginOptionsFragment.kt

@@ -40,6 +40,9 @@ private const val GITLAB_OAUTH_URL = "gitlab_oauth_url"
 private const val WORDPRESS_OAUTH_URL = "wordpress_oauth_url"
 private const val CAS_LOGIN_URL = "cas_login_url"
 private const val CAS_TOKEN = "cas_token"
+private const val CAS_SERVICE_NAME = "cas_service_name"
+private const val CAS_SERVICE_NAME_TEXT_COLOR = "cas_service_name_text_color"
+private const val CAS_SERVICE_BUTTON_COLOR = "cas_service_button_color"
 private const val CUSTOM_OAUTH_URL = "custom_oauth_url"
 private const val CUSTOM_OAUTH_SERVICE_NAME = "custom_oauth_service_name"
 private const val CUSTOM_OAUTH_SERVICE_NAME_TEXT_COLOR = "custom_oauth_service_name_text_color"
@@ -69,6 +72,9 @@ fun newInstance(
     wordpressOauthUrl: String? = null,
     casLoginUrl: String? = null,
     casToken: String? = null,
+    casServiceName: String? = null,
+    casServiceNameTextColor: Int = 0,
+    casServiceButtonColor: Int = 0,
     customOauthUrl: String? = null,
     customOauthServiceName: String? = null,
     customOauthServiceNameTextColor: Int = 0,
@@ -95,6 +101,9 @@ fun newInstance(
             putString(WORDPRESS_OAUTH_URL, wordpressOauthUrl)
             putString(CAS_LOGIN_URL, casLoginUrl)
             putString(CAS_TOKEN, casToken)
+            putString(CAS_SERVICE_NAME, casServiceName)
+            putInt(CAS_SERVICE_NAME_TEXT_COLOR, casServiceNameTextColor)
+            putInt(CAS_SERVICE_BUTTON_COLOR, casServiceButtonColor)
             putString(CUSTOM_OAUTH_URL, customOauthUrl)
             putString(CUSTOM_OAUTH_SERVICE_NAME, customOauthServiceName)
             putInt(CUSTOM_OAUTH_SERVICE_NAME_TEXT_COLOR, customOauthServiceNameTextColor)
@@ -127,6 +136,9 @@ class LoginOptionsFragment : Fragment(), LoginOptionsView {
     private var wordpressOauthUrl: String? = null
     private var casLoginUrl: String? = null
     private var casToken: String? = null
+    private var casServiceName: String? = null
+    private var casServiceNameTextColor: Int = 0
+    private var casServiceButtonColor: Int = 0
     private var customOauthUrl: String? = null
     private var customOauthServiceName: String? = null
     private var customOauthServiceTextColor: Int = 0
@@ -157,6 +169,9 @@ class LoginOptionsFragment : Fragment(), LoginOptionsView {
             wordpressOauthUrl = bundle.getString(WORDPRESS_OAUTH_URL)
             casLoginUrl = bundle.getString(CAS_LOGIN_URL)
             casToken = bundle.getString(CAS_TOKEN)
+            casServiceName = bundle.getString(CAS_SERVICE_NAME)
+            casServiceNameTextColor = bundle.getInt(CAS_SERVICE_NAME_TEXT_COLOR)
+            casServiceButtonColor = bundle.getInt(CAS_SERVICE_BUTTON_COLOR)
             customOauthUrl = bundle.getString(CUSTOM_OAUTH_URL)
             customOauthServiceName = bundle.getString(CUSTOM_OAUTH_SERVICE_NAME)
             customOauthServiceTextColor = bundle.getInt(CUSTOM_OAUTH_SERVICE_NAME_TEXT_COLOR)
@@ -200,6 +215,7 @@ class LoginOptionsFragment : Fragment(), LoginOptionsView {
         setupCas()
         setupCustomOauth()
         setupSaml()
+        setupAccountsView()
         setupLoginWithEmailView()
         setupCreateNewAccountView()
     }
@@ -235,19 +251,17 @@ class LoginOptionsFragment : Fragment(), LoginOptionsView {
             setupWordpressButtonListener(wordpressOauthUrl.toString(), state.toString())
             enableLoginByWordpress()
         }
-
-        if (totalSocialAccountsEnabled > 0) {
-            showAccountsView()
-            if (totalSocialAccountsEnabled > 3) {
-                setupExpandAccountsView()
-            }
-        }
     }
 
     private fun setupCas() {
-        if (casLoginUrl != null && casToken != null) {
-            setupCasButtonListener(casLoginUrl.toString(), casToken.toString())
-            enableLoginByCas()
+        if (casLoginUrl != null && casToken != null && casServiceName != null) {
+            addCasButton(
+                casLoginUrl.toString(),
+                casToken.toString(),
+                casServiceName.toString(),
+                casServiceNameTextColor,
+                casServiceButtonColor
+            )
         }
     }
 
@@ -275,6 +289,15 @@ class LoginOptionsFragment : Fragment(), LoginOptionsView {
         }
     }
 
+    private fun setupAccountsView() {
+        if (totalSocialAccountsEnabled > 0) {
+            showAccountsView()
+            if (totalSocialAccountsEnabled > 3) {
+                setupExpandAccountsView()
+            }
+        }
+    }
+
     private fun setupLoginWithEmailView() {
         if (isLoginFormEnabled) {
             showLoginWithEmailButton()
@@ -319,10 +342,17 @@ class LoginOptionsFragment : Fragment(), LoginOptionsView {
         setupButtonListener(button_wordpress, wordpressUrl, state, REQUEST_CODE_FOR_OAUTH)
 
     // CAS service account.
-    override fun enableLoginByCas() = enableAccountButton(button_cas)
-
-    override fun setupCasButtonListener(casUrl: String, casToken: String) =
-        setupButtonListener(button_cas, casUrl, casToken, REQUEST_CODE_FOR_CAS)
+    override fun addCasButton(
+        caslUrl: String,
+        casToken: String,
+        serviceName: String,
+        serviceNameColor: Int,
+        buttonColor: Int
+    ) {
+        val button = getCustomServiceButton(serviceName, serviceNameColor, buttonColor)
+        setupButtonListener(button, caslUrl, casToken, REQUEST_CODE_FOR_CAS)
+        accounts_container.addView(button)
+    }
 
     // Custom OAuth account.
     override fun addCustomOauthButton(

app/src/main/java/chat/rocket/android/authentication/onboarding/presentation/OnBoardingPresenter.kt

@@ -43,6 +43,9 @@ class OnBoardingPresenter @Inject constructor(
                     wordpressOauthUrl,
                     casLoginUrl,
                     casToken,
+                    casServiceName,
+                    casServiceNameTextColor,
+                    casServiceButtonColor,
                     customOauthUrl,
                     customOauthServiceName,
                     customOauthServiceNameTextColor,
@@ -73,9 +76,8 @@ class OnBoardingPresenter @Inject constructor(
             view.showLoading()
             try {
                 withContext(DefaultDispatcher) {
-                    refreshSettingsInteractor.refresh(serverUrl)
-
                     setupConnectionInfo(serverUrl)
+                    refreshSettingsInteractor.refresh(serverUrl)
 
                     // preparing next fragment before showing it
                     checkEnabledAccounts(serverUrl)

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

@@ -30,6 +30,9 @@ class AuthenticationNavigator(internal val activity: AuthenticationActivity) {
         wordpressOauthUrl: String? = null,
         casLoginUrl: String? = null,
         casToken: String? = null,
+        casServiceName: String? = null,
+        casServiceNameTextColor: Int = 0,
+        casServiceButtonColor: Int = 0,
         customOauthUrl: String? = null,
         customOauthServiceName: String? = null,
         customOauthServiceNameTextColor: Int = 0,
@@ -59,6 +62,9 @@ class AuthenticationNavigator(internal val activity: AuthenticationActivity) {
                 wordpressOauthUrl,
                 casLoginUrl,
                 casToken,
+                casServiceName,
+                casServiceNameTextColor,
+                casServiceButtonColor,
                 customOauthUrl,
                 customOauthServiceName,
                 customOauthServiceNameTextColor,

app/src/main/java/chat/rocket/android/authentication/registerusername/ui/RegisterUsernameFragment.kt

@@ -8,6 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.core.view.ViewCompat
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import chat.rocket.android.R
 import chat.rocket.android.analytics.AnalyticsManager
@@ -16,7 +17,6 @@ import chat.rocket.android.authentication.registerusername.presentation.Register
 import chat.rocket.android.authentication.registerusername.presentation.RegisterUsernameView
 import chat.rocket.android.util.extension.asObservable
 import chat.rocket.android.util.extensions.inflate
-import chat.rocket.android.util.extensions.setVisible
 import chat.rocket.android.util.extensions.showKeyboard
 import chat.rocket.android.util.extensions.showToast
 import chat.rocket.android.util.extensions.textContent
@@ -113,13 +113,13 @@ class RegisterUsernameFragment : Fragment(), RegisterUsernameView {
     override fun showLoading() {
         ui {
             disableUserInput()
-            view_loading.setVisible(true)
+            view_loading.isVisible = true
         }
     }
 
     override fun hideLoading() {
         ui {
-            view_loading.setVisible(false)
+            view_loading.isVisible = false
             enableUserInput()
         }
     }

app/src/main/java/chat/rocket/android/authentication/resetpassword/ui/ResetPasswordFragment.kt

@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.core.view.ViewCompat
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import chat.rocket.android.R
 import chat.rocket.android.analytics.AnalyticsManager
@@ -15,7 +16,6 @@ import chat.rocket.android.authentication.resetpassword.presentation.ResetPasswo
 import chat.rocket.android.util.extension.asObservable
 import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.isEmail
-import chat.rocket.android.util.extensions.setVisible
 import chat.rocket.android.util.extensions.showKeyboard
 import chat.rocket.android.util.extensions.showToast
 import chat.rocket.android.util.extensions.textContent
@@ -93,13 +93,13 @@ class ResetPasswordFragment : Fragment(), ResetPasswordView {
     override fun showLoading() {
         ui {
             disableUserInput()
-            view_loading.setVisible(true)
+            view_loading.isVisible = true
         }
     }
 
     override fun hideLoading() {
         ui {
-            view_loading.setVisible(false)
+            view_loading.isVisible = false
             enableUserInput()
         }
     }

app/src/main/java/chat/rocket/android/authentication/server/presentation/ServerPresenter.kt

@@ -53,6 +53,9 @@ class ServerPresenter @Inject constructor(
                     wordpressOauthUrl,
                     casLoginUrl,
                     casToken,
+                    casServiceName,
+                    casServiceNameTextColor,
+                    casServiceButtonColor,
                     customOauthUrl,
                     customOauthServiceName,
                     customOauthServiceNameTextColor,
@@ -92,8 +95,6 @@ class ServerPresenter @Inject constructor(
                     withContext(DefaultDispatcher) {
                         refreshSettingsInteractor.refresh(serverUrl)
 
-                        setupConnectionInfo(serverUrl)
-
                         // preparing next fragment before showing it
                         checkEnabledAccounts(serverUrl)
                         checkIfLoginFormIsEnabled()

app/src/main/java/chat/rocket/android/authentication/server/ui/ServerFragment.kt

@@ -245,7 +245,7 @@ class ServerFragment : Fragment(), ServerView {
         serverUrlDisposable = text_server_url.asObservable()
             .filter { it.isNotBlank() }
             .subscribe {
-                if (it.toString().isValidUrl()) {
+                if ("$protocol${it.toString()}".isValidUrl()) {
                     enableButtonConnect()
                 } else {
                     disableButtonConnect()

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

@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -15,7 +16,6 @@ import chat.rocket.android.chatinformation.adapter.ReadReceiptAdapter
 import chat.rocket.android.chatinformation.presentation.MessageInfoPresenter
 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
@@ -86,15 +86,15 @@ class MessageInfoFragment : Fragment(), MessageInfoView {
 
     override fun showLoading() {
         ui {
-            view_loading.setVisible(true)
+            view_loading.isVisible = true
             view_loading.show()
         }
     }
 
     override fun hideLoading() {
         ui {
+            view_loading.isVisible = false
             view_loading.hide()
-            view_loading.setVisible(false)
         }
     }
 
@@ -103,4 +103,4 @@ class MessageInfoFragment : Fragment(), MessageInfoView {
             adapter.addAll(messageReceipts)
         }
     }
-}
+}
\ No newline at end of file

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

-package chat.rocket.android.chatroom.adapter
-
-import android.view.View
-import chat.rocket.android.chatroom.uimodel.ActionsAttachmentUiModel
-import chat.rocket.android.emoji.EmojiReactionListener
-import chat.rocket.core.model.attachment.actions.Action
-import chat.rocket.core.model.attachment.actions.ButtonAction
-import kotlinx.android.synthetic.main.item_actions_attachment.view.*
-import androidx.recyclerview.widget.LinearLayoutManager
-import timber.log.Timber
-
-class ActionsAttachmentViewHolder(
-        itemView: View,
-        listener: ActionsListener,
-        reactionListener: EmojiReactionListener? = null,
-        var actionAttachmentOnClickListener: ActionAttachmentOnClickListener
-) : BaseViewHolder<ActionsAttachmentUiModel>(itemView, listener, reactionListener) {
-
-    init {
-        with(itemView) {
-            setupActionMenu(actions_attachment_container)
-        }
-    }
-
-    override fun bindViews(data: ActionsAttachmentUiModel) {
-        val actions = data.actions
-        val alignment = data.buttonAlignment
-        Timber.d("no of actions : ${actions.size} : $actions")
-        with(itemView) {
-            title.text = data.title ?: ""
-            actions_list.layoutManager = LinearLayoutManager(itemView.context,
-                    when (alignment) {
-                        "horizontal" -> LinearLayoutManager.HORIZONTAL
-                        else -> LinearLayoutManager.VERTICAL //Default
-                    }, false)
-            actions_list.adapter = ActionsListAdapter(actions, actionAttachmentOnClickListener)
-        }
-    }
-}
-
-interface ActionAttachmentOnClickListener {
-    fun onActionClicked(view: View, action: Action)
-}
\ No newline at end of file

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

@@ -70,4 +70,4 @@ class ActionsListAdapter(actions: List<Action>, var actionAttachmentOnClickListe
         val action = actions[position]
         holder.bindAction(action)
     }
-}
+}
\ No newline at end of file

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

-package chat.rocket.android.chatroom.adapter
-
-import android.view.View
-import androidx.core.view.isVisible
-import chat.rocket.android.chatroom.uimodel.AudioAttachmentUiModel
-import chat.rocket.android.player.PlayerActivity
-import chat.rocket.android.emoji.EmojiReactionListener
-import kotlinx.android.synthetic.main.message_attachment.view.*
-
-class AudioAttachmentViewHolder(itemView: View,
-                                listener: ActionsListener,
-                                reactionListener: EmojiReactionListener? = null)
-    : BaseViewHolder<AudioAttachmentUiModel>(itemView, listener, reactionListener) {
-
-    init {
-        with(itemView) {
-            setupActionMenu(attachment_container)
-            image_attachment.isVisible = false
-            audio_video_attachment.isVisible = true
-        }
-    }
-
-    override fun bindViews(data: AudioAttachmentUiModel) {
-        with(itemView) {
-            file_name.text = data.attachmentTitle
-            audio_video_attachment.setOnClickListener { view ->
-                data.attachmentUrl.let { url ->
-                    PlayerActivity.play(view.context, url)
-                }
-            }
-        }
-    }
-}
\ No newline at end of file

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

-package chat.rocket.android.chatroom.adapter
-
-import android.content.Intent
-import android.net.Uri
-import android.view.View
-import androidx.core.view.isGone
-import androidx.core.view.isVisible
-import chat.rocket.android.chatroom.uimodel.AuthorAttachmentUiModel
-import chat.rocket.android.emoji.EmojiReactionListener
-import chat.rocket.android.util.extensions.content
-import chat.rocket.common.util.ifNull
-import kotlinx.android.synthetic.main.item_author_attachment.view.*
-
-class AuthorAttachmentViewHolder(itemView: View,
-                                 listener: ActionsListener,
-                                 reactionListener: EmojiReactionListener? = null)
-    : BaseViewHolder<AuthorAttachmentUiModel>(itemView, listener, reactionListener) {
-
-    init {
-        with(itemView) {
-            setupActionMenu(author_attachment_container)
-        }
-    }
-
-    override fun bindViews(data: AuthorAttachmentUiModel) {
-        with(itemView) {
-            data.icon?.let { icon ->
-                author_icon.isVisible = true
-                author_icon.setImageURI(icon)
-            }.ifNull {
-                author_icon.isGone = true
-            }
-
-            author_icon.setImageURI(data.icon)
-            text_author_name.content = data.name
-
-            data.fields?.let { fields ->
-                text_fields.content = fields
-                text_fields.isVisible = true
-            }.ifNull {
-                text_fields.isGone = true
-            }
-
-            text_author_name.setOnClickListener {
-                it.context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(data.attachmentUrl)))
-            }
-        }
-    }
-}
\ No newline at end of file

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

@@ -18,7 +18,9 @@ import chat.rocket.android.util.extensions.toList
 import chat.rocket.core.model.Message
 import chat.rocket.core.model.isSystemMessage
 import com.google.android.flexbox.FlexDirection
+import com.google.android.flexbox.FlexWrap
 import com.google.android.flexbox.FlexboxLayoutManager
+import com.google.android.flexbox.JustifyContent
 
 abstract class BaseViewHolder<T : BaseUiModel<*>>(
     itemView: View,
@@ -41,13 +43,12 @@ abstract class BaseViewHolder<T : BaseUiModel<*>>(
     private fun bindReactions() {
         data?.let {
             val recyclerView = itemView.findViewById(R.id.recycler_view_reactions) as RecyclerView
-            val adapter: MessageReactionsAdapter
-            if (recyclerView.adapter == null) {
-                adapter = MessageReactionsAdapter()
+            val adapter: MessageReactionsAdapter = if (recyclerView.adapter == null) {
+                MessageReactionsAdapter()
             } else {
-                adapter = recyclerView.adapter as MessageReactionsAdapter
-                adapter.clear()
+                recyclerView.adapter as MessageReactionsAdapter
             }
+            adapter.clear()
 
             if (it.nextDownStreamMessage == null) {
                 adapter.listener = object : EmojiReactionListener {
@@ -61,13 +62,16 @@ abstract class BaseViewHolder<T : BaseUiModel<*>>(
                         }
                     }
                 }
+
                 val context = itemView.context
                 val manager = FlexboxLayoutManager(context, FlexDirection.ROW)
+                manager.justifyContent = JustifyContent.FLEX_START
                 recyclerView.layoutManager = manager
                 recyclerView.adapter = adapter
-                adapter.addReactions(it.reactions.filterNot { reactionUiModel ->
-                    reactionUiModel.unicode.startsWith(":") && reactionUiModel.url.isNullOrEmpty()
-                })
+
+                if (it.reactions.isNotEmpty()) {
+                    itemView.post { adapter.addReactions(it.reactions) }
+                }
             }
         }
     }
@@ -129,4 +133,4 @@ abstract class BaseViewHolder<T : BaseUiModel<*>>(
         }
         return true
     }
-}
+}
\ No newline at end of file

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

@@ -36,37 +36,13 @@ class ChatRoomAdapter(
                 val view = parent.inflate(R.layout.item_message)
                 MessageViewHolder(view, actionsListener, reactionListener)
             }
-            BaseUiModel.ViewType.IMAGE_ATTACHMENT -> {
-                val view = parent.inflate(R.layout.message_attachment)
-                ImageAttachmentViewHolder(view, actionsListener, reactionListener)
-            }
-            BaseUiModel.ViewType.AUDIO_ATTACHMENT -> {
-                val view = parent.inflate(R.layout.message_attachment)
-                AudioAttachmentViewHolder(view, actionsListener, reactionListener)
-            }
-            BaseUiModel.ViewType.VIDEO_ATTACHMENT -> {
-                val view = parent.inflate(R.layout.message_attachment)
-                VideoAttachmentViewHolder(view, actionsListener, reactionListener)
-            }
             BaseUiModel.ViewType.URL_PREVIEW -> {
                 val view = parent.inflate(R.layout.message_url_preview)
                 UrlPreviewViewHolder(view, actionsListener, reactionListener)
             }
-            BaseUiModel.ViewType.MESSAGE_ATTACHMENT -> {
+            BaseUiModel.ViewType.ATTACHMENT -> {
                 val view = parent.inflate(R.layout.item_message_attachment)
-                MessageAttachmentViewHolder(view, actionsListener, reactionListener)
-            }
-            BaseUiModel.ViewType.AUTHOR_ATTACHMENT -> {
-                val view = parent.inflate(R.layout.item_author_attachment)
-                AuthorAttachmentViewHolder(view, actionsListener, reactionListener)
-            }
-            BaseUiModel.ViewType.COLOR_ATTACHMENT -> {
-                val view = parent.inflate(R.layout.item_color_attachment)
-                ColorAttachmentViewHolder(view, actionsListener, reactionListener)
-            }
-            BaseUiModel.ViewType.GENERIC_FILE_ATTACHMENT -> {
-                val view = parent.inflate(R.layout.item_file_attachment)
-                GenericFileAttachmentViewHolder(view, actionsListener, reactionListener)
+                AttachmentViewHolder(view, actionsListener, reactionListener, actionAttachmentOnClickListener)
             }
             BaseUiModel.ViewType.MESSAGE_REPLY -> {
                 val view = parent.inflate(R.layout.item_message_reply)
@@ -74,10 +50,6 @@ class ChatRoomAdapter(
                     actionSelectListener?.openDirectMessage(roomName, permalink)
                 }
             }
-            BaseUiModel.ViewType.ACTIONS_ATTACHMENT -> {
-                val view = parent.inflate(R.layout.item_actions_attachment)
-                ActionsAttachmentViewHolder(view, actionsListener, reactionListener, actionAttachmentOnClickListener)
-            }
             else -> {
                 throw InvalidParameterException("TODO - implement for ${viewType.toViewType()}")
             }
@@ -113,26 +85,12 @@ class ChatRoomAdapter(
         when (holder) {
             is MessageViewHolder ->
                 holder.bind(dataSet[position] as MessageUiModel)
-            is ImageAttachmentViewHolder ->
-                holder.bind(dataSet[position] as ImageAttachmentUiModel)
-            is AudioAttachmentViewHolder ->
-                holder.bind(dataSet[position] as AudioAttachmentUiModel)
-            is VideoAttachmentViewHolder ->
-                holder.bind(dataSet[position] as VideoAttachmentUiModel)
             is UrlPreviewViewHolder ->
                 holder.bind(dataSet[position] as UrlPreviewUiModel)
-            is MessageAttachmentViewHolder ->
-                holder.bind(dataSet[position] as MessageAttachmentUiModel)
-            is AuthorAttachmentViewHolder ->
-                holder.bind(dataSet[position] as AuthorAttachmentUiModel)
-            is ColorAttachmentViewHolder ->
-                holder.bind(dataSet[position] as ColorAttachmentUiModel)
-            is GenericFileAttachmentViewHolder ->
-                holder.bind(dataSet[position] as GenericFileAttachmentUiModel)
             is MessageReplyViewHolder ->
                 holder.bind(dataSet[position] as MessageReplyUiModel)
-            is ActionsAttachmentViewHolder ->
-                holder.bind(dataSet[position] as ActionsAttachmentUiModel)
+            is AttachmentViewHolder ->
+                holder.bind(dataSet[position] as AttachmentUiModel)
         }
     }
 
@@ -140,8 +98,7 @@ class ChatRoomAdapter(
         val model = dataSet[position]
         return when (model) {
             is MessageUiModel -> model.messageId.hashCode().toLong()
-            is BaseFileAttachmentUiModel -> model.id
-            is AuthorAttachmentUiModel -> model.id
+            is AttachmentUiModel -> model.id
             else -> return position.toLong()
         }
     }
@@ -291,6 +248,9 @@ class ChatRoomAdapter(
                     R.id.action_menu_msg_react -> {
                         actionSelectListener?.showReactions(id)
                     }
+                    R.id.action_message_permalink -> {
+                        actionSelectListener?.copyPermalink(id)
+                    }
                     else -> {
                         TODO("Not implemented")
                     }
@@ -310,5 +270,6 @@ class ChatRoomAdapter(
         fun showReactions(id: String)
         fun openDirectMessage(roomName: String, message: String)
         fun sendMessage(chatRoomId: String, text: String)
+        fun copyPermalink(id: String)
     }
-}
+}
\ No newline at end of file

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

-package chat.rocket.android.chatroom.adapter
-
-import android.graphics.drawable.ColorDrawable
-import android.graphics.drawable.Drawable
-import androidx.core.content.ContextCompat
-import android.text.method.LinkMovementMethod
-import android.view.View
-import androidx.core.view.isVisible
-import androidx.core.widget.ImageViewCompat
-import chat.rocket.android.R
-import chat.rocket.android.chatroom.uimodel.ColorAttachmentUiModel
-import chat.rocket.android.emoji.EmojiReactionListener
-import kotlinx.android.synthetic.main.item_color_attachment.view.*
-
-
-class ColorAttachmentViewHolder(itemView: View,
-                                listener: BaseViewHolder.ActionsListener,
-                                reactionListener: EmojiReactionListener? = null)
-    : BaseViewHolder<ColorAttachmentUiModel>(itemView, listener, reactionListener) {
-
-    val drawable: Drawable = ColorDrawable(ContextCompat.getColor(itemView.context, R.color.quoteBar))
-
-    init {
-        with(itemView) {
-            setupActionMenu(color_attachment_container)
-            attachment_text.movementMethod = LinkMovementMethod()
-        }
-    }
-
-    override fun bindViews(data: ColorAttachmentUiModel) {
-        with(itemView) {
-                quote_bar.setColorFilter(data.color)
-                if (data.text.isNotEmpty()) {
-                    attachment_text.isVisible = true
-                    attachment_text.text = data.text
-                } else {
-                    attachment_text.isVisible = false
-                }
-
-                if (data.fields.isNullOrEmpty()) {
-                    text_fields.isVisible = false
-                } else {
-                    text_fields.isVisible = true
-                    text_fields.text = data.fields
-                }
-        }
-    }
-
-}
\ No newline at end of file

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

-package chat.rocket.android.chatroom.adapter
-
-import android.content.Intent
-import android.view.View
-import androidx.core.net.toUri
-import chat.rocket.android.chatroom.uimodel.GenericFileAttachmentUiModel
-import chat.rocket.android.emoji.EmojiReactionListener
-import chat.rocket.android.util.extensions.content
-import kotlinx.android.synthetic.main.item_file_attachment.view.*
-
-class GenericFileAttachmentViewHolder(itemView: View,
-                                      listener: ActionsListener,
-                                      reactionListener: EmojiReactionListener? = null)
-    : BaseViewHolder<GenericFileAttachmentUiModel>(itemView, listener, reactionListener) {
-
-    init {
-        with(itemView) {
-            setupActionMenu(file_attachment_container)
-        }
-    }
-
-    override fun bindViews(data: GenericFileAttachmentUiModel) {
-        with(itemView) {
-            text_file_name.content = data.attachmentTitle
-
-            text_file_name.setOnClickListener {
-                it.context.startActivity(Intent(Intent.ACTION_VIEW, data.attachmentUrl.toUri()))
-            }
-        }
-    }
-}
\ No newline at end of file

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

-package chat.rocket.android.chatroom.adapter
-
-import android.view.View
-import chat.rocket.android.chatroom.uimodel.ImageAttachmentUiModel
-import chat.rocket.android.helper.ImageHelper
-import chat.rocket.android.emoji.EmojiReactionListener
-import com.facebook.drawee.backends.pipeline.Fresco
-import kotlinx.android.synthetic.main.message_attachment.view.*
-
-class ImageAttachmentViewHolder(
-    itemView: View,
-    listener: ActionsListener,
-    reactionListener: EmojiReactionListener? = null
-) : BaseViewHolder<ImageAttachmentUiModel>(itemView, listener, reactionListener) {
-
-    init {
-        with(itemView) {
-            setupActionMenu(attachment_container)
-        }
-    }
-
-    override fun bindViews(data: ImageAttachmentUiModel) {
-        with(itemView) {
-            val controller = Fresco.newDraweeControllerBuilder().apply {
-                setUri(data.attachmentUrl)
-                autoPlayAnimations = true
-                oldController = image_attachment.controller
-            }.build()
-            image_attachment.controller = controller
-            file_name.text = data.attachmentTitle
-            file_description.text = data.attachmentDescription
-            file_text.text = data.attachmentText
-            image_attachment.setOnClickListener {
-                ImageHelper.openImage(
-                    context,
-                    data.attachmentUrl,
-                    data.attachmentTitle.toString()
-                )
-            }
-        }
-    }
-}
\ No newline at end of file

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

@@ -4,7 +4,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
@@ -35,17 +34,17 @@ class MessageReactionsAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>()
             }
             else -> {
                 view = inflater.inflate(R.layout.item_reaction, parent, false)
-                SingleReactionViewHolder(view, listener)
+                ReactionViewHolder(view, listener)
             }
         }
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        if (holder is SingleReactionViewHolder) {
+        if (holder is ReactionViewHolder) {
             holder.bind(reactions[position])
         } else {
             holder as AddReactionViewHolder
-            holder.bind(reactions[0].messageId)
+            holder.bind(reactions.first().messageId)
         }
     }
 
@@ -73,7 +72,7 @@ class MessageReactionsAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>()
     fun contains(reactionShortname: String) =
         reactions.firstOrNull { it.shortname == reactionShortname } != null
 
-    class SingleReactionViewHolder(
+    class ReactionViewHolder(
         view: View,
         private val listener: EmojiReactionListener?
     ) : RecyclerView.ViewHolder(view), View.OnClickListener {
@@ -97,9 +96,11 @@ class MessageReactionsAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>()
             this.reaction = reaction
             with(itemView) {
                 if (reaction.url.isNullOrEmpty()) {
-                    text_emoji.text = reaction.unicode
+                    // The view at index 0 corresponds to the one to display unicode text emoji.
                     view_flipper_reaction.displayedChild = 0
+                    text_emoji.text = reaction.unicode
                 } else {
+                    // The view at index 1 corresponds to the one to display custom emojis which are images.
                     view_flipper_reaction.displayedChild = 1
                     val glideRequest = if (reaction.url!!.endsWith("gif", true)) {
                         GlideApp.with(context).asGif()
@@ -110,15 +111,16 @@ class MessageReactionsAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>()
                     glideRequest.load(reaction.url).into(image_emoji)
                 }
 
-                text_count.text = reaction.count.toString()
                 val myself = localRepository.get(LocalRepository.CURRENT_USERNAME_KEY)
                 if (reaction.usernames.contains(myself)) {
                     val context = itemView.context
                     text_count.setTextColor(ContextCompat.getColor(context, R.color.colorAccent))
                 }
 
-                view_flipper_reaction.setOnClickListener(this@SingleReactionViewHolder)
-                text_count.setOnClickListener(this@SingleReactionViewHolder)
+                text_count.text = reaction.count.toString()
+
+                view_flipper_reaction.setOnClickListener(this@ReactionViewHolder)
+                text_count.setOnClickListener(this@ReactionViewHolder)
             }
         }
 

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

@@ -7,10 +7,10 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.core.view.isVisible
 import chat.rocket.android.R
 import chat.rocket.android.chatroom.adapter.PeopleSuggestionsAdapter.PeopleSuggestionViewHolder
 import chat.rocket.android.chatroom.uimodel.suggestion.PeopleSuggestionUiModel
-import chat.rocket.android.util.extensions.setVisible
 import chat.rocket.android.suggestions.model.SuggestionModel
 import chat.rocket.android.suggestions.ui.BaseSuggestionViewHolder
 import chat.rocket.android.suggestions.ui.SuggestionsAdapter
@@ -58,9 +58,9 @@ class PeopleSuggestionsAdapter(context: Context) : SuggestionsAdapter<PeopleSugg
                 username.text = item.username
                 name.text = item.name
                 if (item.imageUri?.isEmpty() != false) {
-                    avatar.setVisible(false)
+                    avatar.isVisible = false
                 } else {
-                    avatar.setVisible(true)
+                    avatar.isVisible = true
                     avatar.setImageURI(item.imageUri)
                 }
                 val status = item.status
@@ -68,7 +68,7 @@ class PeopleSuggestionsAdapter(context: Context) : SuggestionsAdapter<PeopleSugg
                     val statusDrawable = DrawableHelper.getUserStatusDrawable(status, itemView.context)
                     statusView.setImageDrawable(statusDrawable)
                 } else {
-                    statusView.setVisible(false)
+                    statusView.isVisible = false
                 }
                 setOnClickListener {
                     itemClickListener?.onClick(item)

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

-package chat.rocket.android.chatroom.adapter
-
-import android.view.View
-import androidx.core.view.isVisible
-import chat.rocket.android.chatroom.uimodel.VideoAttachmentUiModel
-import chat.rocket.android.player.PlayerActivity
-import chat.rocket.android.emoji.EmojiReactionListener
-import kotlinx.android.synthetic.main.message_attachment.view.*
-
-class VideoAttachmentViewHolder(itemView: View,
-                                listener: ActionsListener,
-                                reactionListener: EmojiReactionListener? = null)
-    : BaseViewHolder<VideoAttachmentUiModel>(itemView, listener, reactionListener) {
-
-    init {
-        with(itemView) {
-            setupActionMenu(attachment_container)
-            image_attachment.isVisible = false
-            audio_video_attachment.isVisible = true
-        }
-    }
-
-    override fun bindViews(data: VideoAttachmentUiModel) {
-        with(itemView) {
-            file_name.text = data.attachmentTitle
-            audio_video_attachment.setOnClickListener { view ->
-                data.attachmentUrl.let { url ->
-                    PlayerActivity.play(view.context, url)
-                }
-            }
-        }
-    }
-}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt

@@ -35,6 +35,7 @@ import chat.rocket.android.server.domain.useRealName
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
 import chat.rocket.android.server.infraestructure.state
 import chat.rocket.android.util.extension.compressImageAndGetByteArray
+import chat.rocket.android.util.extension.getByteArray
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.retryIO
@@ -80,6 +81,7 @@ import kotlinx.coroutines.experimental.launch
 import kotlinx.coroutines.experimental.withContext
 import org.threeten.bp.Instant
 import timber.log.Timber
+import java.io.InputStream
 import java.util.*
 import javax.inject.Inject
 
@@ -174,7 +176,9 @@ class ChatRoomPresenter @Inject constructor(
             view.showLoading()
             try {
                 if (offset == 0L) {
-                    val localMessages = messagesRepository.getByRoomId(chatRoomId)
+                    // FIXME - load just 50 messages from DB to speed up. We will reload from Network after that
+                    // FIXME - We need to handle the pagination, first fetch from DB, then from network
+                    val localMessages = messagesRepository.getRecentMessages(chatRoomId, 50)
                     val oldMessages = mapper.map(
                         localMessages, RoomUiModel(
                         roles = chatRoles,
@@ -346,15 +350,51 @@ class ChatRoomPresenter @Inject constructor(
         view.showFileSelection(settings.uploadMimeTypeFilter())
     }
 
-    fun uploadFile(roomId: String, uri: Uri, msg: String, bitmap: Bitmap? = null) {
+    fun uploadImage(roomId: String, mimeType: String, uri: Uri, bitmap: Bitmap, msg: String) {
         launchUI(strategy) {
             view.showLoading()
             try {
                 withContext(DefaultDispatcher) {
                     val fileName = uriInteractor.getFileName(uri) ?: uri.toString()
-                    val mimeType = uriInteractor.getMimeType(uri)
-                    val byteArray = bitmap?.compressImageAndGetByteArray(mimeType)
-                    val fileSize = byteArray?.size ?: uriInteractor.getFileSize(uri)
+                    if (fileName.isEmpty()) {
+                        view.showInvalidFileMessage()
+                    } else {
+                        val byteArray =
+                            bitmap.getByteArray(mimeType, 100, settings.uploadMaxFileSize())
+                        retryIO("uploadFile($roomId, $fileName, $mimeType") {
+                            client.uploadFile(
+                                roomId,
+                                fileName,
+                                mimeType,
+                                msg,
+                                description = fileName
+                            ) {
+                                byteArray.inputStream()
+                            }
+                        }
+
+                        logMediaUploaded(mimeType)
+                    }
+                }
+            } catch (ex: Exception) {
+                Timber.d(ex, "Error uploading image")
+                when (ex) {
+                    is RocketChatException -> view.showMessage(ex)
+                    else -> view.showGenericErrorMessage()
+                }
+            } finally {
+                view.hideLoading()
+            }
+        }
+    }
+
+    fun uploadFile(roomId: String, mimeType: String, uri: Uri, msg: String) {
+        launchUI(strategy) {
+            view.showLoading()
+            try {
+                withContext(DefaultDispatcher) {
+                    val fileName = uriInteractor.getFileName(uri) ?: uri.toString()
+                    val fileSize = uriInteractor.getFileSize(uri)
                     val maxFileSizeAllowed = settings.uploadMaxFileSize()
 
                     when {
@@ -370,7 +410,7 @@ class ChatRoomPresenter @Inject constructor(
                                     msg,
                                     description = fileName
                                 ) {
-                                    byteArray?.inputStream() ?: uriInteractor.getInputStream(uri)
+                                    uriInteractor.getInputStream(uri)
                                 }
                             }
                             logMediaUploaded(mimeType)
@@ -503,7 +543,7 @@ class ChatRoomPresenter @Inject constructor(
                     val messages =
                         retryIO(description = "history($chatRoomId, $roomType, $instant)") {
                             client.history(
-                                    chatRoomId, roomType, count = 50,
+                                chatRoomId, roomType, count = 50,
                                 oldest = instant
                             )
                         }
@@ -620,6 +660,7 @@ class ChatRoomPresenter @Inject constructor(
             try {
                 messagesRepository.getById(messageId)?.let { m ->
                     view.copyToClipboard(m.message)
+                    view.showMessage(R.string.msg_message_copied)
                 }
             } catch (e: RocketChatException) {
                 Timber.e(e)
@@ -857,6 +898,42 @@ class ChatRoomPresenter @Inject constructor(
         }
     }
 
+    // TODO: move this to new interactor or FetchChatRoomsInteractor?
+    private suspend fun getChatRoomAsync(roomId: String): ChatRoom? = withContext(CommonPool) {
+        return@withContext dbManager.chatRoomDao().get(roomId)?.let {
+            with(it.chatRoom) {
+                ChatRoom(
+                    id = id,
+                    subscriptionId = subscriptionId,
+                    type = roomTypeOf(type),
+                    unread = unread,
+                    broadcast = broadcast ?: false,
+                    alert = alert,
+                    fullName = fullname,
+                    name = name,
+                    favorite = favorite ?: false,
+                    default = isDefault ?: false,
+                    readonly = readonly,
+                    open = open,
+                    lastMessage = null,
+                    archived = false,
+                    status = null,
+                    user = null,
+                    userMentions = userMentions,
+                    client = client,
+                    announcement = null,
+                    description = null,
+                    groupMentions = groupMentions,
+                    roles = null,
+                    topic = null,
+                    lastSeen = this.lastSeen,
+                    timestamp = timestamp,
+                    updatedAt = updatedAt
+                )
+            }
+        }
+    }
+
     // TODO: move this to new interactor or FetchChatRoomsInteractor?
     private suspend fun getChatRoomsAsync(name: String? = null): List<ChatRoom> = withContext(CommonPool) {
         return@withContext dbManager.chatRoomDao().getAllSync().filter {
@@ -939,6 +1016,24 @@ class ChatRoomPresenter @Inject constructor(
         }
     }
 
+    fun copyPermalink(messageId: String) {
+        launchUI(strategy) {
+            try {
+                messagesRepository.getById(messageId)?.let { message ->
+                    getChatRoomAsync(message.roomId)?.let { chatRoom ->
+                        val models = mapper.map(message)
+                        models.firstOrNull()?.permalink?.let {
+                            view.copyToClipboard(it)
+                            view.showMessage(R.string.msg_permalink_copied)
+                        }
+                    }
+                }
+            } catch (ex: Exception) {
+                Timber.e(ex)
+            }
+        }
+    }
+
     /**
      * Send an emoji reaction to a message.
      */

app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt

@@ -266,16 +266,16 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
 
     override fun onPause() {
         super.onPause()
-        setReactionButtonIcon(R.drawable.ic_reaction_24dp)
         dismissEmojiKeyboard()
         activity?.invalidateOptionsMenu()
     }
 
-    private fun dismissEmojiKeyboard() {
+    fun dismissEmojiKeyboard() {
         // Check if the keyboard was ever initialized.
         // It may be the case when you are looking a not joined room
         if (::emojiKeyboardPopup.isInitialized) {
             emojiKeyboardPopup.dismiss()
+            setReactionButtonIcon(R.drawable.ic_reaction_24dp)
         }
     }
 
@@ -621,7 +621,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         ui {
             val clipboard = it.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
             clipboard.primaryClip = ClipData.newPlainText("", message)
-            showToast(R.string.msg_message_copied)
         }
     }
 
@@ -784,8 +783,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
                         context: Context
                     ) {
                         if (f is MessageActionsBottomSheet) {
-                            setReactionButtonIcon(R.drawable.ic_reaction_24dp)
-                            emojiKeyboardPopup.dismiss()
+                            dismissEmojiKeyboard()
                         }
                     }
                 },
@@ -805,9 +803,8 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
                             it.onBackPressed()
                         }
                         KeyboardHelper.hideSoftKeyboard(it)
-                        emojiKeyboardPopup.dismiss()
+                        dismissEmojiKeyboard()
                     }
-                    setReactionButtonIcon(R.drawable.ic_reaction_24dp)
                 }
             }
 
@@ -917,8 +914,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             setReactionButtonIcon(R.drawable.ic_keyboard_black_24dp)
         } else {
             // If popup is showing, simply dismiss it to show the underlying text keyboard
-            emojiKeyboardPopup.dismiss()
-            setReactionButtonIcon(R.drawable.ic_reaction_24dp)
+            dismissEmojiKeyboard()
         }
     }
 
@@ -1062,6 +1058,10 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         }
     }
 
+    override fun copyPermalink(id: String) {
+        presenter.copyPermalink(id)
+    }
+
     override fun showReactions(id: String) {
         presenter.showReactions(id)
     }

app/src/main/java/chat/rocket/android/chatroom/ui/Dialog.kt

@@ -7,6 +7,7 @@ import androidx.core.view.isVisible
 import chat.rocket.android.emoji.internal.GlideApp
 import chat.rocket.android.util.extensions.getFileName
 import chat.rocket.android.util.extensions.getMimeType
+import chat.rocket.common.util.ifNull
 import com.bumptech.glide.request.target.SimpleTarget
 import com.bumptech.glide.request.transition.Transition
 
@@ -14,29 +15,39 @@ fun ChatRoomFragment.showFileAttachmentDialog(uri: Uri) {
     imagePreview.isVisible = false
     audioVideoAttachment.isVisible = false
     textFile.isVisible = false
+    lateinit var mimeType: String
     var bitmap: Bitmap? = null
 
     activity?.let { context ->
-        uri.getMimeType(context).let { mimeType ->
+        uri.getMimeType(context).let {
+            mimeType = it
             description.text.clear()
             when {
                 mimeType.startsWith("image") -> {
-                    GlideApp
-                        .with(context)
-                        .asBitmap()
-                        .load(uri)
-                        .override(imagePreview.width, imagePreview.height)
-                        .fitCenter()
-                        .into(object : SimpleTarget<Bitmap>() {
-                            override fun onResourceReady(
-                                resource: Bitmap,
-                                transition: Transition<in Bitmap>?
-                            ) {
-                                bitmap = resource
-                                imagePreview.setImageBitmap(resource)
-                                imagePreview.isVisible = true
-                            }
-                        })
+                    if (mimeType.contains("gif")) {
+                        GlideApp
+                            .with(context)
+                            .asGif()
+                            .load(uri)
+                            .fitCenter()
+                            .into(imagePreview)
+                    } else {
+                        GlideApp
+                            .with(context)
+                            .asBitmap()
+                            .load(uri)
+                            .fitCenter()
+                            .into(object : SimpleTarget<Bitmap>() {
+                                override fun onResourceReady(
+                                    resource: Bitmap,
+                                    transition: Transition<in Bitmap>?
+                                ) {
+                                    bitmap = resource
+                                    imagePreview.setImageBitmap(resource)
+                                }
+                            })
+                    }
+                    imagePreview.isVisible = true
                 }
                 mimeType.startsWith("video") -> audioVideoAttachment.isVisible = true
                 else -> {
@@ -48,12 +59,22 @@ fun ChatRoomFragment.showFileAttachmentDialog(uri: Uri) {
     }
 
     sendButton.setOnClickListener {
-        presenter.uploadFile(
-            chatRoomId,
-            uri,
-            (citation ?: "") + description.text.toString(),
-            bitmap
-        )
+        bitmap?.let { bitmap ->
+            presenter.uploadImage(
+                chatRoomId,
+                mimeType,
+                uri,
+                bitmap,
+                (citation ?: "") + description.text.toString()
+            )
+        }.ifNull {
+            presenter.uploadFile(
+                chatRoomId,
+                mimeType,
+                uri,
+                (citation ?: "") + description.text.toString()
+            )
+        }
         alertDialog.dismiss()
     }
     cancelButton.setOnClickListener { alertDialog.dismiss() }

app/src/main/java/chat/rocket/android/chatroom/ui/Menu.kt

@@ -79,6 +79,17 @@ private fun ChatRoomFragment.setupSearchMessageMenuItem(menu: Menu, context: Con
         .setShowAsActionFlags(
             MenuItem.SHOW_AS_ACTION_IF_ROOM or MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW
         )
+        .setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
+            override fun onMenuItemActionExpand(item: MenuItem?): Boolean {
+                dismissEmojiKeyboard()
+                return true
+            }
+
+            override fun onMenuItemActionCollapse(item: MenuItem?): Boolean {
+                dismissEmojiKeyboard()
+                return true
+            }
+        })
 
     (searchItem?.actionView as? SearchView)?.let {
         // TODO: Check why we need to stylize the search text programmatically instead of by defining it in the styles.xml (ChatRoom.SearchView)

app/src/main/java/chat/rocket/android/chatroom/ui/bottomsheet/MessageActionsBottomSheet.kt

@@ -73,4 +73,4 @@ class MessageActionsBottomSheet : BottomSheetDialogFragment() {
             }
         }
     }
-}
+}
\ No newline at end of file

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

-package chat.rocket.android.chatroom.uimodel
-
-import chat.rocket.android.R
-import chat.rocket.core.model.Message
-import chat.rocket.core.model.attachment.actions.Action
-import chat.rocket.core.model.attachment.actions.ActionsAttachment
-
-data class ActionsAttachmentUiModel(
-	override val attachmentUrl: String,
-	val title: String?,
-	val actions: List<Action>,
-	val buttonAlignment: String,
-	override val message: Message,
-	override val rawData: ActionsAttachment,
-	override val messageId: String,
-	override var reactions: List<ReactionUiModel>,
-	override var nextDownStreamMessage: BaseUiModel<*>? = null,
-	override var preview: Message? = null,
-	override var isTemporary: Boolean = false,
-	override var unread: Boolean? = null,
-	override var menuItemsToHide: MutableList<Int> = mutableListOf(),
-	override var currentDayMarkerText: String,
-	override var showDayMarker: Boolean
-) : BaseAttachmentUiModel<ActionsAttachment> {
-	override val viewType: Int
-		get() = BaseUiModel.ViewType.ACTIONS_ATTACHMENT.viewType
-	override val layoutId: Int
-		get() = R.layout.item_actions_attachment
-}
\ No newline at end of file

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

+package chat.rocket.android.chatroom.uimodel
+
+import chat.rocket.android.R
+import chat.rocket.core.model.Message
+import chat.rocket.core.model.attachment.Attachment
+import chat.rocket.core.model.attachment.actions.Action
+
+data class AttachmentUiModel(
+        override val message: Message,
+        override val rawData: Attachment,
+        override val messageId: String,
+        override var reactions: List<ReactionUiModel>,
+        override var nextDownStreamMessage: BaseUiModel<*>? = null,
+        override var preview: Message?,
+        override var isTemporary: Boolean,
+        override var unread: Boolean?,
+        override var currentDayMarkerText: String,
+        override var showDayMarker: Boolean,
+        override var menuItemsToHide: MutableList<Int> = mutableListOf(),
+        override var permalink: String,
+        val id: Long,
+        val title: CharSequence?,
+        val description: CharSequence?,
+        val authorName: CharSequence?,
+        val text: CharSequence?,
+        val color: Int?,
+        val imageUrl: String?,
+        val videoUrl: String?,
+        val audioUrl: String?,
+        val titleLink: String?,
+        val messageLink: String?,
+        val type: String?,
+        // TODO - attachments
+        val timestamp: CharSequence?,
+        val authorIcon: String?,
+        val authorLink: String?,
+        val fields: CharSequence?,
+        val buttonAlignment: String?,
+        val actions: List<Action>?
+) : BaseUiModel<Attachment> {
+    override val viewType: Int
+        get() = BaseUiModel.ViewType.ATTACHMENT.viewType
+    override val layoutId: Int
+        get() = R.layout.item_message_attachment
+
+    val hasTitle: Boolean
+        get() = !title.isNullOrEmpty()
+    val hasDescription: Boolean
+        get() = !description.isNullOrEmpty()
+    val hasText: Boolean
+        get() = !text.isNullOrEmpty()
+    val hasImage: Boolean
+        get() = imageUrl.orEmpty().isNotEmpty()
+    val hasVideo: Boolean
+        get() = videoUrl.orEmpty().isNotEmpty()
+    val hasAudio: Boolean
+        get() = audioUrl.orEmpty().isNotEmpty()
+    val hasAudioOrVideo: Boolean
+        get() = hasAudio || hasVideo
+    val hasFile: Boolean
+        get() = type.orEmpty().contentEquals("file") && titleLink.orEmpty().isNotEmpty()
+    val hasTitleLink: Boolean
+        get() = titleLink.orEmpty().isNotEmpty()
+    val hasMedia: Boolean
+        get() = hasImage || hasAudioOrVideo || hasFile
+    val hasMessage: Boolean
+        get() = messageLink.orEmpty().isNotEmpty()
+    val hasAuthorName: Boolean
+        get() = !authorName.isNullOrEmpty()
+    val hasAuthorLink: Boolean
+        get() = authorLink.orEmpty().isNotEmpty()
+    val hasAuthorIcon: Boolean
+        get() = authorIcon.orEmpty().isNotEmpty()
+    val hasFields: Boolean
+        get() = !fields.isNullOrEmpty()
+    val hasActions: Boolean
+        get() = actions != null && actions.isNotEmpty()
+}

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

-package chat.rocket.android.chatroom.uimodel
-
-import chat.rocket.android.R
-import chat.rocket.core.model.Message
-import chat.rocket.core.model.attachment.AudioAttachment
-
-data class AudioAttachmentUiModel(
-        override val message: Message,
-        override val rawData: AudioAttachment,
-        override val messageId: String,
-        override val attachmentUrl: String,
-        override val attachmentTitle: CharSequence,
-        override val id: Long,
-        override var reactions: List<ReactionUiModel>,
-        override var nextDownStreamMessage: BaseUiModel<*>? = null,
-        override var preview: Message? = null,
-        override var isTemporary: Boolean = false,
-        override var unread: Boolean? = null,
-        override var menuItemsToHide: MutableList<Int> = mutableListOf(),
-        override var currentDayMarkerText: String,
-        override var showDayMarker: Boolean
-) : BaseFileAttachmentUiModel<AudioAttachment> {
-    override val viewType: Int
-        get() = BaseUiModel.ViewType.AUDIO_ATTACHMENT.viewType
-    override val layoutId: Int
-        get() = R.layout.message_attachment
-}
\ No newline at end of file

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

-package chat.rocket.android.chatroom.uimodel
-
-import chat.rocket.android.R
-import chat.rocket.core.model.Message
-import chat.rocket.core.model.attachment.AuthorAttachment
-
-data class AuthorAttachmentUiModel(
-    override val attachmentUrl: String,
-    val id: Long,
-    val name: CharSequence?,
-    val icon: String?,
-    val fields: CharSequence?,
-    override val message: Message,
-    override val rawData: AuthorAttachment,
-    override val messageId: String,
-    override var reactions: List<ReactionUiModel>,
-    override var nextDownStreamMessage: BaseUiModel<*>? = null,
-    override var preview: Message? = null,
-    override var isTemporary: Boolean = false,
-    override var unread: Boolean? = null,
-    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
-    override var currentDayMarkerText: String,
-    override var showDayMarker: Boolean
-) : BaseAttachmentUiModel<AuthorAttachment> {
-    override val viewType: Int
-        get() = BaseUiModel.ViewType.AUTHOR_ATTACHMENT.viewType
-    override val layoutId: Int
-        get() = R.layout.item_author_attachment
-}
\ No newline at end of file

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

-package chat.rocket.android.chatroom.uimodel
-
-interface BaseFileAttachmentUiModel<out T> : BaseAttachmentUiModel<T> {
-    val attachmentTitle: CharSequence
-    val id: Long
-}
\ No newline at end of file

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

@@ -17,20 +17,14 @@ interface BaseUiModel<out T> {
     var currentDayMarkerText: String
     var showDayMarker: Boolean
     var menuItemsToHide: MutableList<Int>
+    var permalink: String
 
     enum class ViewType(val viewType: Int) {
         MESSAGE(0),
         SYSTEM_MESSAGE(1),
         URL_PREVIEW(2),
-        IMAGE_ATTACHMENT(3),
-        VIDEO_ATTACHMENT(4),
-        AUDIO_ATTACHMENT(5),
-        MESSAGE_ATTACHMENT(6),
-        AUTHOR_ATTACHMENT(7),
-        COLOR_ATTACHMENT(8),
-        GENERIC_FILE_ATTACHMENT(9),
-        MESSAGE_REPLY(10),
-        ACTIONS_ATTACHMENT(11)
+        ATTACHMENT(3),
+        MESSAGE_REPLY(4)
     }
 }
 

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

-package chat.rocket.android.chatroom.uimodel
-
-import chat.rocket.android.R
-import chat.rocket.core.model.Message
-import chat.rocket.core.model.attachment.ColorAttachment
-
-data class ColorAttachmentUiModel(
-    override val attachmentUrl: String,
-    val id: Long,
-    val color: Int,
-    val text: CharSequence,
-    val fields: CharSequence? = null,
-    override val message: Message,
-    override val rawData: ColorAttachment,
-    override val messageId: String,
-    override var reactions: List<ReactionUiModel>,
-    override var nextDownStreamMessage: BaseUiModel<*>? = null,
-    override var preview: Message? = null,
-    override var isTemporary: Boolean = false,
-    override var unread: Boolean?,
-    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
-    override var currentDayMarkerText: String,
-    override var showDayMarker: Boolean
-) : BaseAttachmentUiModel<ColorAttachment> {
-    override val viewType: Int
-        get() = BaseUiModel.ViewType.COLOR_ATTACHMENT.viewType
-    override val layoutId: Int
-        get() = R.layout.item_color_attachment
-}
\ No newline at end of file

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

-package chat.rocket.android.chatroom.uimodel
-
-import chat.rocket.android.R
-import chat.rocket.core.model.Message
-import chat.rocket.core.model.attachment.GenericFileAttachment
-
-data class GenericFileAttachmentUiModel(
-    override val message: Message,
-    override val rawData: GenericFileAttachment,
-    override val messageId: String,
-    override val attachmentUrl: String,
-    override val attachmentTitle: CharSequence,
-    override val id: Long,
-    override var reactions: List<ReactionUiModel>,
-    override var nextDownStreamMessage: BaseUiModel<*>? = null,
-    override var preview: Message? = null,
-    override var isTemporary: Boolean = false,
-    override var unread: Boolean? = null,
-    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
-    override var currentDayMarkerText: String,
-    override var showDayMarker: Boolean
-) : BaseFileAttachmentUiModel<GenericFileAttachment> {
-    override val viewType: Int
-        get() = BaseUiModel.ViewType.GENERIC_FILE_ATTACHMENT.viewType
-    override val layoutId: Int
-        get() = R.layout.item_file_attachment
-}
\ No newline at end of file

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

-package chat.rocket.android.chatroom.uimodel
-
-import chat.rocket.android.R
-import chat.rocket.core.model.Message
-import chat.rocket.core.model.attachment.ImageAttachment
-
-data class ImageAttachmentUiModel(
-    override val message: Message,
-    override val rawData: ImageAttachment,
-    override val messageId: String,
-    override val attachmentUrl: String,
-    override val attachmentTitle: CharSequence,
-    val attachmentText: String?,
-    val attachmentDescription: String?,
-    override val id: Long,
-    override var reactions: List<ReactionUiModel>,
-    override var nextDownStreamMessage: BaseUiModel<*>? = null,
-    override var preview: Message? = null,
-    override var isTemporary: Boolean = false,
-    override var unread: Boolean? = null,
-    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
-    override var currentDayMarkerText: String,
-    override var showDayMarker: Boolean
-) : BaseFileAttachmentUiModel<ImageAttachment> {
-    override val viewType: Int
-        get() = BaseUiModel.ViewType.IMAGE_ATTACHMENT.viewType
-    override val layoutId: Int
-        get() = R.layout.message_attachment
-}
\ No newline at end of file

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

-package chat.rocket.android.chatroom.uimodel
-
-import chat.rocket.android.R
-import chat.rocket.core.model.Message
-
-data class MessageAttachmentUiModel(
-    override val message: Message,
-    override val rawData: Message,
-    override val messageId: String,
-    var senderName: String?,
-    val time: CharSequence?,
-    val content: CharSequence,
-    val isPinned: Boolean,
-    override var reactions: List<ReactionUiModel>,
-    override var nextDownStreamMessage: BaseUiModel<*>? = null,
-    var messageLink: String? = null,
-    override var preview: Message? = null,
-    override var isTemporary: Boolean = false,
-    override var unread: Boolean? = null,
-    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
-    override var currentDayMarkerText: String,
-    override var showDayMarker: Boolean
-) : BaseUiModel<Message> {
-    override val viewType: Int
-        get() = BaseUiModel.ViewType.MESSAGE_ATTACHMENT.viewType
-
-    override val layoutId: Int
-        get() = R.layout.item_message_attachment
-}
\ No newline at end of file

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

@@ -15,7 +15,8 @@ data class MessageReplyUiModel(
     override var unread: Boolean? = null,
     override var menuItemsToHide: MutableList<Int> = mutableListOf(),
     override var currentDayMarkerText: String,
-    override var showDayMarker: Boolean
+    override var showDayMarker: Boolean,
+    override var permalink: String
 ) : BaseUiModel<MessageReply> {
     override val viewType: Int
         get() = BaseUiModel.ViewType.MESSAGE_REPLY.viewType

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

@@ -20,7 +20,8 @@ data class MessageUiModel(
     override var unread: Boolean? = null,
     var isFirstUnread: Boolean,
     override var isTemporary: Boolean = false,
-    override var menuItemsToHide: MutableList<Int> = mutableListOf()
+    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
+    override var permalink: String
 ) : BaseMessageUiModel<Message> {
     override val viewType: Int
         get() = BaseUiModel.ViewType.MESSAGE.viewType

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

@@ -19,7 +19,8 @@ data class UrlPreviewUiModel(
     override var unread: Boolean? = null,
     override var menuItemsToHide: MutableList<Int> = mutableListOf(),
     override var currentDayMarkerText: String,
-    override var showDayMarker: Boolean
+    override var showDayMarker: Boolean,
+    override var permalink: String
 ) : BaseUiModel<Url> {
     override val viewType: Int
         get() = BaseUiModel.ViewType.URL_PREVIEW.viewType

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

-package chat.rocket.android.chatroom.uimodel
-
-import chat.rocket.android.R
-import chat.rocket.core.model.Message
-import chat.rocket.core.model.attachment.VideoAttachment
-
-data class VideoAttachmentUiModel(
-        override val message: Message,
-        override val rawData: VideoAttachment,
-        override val messageId: String,
-        override val attachmentUrl: String,
-        override val attachmentTitle: CharSequence,
-        override val id: Long,
-        override var reactions: List<ReactionUiModel>,
-        override var nextDownStreamMessage: BaseUiModel<*>? = null,
-        override var preview: Message? = null,
-        override var isTemporary: Boolean = false,
-        override var unread: Boolean? = null,
-        override var menuItemsToHide: MutableList<Int> = mutableListOf(),
-        override var currentDayMarkerText: String,
-        override var showDayMarker: Boolean
-) : BaseFileAttachmentUiModel<VideoAttachment> {
-    override val viewType: Int
-        get() = BaseUiModel.ViewType.VIDEO_ATTACHMENT.viewType
-    override val layoutId: Int
-        get() = R.layout.message_attachment
-}
\ No newline at end of file

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

@@ -2,7 +2,9 @@ package chat.rocket.android.chatroom.uimodel.suggestion
 
 import chat.rocket.android.suggestions.model.SuggestionModel
 
-class ChatRoomSuggestionUiModel(text: String,
-                                val fullName: String,
-                                val name: String,
-                                searchList: List<String>) : SuggestionModel(text, searchList, false)
+class ChatRoomSuggestionUiModel(
+    text: String,
+    val fullName: String,
+    val name: String,
\ No newline at end of file
+    searchList: List<String>
+) : SuggestionModel(text, searchList, false)

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

@@ -2,6 +2,8 @@ package chat.rocket.android.chatroom.uimodel.suggestion
 
 import chat.rocket.android.suggestions.model.SuggestionModel
 
-class CommandSuggestionUiModel(text: String,
-                               val description: String,
-                               searchList: List<String>) : SuggestionModel(text, searchList)
+class CommandSuggestionUiModel(
+    text: String,
+    val description: String,
\ No newline at end of file
+    searchList: List<String>
+) : SuggestionModel(text, searchList)
\ No newline at end of file

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

@@ -3,13 +3,15 @@ package chat.rocket.android.chatroom.uimodel.suggestion
 import chat.rocket.android.suggestions.model.SuggestionModel
 import chat.rocket.common.model.UserStatus
 
-class PeopleSuggestionUiModel(val imageUri: String?,
-                              text: String,
-                              val username: String,
-                              val name: String,
-                              val status: UserStatus?,
-                              pinned: Boolean = false,
-                              searchList: List<String>) : SuggestionModel(text, searchList, pinned) {
+class PeopleSuggestionUiModel(
+    val imageUri: String?,
+    text: String,
+    val username: String,
+    val name: String,
+    val status: UserStatus?,
+    pinned: Boolean = false,
+    searchList: List<String>
+) : SuggestionModel(text, searchList, pinned) {
 
     override fun toString(): String {
         return "PeopleSuggestionUiModel(imageUri='$imageUri', username='$username', name='$name', status=$status, pinned=$pinned)"

app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt

@@ -24,6 +24,7 @@ import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.model.userStatusOf
 import chat.rocket.core.model.Room
 import chat.rocket.core.model.SpotlightResult
+import ru.noties.markwon.Markwon
 
 class RoomUiModelMapper(
     private val context: Application,
@@ -42,27 +43,28 @@ class RoomUiModelMapper(
         userInteractor.get()
     }
 
-    fun map(rooms: List<ChatRoom>, grouped: Boolean = false): List<ItemHolder<*>> {
+    fun map(rooms: List<ChatRoom>, grouped: Boolean = false, showLastMessage: Boolean = true): List<ItemHolder<*>> {
         val list = ArrayList<ItemHolder<*>>(rooms.size + 4)
         var lastType: String? = null
         rooms.forEach { room ->
             if (grouped && lastType != room.chatRoom.type) {
                 list.add(HeaderItemHolder(roomType(room.chatRoom.type)))
             }
-            list.add(RoomItemHolder(map(room)))
+            list.add(RoomItemHolder(map(room, showLastMessage)))
             lastType = room.chatRoom.type
         }
 
         return list
     }
 
-    fun map(spotlight: SpotlightResult): List<ItemHolder<*>> {
+    fun map(spotlight: SpotlightResult, showLastMessage: Boolean = true): List<ItemHolder<*>> {
+
         val list = ArrayList<ItemHolder<*>>(spotlight.users.size + spotlight.rooms.size)
         spotlight.users.filterNot { it.username.isNullOrEmpty() }.forEach { user ->
             list.add(RoomItemHolder(mapUser(user)))
         }
         spotlight.rooms.filterNot { it.name.isNullOrEmpty() }.forEach { room ->
-            list.add(RoomItemHolder(mapRoom(room)))
+            list.add(RoomItemHolder(mapRoom(room, showLastMessage)))
         }
 
         return list
@@ -86,21 +88,21 @@ class RoomUiModelMapper(
         }
     }
 
-    private fun mapRoom(room: Room): RoomUiModel {
+    private fun mapRoom(room: Room, showLastMessage:Boolean = true): RoomUiModel {
         return with(room) {
             RoomUiModel(
                 id = id,
                 name = name!!,
                 type = type,
                 avatar = serverUrl.avatarUrl(name!!, isGroupOrChannel = true),
-                lastMessage = mapLastMessage(lastMessage?.sender?.id, lastMessage?.sender?.username,
+                lastMessage = if(showLastMessage) { mapLastMessage(lastMessage?.sender?.id, lastMessage?.sender?.username,
                         lastMessage?.sender?.name, lastMessage?.message,
-                        isDirectMessage = type is RoomType.DirectMessage)
+                        isDirectMessage = type is RoomType.DirectMessage)} else { null }
             )
         }
     }
 
-    fun map(chatRoom: ChatRoom): RoomUiModel {
+    fun map(chatRoom: ChatRoom, showLastMessage:Boolean = true): RoomUiModel {
         return with(chatRoom.chatRoom) {
             val isUnread = alert || unread > 0
             val type = roomTypeOf(type)
@@ -113,11 +115,13 @@ class RoomUiModelMapper(
                 serverUrl.avatarUrl(name, isGroupOrChannel = true)
             }
             val unread = mapUnread(unread)
-            val lastMessage = mapLastMessage(lastMessageUserId, chatRoom.lastMessageUserName,
+            val lastMessage = if(showLastMessage) { mapLastMessage(lastMessageUserId, chatRoom.lastMessageUserName,
                     chatRoom.lastMessageUserFullName, lastMessageText, isUnread,
-                    type is RoomType.DirectMessage)
+                    type is RoomType.DirectMessage) } else { null }
             val open = open
 
+            val lastMessageMarkdown = lastMessage?.let { Markwon.markdown(context, it.toString()).toString() }
+
             RoomUiModel(
                 id = id,
                 name = roomName,
@@ -127,7 +131,7 @@ class RoomUiModelMapper(
                 date = timestamp,
                 unread = unread,
                 alert = isUnread,
-                lastMessage = lastMessage,
+                lastMessage = lastMessageMarkdown,
                 status = status,
                 username = if (type is RoomType.DirectMessage) name else null
             )
@@ -148,6 +152,7 @@ class RoomUiModelMapper(
     private fun mapLastMessage(userId: String?, name: String?, fullName: String?, text: String?,
                                unread: Boolean = false,
                                isDirectMessage: Boolean = false): CharSequence? {
+
         return if (!settings.showLastMessage()) {
             null
         } else if (name != null && text != null) {

app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt

@@ -33,7 +33,7 @@ class RoomViewHolder(itemView: View, private val listener: (RoomUiModel) -> Unit
 
             if (room.lastMessage != null) {
                 text_last_message.isVisible = true
-                text_last_message.text = Markwon.markdown(context, room.lastMessage.toString()).toString()
+                text_last_message.text = room.lastMessage
             } else {
                 text_last_message.isGone = true
             }

app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomsAdapter.kt

@@ -19,17 +19,21 @@ class RoomsAdapter(private val listener: (RoomUiModel) -> Unit) : RecyclerView.A
         }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder<*> {
-        if (viewType == VIEW_TYPE_ROOM) {
-            val view = parent.inflate(R.layout.item_chat)
-            return RoomViewHolder(view, listener)
-        } else if (viewType == VIEW_TYPE_HEADER) {
-            val view = parent.inflate(R.layout.item_chatroom_header)
-            return HeaderViewHolder(view)
-        } else if (viewType == VIEW_TYPE_LOADING) {
-            val view = parent.inflate(R.layout.item_loading)
-            return LoadingViewHolder(view)
+        return when (viewType) {
+            VIEW_TYPE_ROOM -> {
+                val view = parent.inflate(R.layout.item_chat)
+                RoomViewHolder(view, listener)
+            }
+            VIEW_TYPE_HEADER -> {
+                val view = parent.inflate(R.layout.item_chatroom_header)
+                HeaderViewHolder(view)
+            }
+            VIEW_TYPE_LOADING -> {
+                val view = parent.inflate(R.layout.item_loading)
+                LoadingViewHolder(view)
+            }
+            else -> throw IllegalStateException("View type must be either Room, Header or Loading")
         }
-        throw IllegalStateException("View type must be either Room, Header or Loading")
     }
 
     override fun getItemCount() = values.size

app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsAdapter.kt

@@ -12,6 +12,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.core.view.isVisible
 import chat.rocket.android.R
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.infrastructure.checkIfMyself
@@ -53,13 +54,13 @@ class ChatRoomsAdapter(
             bindName(chatRoom, text_chat_name)
             bindIcon(chatRoom, image_chat_icon)
             if (settings.showLastMessage()) {
-                text_last_message.setVisible(true)
-                text_last_message_date_time.setVisible(true)
+                text_last_message.isVisible = true
+                text_last_message_date_time.isVisible = true
                 bindLastMessageDateTime(chatRoom, text_last_message_date_time)
                 bindLastMessage(chatRoom, text_last_message)
             } else {
-                text_last_message.setVisible(false)
-                text_last_message_date_time.setVisible(false)
+                text_last_message.isVisible = false
+                text_last_message_date_time.isVisible = false
             }
             bindUnreadMessages(chatRoom, text_total_unread_messages)
 
@@ -178,13 +179,13 @@ class ChatRoomsAdapter(
             when {
                 totalUnreadMessage in 1..99 -> {
                     textView.textContent = totalUnreadMessage.toString()
-                    textView.setVisible(true)
+                    textView.isVisible = true
                 }
                 totalUnreadMessage > 99 -> {
                     textView.textContent = context.getString(R.string.msg_more_than_ninety_nine_unread_messages)
-                    textView.setVisible(true)
+                    textView.isVisible = true
                 }
-                else -> textView.setVisible(false)
+                else -> textView.isVisible = false
             }
         }
     }

app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt

@@ -178,11 +178,14 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
             override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
                 // Simply setting sortView to visible won't work, so we invalidate the options
                 // to recreate the entire menu...
+                viewModel.showLastMessage = true
                 activity?.invalidateOptionsMenu()
+                queryChatRoomsByName(null)
                 return true
             }
 
             override fun onMenuItemActionExpand(item: MenuItem): Boolean {
+                viewModel.showLastMessage = false
                 sortView?.isVisible = false
                 return true
             }

app/src/main/java/chat/rocket/android/chatrooms/viewmodel/ChatRoomsViewModel.kt

@@ -30,6 +30,7 @@ import timber.log.Timber
 import java.security.InvalidParameterException
 import kotlin.coroutines.experimental.coroutineContext
 
+
 class ChatRoomsViewModel(
     private val connectionManager: ConnectionManager,
     private val interactor: FetchChatRoomsInteractor,
@@ -41,9 +42,11 @@ class ChatRoomsViewModel(
     private val runContext = newSingleThreadContext("chat-rooms-view-model")
     private val client = connectionManager.client
     private var loaded = false
+    var showLastMessage = true
 
     fun getChatRooms(): LiveData<RoomsModel> {
         return Transformations.switchMap(query) { query ->
+
             return@switchMap if (query.isSearch()) {
                 this@ChatRoomsViewModel.query.wrap(runContext) { _, data: MutableLiveData<RoomsModel> ->
                     val string = (query as Query.Search).query
@@ -53,11 +56,13 @@ class ChatRoomsViewModel(
                     // TODO - find a better way for cancellation checking
                     if (!coroutineContext.isActive) return@wrap
 
-                    val rooms = repository.search(string).let { mapper.map(it) }
+                    val rooms = repository.search(string).let { mapper.map(it, showLastMessage = this.showLastMessage) }
                     data.postValue(rooms.toMutableList() + LoadingItemHolder())
+
+
                     if (!coroutineContext.isActive) return@wrap
 
-                    val spotlight = spotlight(query.query)?.let { mapper.map(it) }
+                    val spotlight = spotlight(query.query)?.let { mapper.map(it, showLastMessage = this.showLastMessage) }
                     if (!coroutineContext.isActive) return@wrap
 
                     spotlight?.let {
@@ -72,7 +77,7 @@ class ChatRoomsViewModel(
                         .distinct()
                         .transform(runContext) { rooms ->
                             val mappedRooms = rooms?.let {
-                                mapper.map(rooms, query.isGrouped())
+                                mapper.map(rooms, query.isGrouped(), this.showLastMessage)
                             }
                             if (loaded && mappedRooms?.isEmpty() == true) {
                                 loadingState.postValue(LoadingState.Loaded(0))

app/src/main/java/chat/rocket/android/dagger/LocalComponent.kt

@@ -19,7 +19,7 @@ interface LocalComponent {
         fun build(): LocalComponent
     }
 
-    fun inject(adapter: MessageReactionsAdapter.SingleReactionViewHolder)
+    fun inject(adapter: MessageReactionsAdapter.ReactionViewHolder)
     fun inject(adapter: MessageReactionsAdapter.AddReactionViewHolder)
 
     /*@Component.Builder

app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt

@@ -40,6 +40,10 @@ import chat.rocket.android.server.domain.PermissionsRepository
 import chat.rocket.android.server.domain.SettingsRepository
 import chat.rocket.android.server.domain.TokenRepository
 import chat.rocket.android.server.domain.UsersRepository
+import chat.rocket.android.server.domain.BasicAuthRepository
+import chat.rocket.android.server.domain.GetBasicAuthInteractor
+import chat.rocket.android.server.domain.SaveBasicAuthInteractor
+import chat.rocket.android.server.infraestructure.SharedPrefsBasicAuthRepository
 import chat.rocket.android.server.infraestructure.DatabaseMessageMapper
 import chat.rocket.android.server.infraestructure.DatabaseMessagesRepository
 import chat.rocket.android.server.infraestructure.JobSchedulerInteractorImpl
@@ -53,6 +57,7 @@ import chat.rocket.android.server.infraestructure.SharedPrefsConnectingServerRep
 import chat.rocket.android.server.infraestructure.SharedPrefsCurrentServerRepository
 import chat.rocket.android.util.AppJsonAdapterFactory
 import chat.rocket.android.util.HttpLoggingInterceptor
+import chat.rocket.android.util.BasicAuthenticatorInterceptor
 import chat.rocket.android.util.TimberLogger
 import chat.rocket.common.internal.FallbackSealedClassJsonAdapter
 import chat.rocket.common.internal.ISO8601Date
@@ -106,9 +111,22 @@ class AppModule {
 
     @Provides
     @Singleton
-    fun provideOkHttpClient(logger: HttpLoggingInterceptor): OkHttpClient {
+    fun provideBasicAuthenticatorInterceptor(
+        getBasicAuthInteractor: GetBasicAuthInteractor,
+        saveBasicAuthInteractor: SaveBasicAuthInteractor
+    ): BasicAuthenticatorInterceptor {
+        return BasicAuthenticatorInterceptor(
+            getBasicAuthInteractor,
+            saveBasicAuthInteractor
+        )
+    }
+
+    @Provides
+    @Singleton
+    fun provideOkHttpClient(logger: HttpLoggingInterceptor, basicAuthenticator: BasicAuthenticatorInterceptor): OkHttpClient {
         return OkHttpClient.Builder()
             .addInterceptor(logger)
+            .addInterceptor(basicAuthenticator)
             .connectTimeout(15, TimeUnit.SECONDS)
             .readTimeout(20, TimeUnit.SECONDS)
             .writeTimeout(15, TimeUnit.SECONDS)
@@ -273,6 +291,14 @@ class AppModule {
         return MessageParser(context, configuration, settingsInteractor.get(url))
     }
 
+    @Provides
+    @Singleton
+    fun provideBasicAuthRepository (
+        preferences: SharedPreferences,
+        moshi: Moshi
+    ): BasicAuthRepository = 
+        SharedPrefsBasicAuthRepository(preferences, moshi)
+
     @Provides
     @Singleton
     fun provideAccountsRepository(

app/src/main/java/chat/rocket/android/db/MessageDao.kt

@@ -40,7 +40,7 @@ abstract class  MessageDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     abstract fun insert(field: AttachmentFieldEntity)
 
-    @Insert(onConflict = OnConflictStrategy.IGNORE)
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     abstract fun insert(reaction: ReactionEntity)
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)

app/src/main/java/chat/rocket/android/db/RCDatabase.kt

@@ -23,7 +23,7 @@ import chat.rocket.android.db.model.UserEntity
         AttachmentFieldEntity::class, AttachmentActionEntity::class, UrlEntity::class,
         ReactionEntity::class, MessagesSync::class
     ],
-    version = 9,
+    version = 10,
     exportSchema = true
 )
 abstract class RCDatabase : RoomDatabase() {

app/src/main/java/chat/rocket/android/db/model/Attachments.kt

 package chat.rocket.android.db.model
 
+import android.content.Context
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.ForeignKey
 import androidx.room.Index
 import androidx.room.PrimaryKey
+import chat.rocket.android.R
 import chat.rocket.android.util.extension.orFalse
+import chat.rocket.android.util.extensions.isNotNullNorEmpty
 import chat.rocket.core.model.attachment.Attachment
-import chat.rocket.core.model.attachment.AudioAttachment
-import chat.rocket.core.model.attachment.AuthorAttachment
-import chat.rocket.core.model.attachment.ColorAttachment
-import chat.rocket.core.model.attachment.GenericFileAttachment
-import chat.rocket.core.model.attachment.ImageAttachment
-import chat.rocket.core.model.attachment.MessageAttachment
-import chat.rocket.core.model.attachment.VideoAttachment
-import chat.rocket.core.model.attachment.actions.ActionsAttachment
 import chat.rocket.core.model.attachment.actions.ButtonAction
-import timber.log.Timber
 
 @Entity(tableName = "attachments",
         foreignKeys = [
@@ -115,150 +109,54 @@ data class AttachmentActionEntity(
     var id: Long? = null
 }
 
-fun Attachment.asEntity(msgId: String): List<BaseMessageEntity> {
-    return when(this) {
-        is ImageAttachment -> listOf(asEntity(msgId))
-        is VideoAttachment -> listOf(asEntity(msgId))
-        is AudioAttachment -> listOf(asEntity(msgId))
-        is AuthorAttachment -> asEntity(msgId)
-        is ColorAttachment -> asEntity(msgId)
-        is MessageAttachment -> listOf(asEntity(msgId))
-        is GenericFileAttachment -> listOf(asEntity(msgId))
-        is ActionsAttachment -> asEntity(msgId)
-        else -> {
-            Timber.d("Missing conversion for: ${javaClass.canonicalName}")
-            emptyList()
-        }
-    }
-}
-
-fun ImageAttachment.asEntity(msgId: String): AttachmentEntity =
-    AttachmentEntity(
-        _id = "${msgId}_${hashCode()}",
-        messageId = msgId,
-        title = title,
-        description =  description,
-        text = text,
-        titleLink = titleLink,
-        titleLinkDownload = titleLinkDownload.orFalse(),
-        imageUrl = url,
-        imageType = type,
-        imageSize = size
-    )
-
-fun VideoAttachment.asEntity(msgId: String): AttachmentEntity =
-    AttachmentEntity(
-        _id = "${msgId}_${hashCode()}",
-        messageId = msgId,
-        title = title,
-        description =  description,
-        text = text,
-        titleLink = titleLink,
-        titleLinkDownload = titleLinkDownload.orFalse(),
-        videoUrl = url,
-        videoType = type,
-        videoSize = size
-    )
-
-fun AudioAttachment.asEntity(msgId: String): AttachmentEntity =
-    AttachmentEntity(
-        _id = "${msgId}_${hashCode()}",
-        messageId = msgId,
-        title = title,
-        description =  description,
-        text = text,
-        titleLink = titleLink,
-        titleLinkDownload = titleLinkDownload.orFalse(),
-        audioUrl = url,
-        audioType = type,
-        audioSize = size
-    )
-
-fun AuthorAttachment.asEntity(msgId: String): List<BaseMessageEntity> {
+fun Attachment.asEntity(msgId: String, context: Context): List<BaseMessageEntity> {
+    val attachmentId = "${msgId}_${hashCode()}"
     val list = mutableListOf<BaseMessageEntity>()
-    val attachment = AttachmentEntity(
-        _id = "${msgId}_${hashCode()}",
-        messageId = msgId,
-        authorLink = url,
-        authorIcon = authorIcon,
-        authorName = authorName,
-        hasFields = fields?.isNotEmpty() == true
-    )
-    list.add(attachment)
 
-    fields?.forEach { field ->
-        val entity = AttachmentFieldEntity(
-            attachmentId = attachment._id,
-            title = field.title,
-            value = field.value
-        )
-        list.add(entity)
-    }
+    val text = mapAttachmentText(text, attachments?.firstOrNull(), context)
 
-    return list
-}
-
-fun ColorAttachment.asEntity(msgId: String): List<BaseMessageEntity> {
-    val list = mutableListOf<BaseMessageEntity>()
-    val attachment = AttachmentEntity(
-        _id = "${msgId}_${hashCode()}",
-        messageId = msgId,
-        color = color.rawColor,
-        fallback = fallback,
-        hasFields = fields?.isNotEmpty() == true
+    val entity = AttachmentEntity(
+            _id = attachmentId,
+            messageId = msgId,
+            title = title,
+            type = type,
+            description =  description,
+            text = text,
+            titleLink = titleLink,
+            titleLinkDownload = titleLinkDownload.orFalse(),
+            imageUrl = imageUrl,
+            imageType = imageType,
+            imageSize = imageSize,
+            videoUrl = videoUrl,
+            videoType = videoType,
+            videoSize = videoSize,
+            audioUrl = audioUrl,
+            audioType = audioType,
+            audioSize = audioSize,
+            authorLink = authorLink,
+            authorIcon = authorIcon,
+            authorName = authorName,
+            color = color?.rawColor,
+            fallback = fallback,
+            thumbUrl = thumbUrl,
+            messageLink = messageLink,
+            timestamp = timestamp,
+            buttonAlignment = buttonAlignment,
+            hasActions = actions?.isNotEmpty() == true,
+            hasFields = fields?.isNotEmpty() == true
     )
-    list.add(attachment)
+    list.add(entity)
 
     fields?.forEach { field ->
         val entity = AttachmentFieldEntity(
-            attachmentId = attachment._id,
-            title = field.title,
-            value = field.value
+                attachmentId = attachmentId,
+                title = field.title,
+                value = field.value
         )
         list.add(entity)
     }
 
-    return list
-}
-
-// TODO - how to model An message attachment with attachments???
-fun MessageAttachment.asEntity(msgId: String): AttachmentEntity =
-    AttachmentEntity(
-        _id = "${msgId}_${hashCode()}",
-        messageId = msgId,
-        authorName = author,
-        authorIcon = icon,
-        text = text,
-        thumbUrl = thumbUrl,
-        color = color?.rawColor,
-        messageLink = url,
-        timestamp = timestamp
-    )
-
-fun GenericFileAttachment.asEntity(msgId: String): AttachmentEntity =
-    AttachmentEntity(
-        _id = "${msgId}_${hashCode()}",
-        messageId = msgId,
-        title = title,
-        description = description,
-        text = text,
-        titleLink = titleLink,
-        titleLinkDownload = titleLinkDownload ?: false
-    )
-
-fun ActionsAttachment.asEntity(msgId: String): List<BaseMessageEntity> {
-    val list = mutableListOf<BaseMessageEntity>()
-    val attachmentId = "${msgId}_${hashCode()}"
-    val attachment = AttachmentEntity(
-            _id = attachmentId,
-            messageId = msgId,
-            title = title,
-            hasActions = true,
-            buttonAlignment = buttonAlignment
-    )
-    list.add(attachment)
-
-    actions.forEach { action ->
+    actions?.forEach { action ->
         when (action) {
             is ButtonAction -> AttachmentActionEntity(
                 attachmentId = attachmentId,
@@ -275,4 +173,20 @@ fun ActionsAttachment.asEntity(msgId: String): List<BaseMessageEntity> {
         }?.let { list.add(it) }
     }
     return list
-}
+}
\ No newline at end of file
+
+fun mapAttachmentText(text: String?, attachment: Attachment?, context: Context): String? {
+    return if (attachment != null) {
+        when {
+            attachment.imageUrl.isNotNullNorEmpty() -> context.getString(R.string.msg_preview_photo)
+            attachment.videoUrl.isNotNullNorEmpty() -> context.getString(R.string.msg_preview_video)
+            attachment.audioUrl.isNotNullNorEmpty() -> context.getString(R.string.msg_preview_audio)
+            attachment.titleLink.isNotNullNorEmpty() &&
+                    attachment.type?.contentEquals("file") == true ->
+                context.getString(R.string.msg_preview_file)
+            else -> text
+        }
+    } else {
+        text
+    }
+}

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

@@ -35,7 +35,7 @@ object ImageHelper {
 
     // TODO - implement a proper image viewer with a proper Transition
     // TODO - We should definitely write our own ImageViewer
-    fun openImage(context: Context, imageUrl: String, imageName: String) {
+    fun openImage(context: Context, imageUrl: String, imageName: String? = "") {
         var imageViewer: ImageViewer? = null
         val request =
             ImageRequestBuilder.newBuilderWithSource(imageUrl.toUri())

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

@@ -17,7 +17,7 @@ class MessageHelper @Inject constructor(
     private val currentServer = serverInteractor.get()!!
     private val settings: PublicSettings = getSettingsInteractor.get(currentServer)
 
-    fun createPermalink(message: Message, chatRoom: ChatRoom): String {
+    fun createPermalink(message: Message, chatRoom: ChatRoom, markdownSyntax: Boolean = true): String {
         val type = when (chatRoom.type) {
             is RoomType.PrivateGroup -> "group"
             is RoomType.Channel -> "channel"
@@ -30,7 +30,8 @@ class MessageHelper @Inject constructor(
         } else {
             chatRoom.name
         }
-        return "[ ]($currentServer/$type/$name?msg=${message.id}) "
+        val permalink = "$currentServer/$type/$name?msg=${message.id}"
+        return if (markdownSyntax) "[ ]($permalink) " else permalink
     }
 
     fun messageIdFromPermalink(permalink: String): String? {

app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt

 package chat.rocket.android.main.presentation
 
 import android.content.Context
+import chat.rocket.android.R
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManagerFactory
 import chat.rocket.android.emoji.Emoji

app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt

@@ -232,6 +232,15 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
         toolbar.setNavigationOnClickListener { openDrawer() }
     }
 
+    fun showLogoutDialog() {
+        val builder = AlertDialog.Builder(this)
+        builder.setTitle(R.string.action_logout)
+        builder.setMessage(R.string.title_confirmation)
+        builder.setPositiveButton(R.string.action_logout) { _, _ -> presenter.logout()}
+            .setNegativeButton(R.string.action_stay) { dialog, _ -> dialog.cancel() }
+        builder.create().show()
+    }
+
     fun setAvatar(avatarUrl: String) {
         headerLayout.image_avatar.setImageURI(avatarUrl)
     }

app/src/main/java/chat/rocket/android/main/ui/Menu.kt

@@ -64,6 +64,6 @@ internal fun MainActivity.onNavDrawerItemSelected(menuItem: MenuItem) {
         R.id.menu_action_profile -> presenter.toUserProfile()
         R.id.menu_action_settings -> presenter.toSettings()
         R.id.menu_action_admin_panel -> presenter.toAdminPanel()
-        R.id.menu_action_logout -> presenter.logout()
+        R.id.menu_action_logout -> showLogoutDialog()
     }
 }

app/src/main/java/chat/rocket/android/members/adapter/MembersAdapter.kt

@@ -43,6 +43,7 @@ class MembersAdapter(private val listener: (MemberUiModel) -> Unit) :
         fun bind(memberUiModel: MemberUiModel, listener: (MemberUiModel) -> Unit) = with(itemView) {
             image_avatar.setImageURI(memberUiModel.avatarUri)
             text_member.content = memberUiModel.displayName
+            text_member.setCompoundDrawablesRelativeWithIntrinsicBounds(DrawableHelper.getUserStatusDrawable(memberUiModel.status, context), null, null, null)
             setOnClickListener { listener(memberUiModel) }
         }
     }

app/src/main/java/chat/rocket/android/members/uimodel/MemberUiModel.kt

@@ -3,6 +3,7 @@ package chat.rocket.android.members.uimodel
 import chat.rocket.android.server.domain.useRealName
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.common.model.User
+import chat.rocket.common.model.UserStatus
 import chat.rocket.core.model.Value
 
 class MemberUiModel(
@@ -16,6 +17,7 @@ class MemberUiModel(
     val username: String?
     val email: String?
     val utcOffset: Float?
+    val status: UserStatus?
 
     init {
         avatarUri = getUserAvatar()
@@ -24,6 +26,7 @@ class MemberUiModel(
         username = getUserUsername()
         email = getUserEmail()
         utcOffset = getUserUtcOffset()
+        status = getUserStatus()
     }
 
     private fun getUserAvatar(): String? {
@@ -47,4 +50,6 @@ class MemberUiModel(
     private fun getUserEmail(): String? = member.emails?.get(0)?.address
 
     private fun getUserUtcOffset(): Float? = member.utcOffset
+
+    private fun getUserStatus(): UserStatus? = member.status
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/server/domain/BasicAuthRepository.kt

+package chat.rocket.android.server.domain
+
+import chat.rocket.android.server.domain.model.BasicAuth
+
+interface BasicAuthRepository {
+    fun save(basicAuth: BasicAuth)
+    fun load(): List<BasicAuth>
+}

app/src/main/java/chat/rocket/android/server/domain/GetBasicAuthInteractor.kt

+package chat.rocket.android.server.domain
+
+import javax.inject.Inject
+
+class GetBasicAuthInteractor @Inject constructor(val repository: BasicAuthRepository) {
+    fun getAll() = repository.load().listIterator()
+}

app/src/main/java/chat/rocket/android/server/domain/SaveBasicAuthInteractor.kt

+package chat.rocket.android.server.domain
+
+import chat.rocket.android.server.domain.model.BasicAuth
+import javax.inject.Inject
+
+class SaveBasicAuthInteractor @Inject constructor(val repository: BasicAuthRepository) {
+    fun save(basicAuth: BasicAuth) = repository.save(basicAuth)
+}

app/src/main/java/chat/rocket/android/server/domain/model/BasicAuth.kt

+package chat.rocket.android.server.domain.model
+
+import se.ansman.kotshi.JsonSerializable
+
+@JsonSerializable
+data class BasicAuth(
+    val host: String,
+    val credentials: String
+)

app/src/main/java/chat/rocket/android/server/infraestructure/DatabaseMessageMapper.kt

@@ -12,18 +12,10 @@ import chat.rocket.common.model.SimpleUser
 import chat.rocket.core.model.Message
 import chat.rocket.core.model.Reactions
 import chat.rocket.core.model.attachment.Attachment
-import chat.rocket.core.model.attachment.AudioAttachment
-import chat.rocket.core.model.attachment.AuthorAttachment
 import chat.rocket.core.model.attachment.Color
-import chat.rocket.core.model.attachment.ColorAttachment
 import chat.rocket.core.model.attachment.DEFAULT_COLOR_STR
 import chat.rocket.core.model.attachment.Field
-import chat.rocket.core.model.attachment.GenericFileAttachment
-import chat.rocket.core.model.attachment.ImageAttachment
-import chat.rocket.core.model.attachment.MessageAttachment
-import chat.rocket.core.model.attachment.VideoAttachment
 import chat.rocket.core.model.attachment.actions.Action
-import chat.rocket.core.model.attachment.actions.ActionsAttachment
 import chat.rocket.core.model.attachment.actions.ButtonAction
 import chat.rocket.core.model.messageTypeOf
 import chat.rocket.core.model.url.Meta
@@ -141,44 +133,57 @@ class DatabaseMessageMapper(private val dbManager: DatabaseManager) {
         val list = mutableListOf<Attachment>()
         attachments.forEach { attachment ->
             with(attachment) {
-                when {
-                    imageUrl != null -> {
-                        ImageAttachment(title, description, text, titleLink, titleLinkDownload, imageUrl, type, imageSize)
-                    }
-                    videoUrl != null -> {
-                        VideoAttachment(title, description, text, titleLink, titleLinkDownload, videoUrl, type, videoSize)
-                    }
-                    audioUrl != null -> {
-                        AudioAttachment(title, description, text, titleLink, titleLinkDownload, audioUrl, type, audioSize)
-                    }
-                    titleLink != null -> {
-                        GenericFileAttachment(title, description, text, titleLink, titleLink, titleLinkDownload)
-                    }
-                    text != null && color != null && fallback != null -> {
-                        ColorAttachment(Color.Custom(color), text, fallback)
-                    }
-                    text != null -> {
-                        // TODO how to model message with attachments
-                        MessageAttachment(authorName, authorIcon, text, thumbUrl,
-                                color?.let { Color.Custom(it) }, messageLink, null, timestamp)
-                    }
-                    authorLink != null -> {
-                        mapAuthorAttachment(this)
-                    }
-                    hasFields -> {
-                        mapColorAttachmentWithFields(this)
-                    }
-                    hasActions -> {
-                        mapActionAttachment(this)
-                    }
-                    else -> null
-                }?.let { list.add(it) }
+                val fields = if (hasFields) {
+                    withContext(CommonPool) {
+                        dbManager.messageDao().getAttachmentFields(attachment._id)
+                    }.map { Field(it.title, it.value) }
+                } else {
+                    null
+                }
+                val actions = if (hasActions) {
+                    withContext(CommonPool) {
+                        dbManager.messageDao().getAttachmentActions(attachment._id)
+                    }.mapNotNull { mapAction(it) }
+                } else {
+                    null
+                }
+
+                val attachment = Attachment(
+                        title = title,
+                        type = type,
+                        description = description,
+                        authorName = authorName,
+                        text = text,
+                        thumbUrl = thumbUrl,
+                        color = color?.let { Color.Custom(color) },
+                        titleLink = titleLink,
+                        titleLinkDownload = titleLinkDownload,
+                        imageUrl = imageUrl,
+                        imageType = imageType,
+                        imageSize = imageSize,
+                        videoUrl = videoUrl,
+                        videoType = videoType,
+                        videoSize = videoSize,
+                        audioUrl = audioUrl,
+                        audioType = audioType,
+                        audioSize = audioSize,
+                        messageLink = messageLink,
+                        attachments = null, // HOW TO MAP THIS
+                        timestamp = timestamp,
+                        authorIcon = authorIcon,
+                        authorLink = authorLink,
+                        fields = fields,
+                        fallback = fallback,
+                        buttonAlignment = if (actions != null && actions.isNotEmpty()) buttonAlignment ?: "vertical" else null,
+                        actions = actions
+                )
+                list.add(attachment)
             }
         }
         return list
     }
 
-    private suspend fun mapColorAttachmentWithFields(entity: AttachmentEntity): ColorAttachment {
+    /*private suspend fun mapColorAttachmentWithFields(entity: AttachmentEntity): ColorAttachment {
         val fields = withContext(CommonPool) {
             dbManager.messageDao().getAttachmentFields(entity._id)
         }.map { Field(it.title, it.value) }
@@ -199,7 +204,7 @@ class DatabaseMessageMapper(private val dbManager: DatabaseManager) {
             // TODO - remove the default "vertical" value from here...
             ActionsAttachment(title, actions, buttonAlignment ?: "vertical")
         }
-    }
+    }*/
 
     private fun mapAction(action: AttachmentActionEntity): Action? {
         return when (action.type) {
@@ -210,12 +215,12 @@ class DatabaseMessageMapper(private val dbManager: DatabaseManager) {
         }
     }
 
-    private suspend fun mapAuthorAttachment(attachment: AttachmentEntity): AuthorAttachment {
+    /*private suspend fun mapAuthorAttachment(attachment: AttachmentEntity): AuthorAttachment {
         val fields = withContext(CommonPool) {
             dbManager.messageDao().getAttachmentFields(attachment._id)
         }.map { Field(it.title, it.value) }
         return with(attachment) {
             AuthorAttachment(authorLink!!, authorIcon, authorName, fields)
         }
-    }
+    }*/
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/server/infraestructure/DatabaseMessagesRepository.kt

 package chat.rocket.android.server.infraestructure
 
 import chat.rocket.android.db.DatabaseManager
+import chat.rocket.android.db.Operation
 import chat.rocket.android.db.model.MessagesSync
 import chat.rocket.android.server.domain.MessagesRepository
 import chat.rocket.core.model.Message
@@ -61,9 +62,7 @@ class DatabaseMessagesRepository(
     }
 
     override suspend fun saveLastSyncDate(roomId: String, timeMillis: Long) {
-        withContext(dbManager.dbContext) {
-            dbManager.messageDao().saveLastSync(MessagesSync(roomId, timeMillis))
-        }
+        dbManager.sendOperation(Operation.SaveLastSync(MessagesSync(roomId, timeMillis)))
     }
 
     override suspend fun getLastSyncDate(roomId: String): Long? = withContext(CommonPool) {

app/src/main/java/chat/rocket/android/server/infraestructure/SharedPrefsBasicAuthRepository.kt

+package chat.rocket.android.server.infraestructure
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import chat.rocket.android.server.domain.BasicAuthRepository
+import chat.rocket.android.server.domain.model.BasicAuth
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.Types
+
+private const val BASICAUTHS_KEY = "BASICAUTHS_KEY"
+
+class SharedPrefsBasicAuthRepository(
+    private val preferences: SharedPreferences,
+    private val moshi: Moshi
+) : BasicAuthRepository {
+
+    override fun save(basicAuth: BasicAuth) {
+        val newList = load().filter { basicAuth -> basicAuth.host != basicAuth.host }
+            .toMutableList()
+        newList.add(0, basicAuth)
+        save(newList)
+    }
+
+    override fun load(): List<BasicAuth> {
+        val json = preferences.getString(BASICAUTHS_KEY, "[]")
+        val type = Types.newParameterizedType(List::class.java, BasicAuth::class.java)
+        val adapter = moshi.adapter<List<BasicAuth>>(type)
+
+        return adapter.fromJson(json) ?: emptyList()
+    }
+
+    private fun save(basicAuths: List<BasicAuth>) {
+        val type = Types.newParameterizedType(List::class.java, BasicAuth::class.java)
+        val adapter = moshi.adapter<List<BasicAuth>>(type)
+        preferences.edit {
+            putString(BASICAUTHS_KEY, adapter.toJson(basicAuths))
+        }
+    }
+}

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

 package chat.rocket.android.util.extensions
 
 
-inline fun CharSequence?.isNotNullNorEmpty(block: (CharSequence) -> Unit) {
+inline fun CharSequence?.ifNotNullNorEmpty(block: (CharSequence) -> Unit) {
     if (this != null && this.isNotEmpty()) {
         block(this)
     }
-}
+}
\ No newline at end of file
+
+fun CharSequence?.isNotNullNorEmpty(): Boolean = this != null && this.isNotEmpty()
\ No newline at end of file

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

@@ -74,4 +74,6 @@ fun String.lowercaseUrl(): String? {
     val newScheme = httpUrl?.scheme()?.toLowerCase()
 
     return httpUrl?.newBuilder()?.scheme(newScheme)?.build()?.toString()
-}
+}
\ No newline at end of file
+
+fun String?.isNotNullNorEmpty(): Boolean = this != null && this.isNotEmpty()
\ No newline at end of file