Merge pull request #1 from RocketChat/develop

update branches

.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

.github/ISSUE_TEMPLATE/bug_report.md

+---
+name: Bug report
+about: Create a bug report to help us improve
+
+---
+
+## Describe the bug
+<!-- A clear and concise description of what the bug is. -->
+
+## To Reproduce
+<!--Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error -->
+
+## Expected behavior
+<!-- A clear and concise description of what you expected to happen. -->
+
+## Logs
+<!-- Please add logs in case of any crash or applicable error. -->
+
+## Screenshots
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+## Devices and Versions
+
+<!-- Version can be found by opening the side menu and then clicking on "Settings" and then "About" -->
+Your Rocket.Chat.Android version: (e.g. 2.1.0)
+Your Rocket.Chat Server version: (e.g. 0.63.1-develop)
+
+<!-- Found a bug? List all devices that reproduced it and all that doesn't -->
+Mobile device model and OS version: (e.g. "Nexus 7 - Android 6.0.1")
+
+## Additional context
+<!-- Add any other context about the problem here. -->
+

.github/ISSUE_TEMPLATE/chore.md

+---
+name: Chore
+about: Issues related to docs, workflow, dependency and others
+
+---
+
+## Describe the chore
+<!-- A clear and concise description of what you want to do. -->
+
+## Devices and Versions
+
+<!-- Version can be found by opening the side menu and then clicking on "Settings" and then "About" -->
+Your Rocket.Chat.Android version: (e.g. 2.1.0)
+Your Rocket.Chat Server version: (e.g. 0.63.1-develop)
+
+<!-- Found a bug? List all devices that reproduced it and all that doesn't -->
+Mobile device model and OS version: (e.g. "Nexus 7 - Android 6.0.1")

.github/ISSUE_TEMPLATE/feature_request.md

+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+## Describe the feature you'd like
+<!-- A clear and concise description of what you want to happen. -->
+
+## Devices and Versions
+
+<!-- Version can be found by opening the side menu and then clicking on "Settings" and then "About" -->
+Your Rocket.Chat.Android version: (e.g. 2.1.0)
+Your Rocket.Chat Server version: (e.g. 0.63.1-develop)
+
+<!-- Found a bug? List all devices that reproduced it and all that doesn't -->
+Mobile device model and OS version: (e.g. "Nexus 7 - Android 6.0.1")
+
+## Screenshots
+<!-- Add screenshots to provide context or UI mockup. -->
+
+## Additional context
+<!-- Add any other context about the problem here. -->
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,4 +4,6 @@
 <!-- INSTRUCTION: Inform the issue number that this PR closes, or remove the line below -->
 Closes #ISSUE_NUMBER
 
-<!-- INSTRUCTION: Tell us more about your PR with screen shots if you can -->
\ No newline at end of file
+#### Changes: [Add here what changes were made in this issue and if possible provide links.]
+
+#### Screenshots or GIF for the change:

README.md

@@ -2,29 +2,33 @@
 
 # Rocket.Chat Android native application
 
-[![CircleCI](https://circleci.com/gh/RocketChat/Rocket.Chat.Android/tree/develop.svg?style=shield)](https://circleci.com/gh/RocketChat/Rocket.Chat.Android/tree/develop) [![Build Status](https://travis-ci.org/RocketChat/Rocket.Chat.Android.svg?branch=develop)](https://travis-ci.org/RocketChat/Rocket.Chat.Android) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/a81156a8682e4649994270d3670c3c83)](https://www.codacy.com/app/matheusjardimb/Rocket.Chat.Android) 
+[![CircleCI](https://circleci.com/gh/RocketChat/Rocket.Chat.Android/tree/develop.svg?style=shield)](https://circleci.com/gh/RocketChat/Rocket.Chat.Android/tree/develop) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/a81156a8682e4649994270d3670c3c83)](https://www.codacy.com/app/matheusjardimb/Rocket.Chat.Android)
+
+## Get it from the stores
+
+[![](https://user-images.githubusercontent.com/551004/48210434-74c07100-e35e-11e8-8eee-3ba84ffa74d7.png)](https://play.google.com/store/apps/details?id=chat.rocket.android) [![](https://user-images.githubusercontent.com/551004/48210349-50649480-e35e-11e8-97d9-74a4331faf3a.png)](https://f-droid.org/en/packages/chat.rocket.android/)
 
 ## Description
 
 This repository contains all the code related to the Android native application of [Rocket.Chat](https://github.com/RocketChat/Rocket.Chat/#about-rocketchat). To send new pull-requests, always use the branch `develop` as base and open an issue with the description of what you want/need to accomplish, if the issue wasn't created yet.
 
-
 ## 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. 
-- 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.
+- 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.
 
 ### SDK Instructions
 
 - This version requires the [Kotlin SDK](https://github.com/RocketChat/Rocket.Chat.Kotlin.SDK) for Rocket.Chat. Clone the Kotlin SDK in by running `git clone https://github.com/RocketChat/Rocket.Chat.Kotlin.SDK.git`.
-- First, a build is required for the SDK, so that required jar files are generated. Make sure that the android repository and the kotlin sdk have the same immediate parent directory. Change the current directory to `Rocket.Chat.Android/app` and run the `build-sdk.sh` which will result in creating of the required jar file `core*.jar` and `common*.jar` in `Rocket.Chat.Android/app/libs`,by the following steps in your terminal window:
+- First, a build is required for the SDK, so that required jar files are generated. Make sure that the Android repository and the Kotlin SDK have the same immediate parent directory. Change the current directory to `Rocket.Chat.Android/app` and run the `build-sdk.sh` which will result in creating of the required jar file `core*.jar` and `common*.jar` in `Rocket.Chat.Android/app/libs`, by the following steps in your terminal window:
 
 ```
 cd Rocket.Chat.Android/app
 ./build-sdk.sh
 ```
 
+**Note:** *You need to have Java 8 as default Java for the system (project won't build when using a Java 9+ version).*
+
 ## How to run
 
 ### Command Line
@@ -35,12 +39,12 @@ cd Rocket.Chat.Android/app
 
 ### Android Studio
 
-- After importing the project in android studio, go to `Run > Run app` and then select your device, or create a new virtual device by following the wizard.     
+- After importing the project in Android Studio, go to `Run > Run app` and then select your device, or create a new virtual device by following the wizard.     
 
 ## Bug report & Feature request
 
-Please report via [GitHub issue](https://github.com/RocketChat/Rocket.Chat.Android/issues) :)
+Are you having a technical issue trying to compile the app, or setting up Push Notifications? Please use our Community Support channel for that: https://forums.rocket.chat/c/community-support. The issues are only suppose to be used for bugs, improvements and features in the native Android application.
 
 ## Coding Style
 
-Please follow our [coding style](https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md) when contributing.
+Please follow the official [Kotlin coding convections](https://kotlinlang.org/docs/reference/coding-conventions.html) when contributing.

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 2057
+        versionName "3.2.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 
@@ -140,6 +140,7 @@ dependencies {
     implementation libraries.frescoAnimatedWebP
 
     implementation libraries.glide
+    implementation libraries.glideTransformations
 
     kapt libraries.kotshiCompiler
     implementation libraries.kotshiApi

app/src/debug/res/xml/file_paths.xml

+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <external-path
+        name="rocket_chat_images"
+        path="Android/data/chat.rocket.android.dev/files/Pictures" />
+</paths>
\ No newline at end of file

app/src/foss/java/chat/rocket/android/helper/CrashlyticsTree.kt

 package chat.rocket.android.helper
 
 import timber.log.Timber
-import android.util.Log
 
+// Production logger... Just ignore it
 class CrashlyticsTree : Timber.Tree() {
 
     override fun log(priority: Int, tag: String?, message: String, throwable: Throwable?) {
-        Log.println(priority, tag, message)
-
-        if (throwable != null) {
-            Log.e(tag,throwable.toString())
-        }
+        throwable?.printStackTrace()
     }
 }

app/src/main/AndroidManifest.xml

@@ -105,6 +105,15 @@
         <meta-data
             android:name="io.fabric.ApiKey"
             android:value="12ac6e94f850aaffcdff52001af77ca415d06a43" />
-    </application>
 
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="chat.rocket.android.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+    </application>
 </manifest>

app/src/main/java/chat/rocket/android/analytics/Analytics.kt

@@ -61,7 +61,14 @@ interface Analytics {
     fun logServerSwitch(serverUrl: String, serverCount: Int) {}
 
     /**
-     * Logs the admin opening.
+     * Logs the admin opening event.
      */
     fun logOpenAdmin() {}
+
+    /**
+     * Logs the reset password event.
+     *
+     * @param resetPasswordSucceeded True if successful reset password, false otherwise.
+     */
+    fun logResetPassword(resetPasswordSucceeded: Boolean) {}
 }

app/src/main/java/chat/rocket/android/analytics/AnalyticsManager.kt

@@ -70,4 +70,10 @@ class AnalyticsManager @Inject constructor(
             analytics.forEach { it.logOpenAdmin() }
         }
     }
+
+    fun logResetPassword(resetPasswordSucceeded: Boolean) {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logResetPassword(resetPasswordSucceeded) }
+        }
+    }
 }

app/src/main/java/chat/rocket/android/analytics/event/ScreenViewEvent.kt

@@ -16,9 +16,9 @@ sealed class ScreenViewEvent(val screenName: String) {
     object ChatRoom : ScreenViewEvent("ChatRoomFragment")
     object ChatRooms : ScreenViewEvent("ChatRoomsFragment")
     object CreateChannel : ScreenViewEvent("CreateChannelFragment")
+    object UserDetails : ScreenViewEvent("UserDetailsFragment")
     object FavoriteMessages : ScreenViewEvent("FavoriteMessagesFragment")
     object Files : ScreenViewEvent("FilesFragment")
-    object MemberBottomSheet : ScreenViewEvent("MemberBottomSheetFragment")
     object Members : ScreenViewEvent("MembersFragment")
     object Mentions : ScreenViewEvent("MentionsFragment")
     object MessageInfo : ScreenViewEvent("MessageInfoFragment")

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

@@ -23,10 +23,17 @@ class OnBoardingPresenter @Inject constructor(
     private val getAccountsInteractor: GetAccountsInteractor,
     val settingsInteractor: GetSettingsInteractor,
     val factory: RocketChatClientFactory
-) : CheckServerPresenter(strategy, factory, settingsInteractor) {
+) : CheckServerPresenter(
+    strategy = strategy,
+    factory = factory,
+    settingsInteractor = settingsInteractor,
+    refreshSettingsInteractor = refreshSettingsInteractor
+) {
 
     fun toSignInToYourServer() = navigator.toSignInToYourServer()
 
+    fun toCreateANewServer(createServerUrl: String) = navigator.toWebPage(createServerUrl)
+
     fun connectToCommunityServer(communityServerUrl: String) {
         connectToServer(communityServerUrl) {
             if (totalSocialAccountsEnabled == 0 && !isNewAccountCreationEnabled) {
@@ -43,6 +50,9 @@ class OnBoardingPresenter @Inject constructor(
                     wordpressOauthUrl,
                     casLoginUrl,
                     casToken,
+                    casServiceName,
+                    casServiceNameTextColor,
+                    casServiceButtonColor,
                     customOauthUrl,
                     customOauthServiceName,
                     customOauthServiceNameTextColor,
@@ -60,8 +70,6 @@ class OnBoardingPresenter @Inject constructor(
         }
     }
 
-    fun toCreateANewServer(createServerUrl: String) = navigator.toWebPage(createServerUrl)
-
     private fun connectToServer(serverUrl: String, block: () -> Unit) {
         launchUI(strategy) {
             // Check if we already have an account for this server...
@@ -73,11 +81,10 @@ class OnBoardingPresenter @Inject constructor(
             view.showLoading()
             try {
                 withContext(DefaultDispatcher) {
-                    refreshSettingsInteractor.refresh(serverUrl)
-
                     setupConnectionInfo(serverUrl)
 
                     // preparing next fragment before showing it
+                    refreshServerAccounts()
                     checkEnabledAccounts(serverUrl)
                     checkIfLoginFormIsEnabled()
                     checkIfCreateNewAccountIsEnabled()

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/server/presentation/ServerPresenter.kt

@@ -25,7 +25,13 @@ class ServerPresenter @Inject constructor(
     private val getAccountsInteractor: GetAccountsInteractor,
     val settingsInteractor: GetSettingsInteractor,
     val factory: RocketChatClientFactory
-) : CheckServerPresenter(strategy, factory, settingsInteractor, view) {
+) : CheckServerPresenter(
+    strategy = strategy,
+    factory = factory,
+    settingsInteractor = settingsInteractor,
+    versionCheckView = view,
+    refreshSettingsInteractor = refreshSettingsInteractor
+) {
 
     fun checkServer(server: String) {
         if (!server.isValidUrl()) {
@@ -53,6 +59,9 @@ class ServerPresenter @Inject constructor(
                     wordpressOauthUrl,
                     casLoginUrl,
                     casToken,
+                    casServiceName,
+                    casServiceNameTextColor,
+                    casServiceButtonColor,
                     customOauthUrl,
                     customOauthServiceName,
                     customOauthServiceNameTextColor,
@@ -90,11 +99,8 @@ class ServerPresenter @Inject constructor(
                 view.showLoading()
                 try {
                     withContext(DefaultDispatcher) {
-                        refreshSettingsInteractor.refresh(serverUrl)
-
-                        setupConnectionInfo(serverUrl)
-
                         // preparing next fragment before showing it
+                        refreshServerAccounts()
                         checkEnabledAccounts(serverUrl)
                         checkIfLoginFormIsEnabled()
                         checkIfCreateNewAccountIsEnabled()
@@ -111,5 +117,4 @@ class ServerPresenter @Inject constructor(
             }
         }
     }
-
 }
\ No newline at end of file

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

 package chat.rocket.android.authentication.server.ui
 
 import android.os.Bundle
+import android.text.SpannableStringBuilder
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -11,6 +12,7 @@ import android.widget.ScrollView
 import android.widget.Toast
 import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
+import androidx.core.text.color
 import androidx.core.view.ViewCompat
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
@@ -51,6 +53,8 @@ class ServerFragment : Fragment(), ServerView {
     lateinit var analyticsManager: AnalyticsManager
     private var deepLinkInfo: LoginDeepLinkInfo? = null
     private var protocol = "https://"
+    private var isDomainAppended = false
+    private var appendedText = ""
     private lateinit var serverUrlDisposable: Disposable
     private val layoutListener = ViewTreeObserver.OnGlobalLayoutListener {
         if (KeyboardHelper.isSoftKeyboardShown(scroll_view.rootView)) {
@@ -131,7 +135,7 @@ class ServerFragment : Fragment(), ServerView {
     }
 
     private fun setupOnClickListener() =
-        ui { _ ->
+        ui {
             button_connect.setOnClickListener {
                 presenter.checkServer("$protocol${text_server_url.textContent.sanitize()}")
             }
@@ -244,17 +248,42 @@ class ServerFragment : Fragment(), ServerView {
     private fun subscribeEditText() {
         serverUrlDisposable = text_server_url.asObservable()
             .filter { it.isNotBlank() }
-            .subscribe {
-                if (it.toString().isValidUrl()) {
-                    enableButtonConnect()
-                } else {
-                    disableButtonConnect()
-                }
-            }
+            .subscribe { processUserInput(it.toString()) }
     }
 
     private fun unsubscribeEditText() = serverUrlDisposable.dispose()
 
+    private fun processUserInput(text: String) {
+        if (text.last().toString() == "." && !isDomainAppended) {
+            addDomain()
+        } else if (isDomainAppended && text != appendedText) {
+            removeDomain()
+        }
+
+        if ("$protocol$text".isValidUrl()) {
+            enableButtonConnect()
+        } else {
+            disableButtonConnect()
+        }
+    }
+
+    private fun addDomain() {
+        val cursorPosition = text_server_url.length()
+        text_server_url.append(SpannableStringBuilder()
+            .color(R.color.colorAuthenticationSecondaryText) { append("rocket.chat") })
+        text_server_url.setSelection(cursorPosition)
+        appendedText = text_server_url.text.toString()
+        isDomainAppended = true
+    }
+
+    private fun removeDomain() {
+        text_server_url.setText(
+            text_server_url.text.toString().substring(0, text_server_url.selectionEnd)
+        )
+        text_server_url.setSelection(text_server_url.length())
+        isDomainAppended = false
+    }
+
     private fun enableUserInput() {
         enableButtonConnect()
         text_server_url.isEnabled = true

app/src/main/java/chat/rocket/android/authentication/twofactor/di/TwoFAFragmentProvider.kt

@@ -5,7 +5,8 @@ import chat.rocket.android.dagger.scope.PerFragment
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
-@Module abstract class TwoFAFragmentProvider {
+@Module
+abstract class TwoFAFragmentProvider {
 
     @ContributesAndroidInjector(modules = [TwoFAFragmentModule::class])
     @PerFragment

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

@@ -19,7 +19,6 @@ import dagger.android.AndroidInjector
 import dagger.android.DispatchingAndroidInjector
 import dagger.android.support.HasSupportFragmentInjector
 import kotlinx.android.synthetic.main.app_bar.*
-import kotlinx.coroutines.experimental.Job
 import javax.inject.Inject
 
 class AuthenticationActivity : AppCompatActivity(), HasSupportFragmentInjector {
@@ -27,7 +26,6 @@ class AuthenticationActivity : AppCompatActivity(), HasSupportFragmentInjector {
     lateinit var fragmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
     @Inject
     lateinit var presenter: AuthenticationPresenter
-    val job = Job()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         AndroidInjection.inject(this)

app/src/main/java/chat/rocket/android/chatdetails/adapter/OptionItemHolder.kt

+package chat.rocket.android.chatdetails.adapter
+
+import chat.rocket.android.chatdetails.domain.Option
+import chat.rocket.android.chatrooms.adapter.ItemHolder
+
+data class OptionItemHolder(override val data: Option): ItemHolder<Option>
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/adapter/OptionViewHolder.kt

+package chat.rocket.android.chatdetails.adapter
+
+import android.content.Context
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+import chat.rocket.android.R
+import chat.rocket.android.chatdetails.domain.Option
+import chat.rocket.android.chatrooms.adapter.ViewHolder
+import kotlinx.android.synthetic.main.item_detail_option.view.*
+
+class OptionViewHolder(
+    itemView: View
+): ViewHolder<OptionItemHolder>(itemView) {
+
+    override fun bindViews(data: OptionItemHolder) {
+        val option = data.data
+        bindName(option, itemView.name)
+        bindIcon(option, itemView.icon)
+        itemView.setOnClickListener { option.listener() }
+    }
+
+    private fun bindIcon(option: Option, view: ImageView) {
+        val drawable = DrawableHelper.getDrawableFromId(option.icon, itemView.context)
+        drawable.let { image ->
+            val mutateDrawable = DrawableHelper.wrapDrawable(image).mutate()
+            DrawableHelper.tintDrawable(mutateDrawable, itemView.context, R.color.colorPrimaryText)
+            view.setImageDrawable(mutateDrawable)
+        }
+    }
+
+    private fun bindName(option: Option, view: TextView) {
+        view.text = option.name
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentModule.kt

+package chat.rocket.android.chatdetails.di
+
+import chat.rocket.android.chatdetails.presentation.ChatDetailsView
+import chat.rocket.android.chatdetails.ui.ChatDetailsFragment
+import chat.rocket.android.dagger.scope.PerFragment
+import chat.rocket.android.db.ChatRoomDao
+import chat.rocket.android.db.DatabaseManager
+import dagger.Module
+import dagger.Provides
+
+@Module
+class ChatDetailsFragmentModule {
+
+    @Provides
+    @PerFragment
+    fun chatDetailsView(frag: ChatDetailsFragment): ChatDetailsView {
+        return frag
+    }
+
+    @Provides
+    @PerFragment
+    fun provideChatRoomDao(manager: DatabaseManager): ChatRoomDao = manager.chatRoomDao()
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentProvider.kt

+package chat.rocket.android.chatdetails.di
+
+import chat.rocket.android.chatdetails.ui.ChatDetailsFragment
+import chat.rocket.android.dagger.scope.PerFragment
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module
+abstract class ChatDetailsFragmentProvider {
+
+    @ContributesAndroidInjector(modules = [ChatDetailsFragmentModule::class])
+    @PerFragment
+    abstract fun providesChatDetailsFragment(): ChatDetailsFragment
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/domain/ChatDetails.kt

+package chat.rocket.android.chatdetails.domain
+
+data class ChatDetails(
+    val name: String?,
+    val fullName: String?,
+    val type: String?,
+    val topic: String?,
+    val announcement: String?,
+    val description: String?
+)
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/domain/Option.kt

+package chat.rocket.android.chatdetails.domain
+
+data class Option(
+    val name: String,
+    val icon: Int,
+    val listener: () -> Unit
+)
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsPresenter.kt

+package chat.rocket.android.chatdetails.presentation
+
+import chat.rocket.android.chatdetails.domain.ChatDetails
+import chat.rocket.android.chatroom.presentation.ChatRoomNavigator
+import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.server.domain.GetCurrentServerInteractor
+import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.android.util.extension.launchUI
+import chat.rocket.android.util.retryIO
+import chat.rocket.common.model.roomTypeOf
+import chat.rocket.common.util.ifNull
+import chat.rocket.core.internal.rest.getInfo
+import chat.rocket.core.model.Room
+import timber.log.Timber
+import javax.inject.Inject
+
+class ChatDetailsPresenter @Inject constructor(
+    private val view: ChatDetailsView,
+    private val navigator: ChatRoomNavigator,
+    private val strategy: CancelStrategy,
+    serverInteractor: GetCurrentServerInteractor,
+    factory: ConnectionManagerFactory
+) {
+    private val currentServer = serverInteractor.get()!!
+    private val manager = factory.create(currentServer)
+    private val client = manager.client
+
+    fun getDetails(chatRoomId: String, chatRoomType: String) {
+        launchUI(strategy) {
+            try {
+                val room = retryIO("getInfo($chatRoomId, null, $chatRoomType") {
+                    client.getInfo(chatRoomId, null, roomTypeOf(chatRoomType))
+                }
+                view.displayDetails(roomToChatDetails(room))
+            } catch(exception: Exception) {
+                Timber.e(exception)
+                exception.message?.let {
+                    view.showMessage(it)
+                }.ifNull {
+                    view.showGenericErrorMessage()
+                }
+            }
+        }
+    }
+
+    fun toFiles(chatRoomId: String) {
+        navigator.toFileList(chatRoomId)
+    }
+
+    fun toMembers(chatRoomId: String) {
+        navigator.toMembersList(chatRoomId)
+    }
+
+    fun toMentions(chatRoomId: String) {
+        navigator.toMentions(chatRoomId)
+    }
+
+    fun toPinned(chatRoomId: String) {
+        navigator.toPinnedMessageList(chatRoomId)
+    }
+
+    fun toFavorites(chatRoomId: String) {
+        navigator.toFavoriteMessageList(chatRoomId)
+    }
+
+    private fun roomToChatDetails(room: Room): ChatDetails {
+        return with(room) {
+            ChatDetails(
+                name = name,
+                fullName = fullName,
+                type = type.toString(),
+                topic = topic,
+                description = description,
+                announcement = announcement
+            )
+        }
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsView.kt

+package chat.rocket.android.chatdetails.presentation
+
+import chat.rocket.android.chatdetails.domain.ChatDetails
+import chat.rocket.android.core.behaviours.LoadingView
+import chat.rocket.android.core.behaviours.MessageView
+
+interface ChatDetailsView: MessageView {
+    fun displayDetails(room: ChatDetails)
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsAdapter.kt

+package chat.rocket.android.chatdetails.ui
+
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import chat.rocket.android.R
+import chat.rocket.android.chatdetails.adapter.OptionItemHolder
+import chat.rocket.android.chatdetails.adapter.OptionViewHolder
+import chat.rocket.android.chatdetails.domain.Option
+import chat.rocket.android.util.extensions.inflate
+
+class ChatDetailsAdapter: RecyclerView.Adapter<OptionViewHolder>() {
+    private val options: MutableList<Option> = ArrayList()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): OptionViewHolder = OptionViewHolder(parent.inflate(R.layout.item_detail_option))
+
+    override fun onBindViewHolder(holder: OptionViewHolder, position: Int) = holder.bindViews(OptionItemHolder(options[position]))
+
+    override fun getItemCount(): Int = options.size
+
+    fun addOption(name: String, icon: Int, listener: () -> Unit) {
+        options.add(Option(name, icon, listener))
+        notifyDataSetChanged()
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt

+package chat.rocket.android.chatdetails.ui
+
+import DrawableHelper
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.LinearLayoutManager
+import chat.rocket.android.R
+import chat.rocket.android.chatdetails.domain.ChatDetails
+import chat.rocket.android.chatdetails.presentation.ChatDetailsPresenter
+import chat.rocket.android.chatdetails.presentation.ChatDetailsView
+import chat.rocket.android.chatdetails.viewmodel.ChatDetailsViewModel
+import chat.rocket.android.chatdetails.viewmodel.ChatDetailsViewModelFactory
+import chat.rocket.android.chatroom.ui.ChatRoomActivity
+import chat.rocket.android.util.extensions.inflate
+import chat.rocket.android.util.extensions.showToast
+import chat.rocket.android.util.extensions.ui
+import chat.rocket.android.widget.DividerItemDecoration
+import chat.rocket.common.model.RoomType
+import chat.rocket.common.model.roomTypeOf
+import dagger.android.support.AndroidSupportInjection
+import kotlinx.android.synthetic.main.fragment_chat_details.*
+import javax.inject.Inject
+
+fun newInstance(
+    chatRoomId: String,
+    chatRoomType: String,
+    isSubscribed: Boolean,
+    disableMenu: Boolean
+): ChatDetailsFragment {
+    return ChatDetailsFragment().apply {
+        arguments = Bundle(4).apply {
+            putString(BUNDLE_CHAT_ROOM_ID, chatRoomId)
+            putString(BUNDLE_CHAT_ROOM_TYPE, chatRoomType)
+            putBoolean(BUNDLE_IS_SUBSCRIBED, isSubscribed)
+            putBoolean(BUNDLE_DISABLE_MENU, disableMenu)
+        }
+    }
+}
+
+internal const val TAG_CHAT_DETAILS_FRAGMENT = "ChatDetailsFragment"
+
+private const val BUNDLE_CHAT_ROOM_ID = "BUNDLE_CHAT_ROOM_ID"
+private const val BUNDLE_CHAT_ROOM_TYPE = "BUNDLE_CHAT_ROOM_TYPE"
+private const val BUNDLE_IS_SUBSCRIBED = "BUNDLE_IS_SUBSCRIBED"
+private const val BUNDLE_DISABLE_MENU = "BUNDLE_DISABLE_MENU"
+
+class ChatDetailsFragment : Fragment(), ChatDetailsView {
+    @Inject
+    lateinit var presenter: ChatDetailsPresenter
+    @Inject
+    lateinit var factory: ChatDetailsViewModelFactory
+    private var adapter: ChatDetailsAdapter? = null
+    private lateinit var viewModel: ChatDetailsViewModel
+
+    private var chatRoomId: String? = null
+    private var chatRoomType: String? = null
+    private var isSubscribed: Boolean = true
+    private var disableMenu: Boolean = false
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        AndroidSupportInjection.inject(this)
+        val bundle = arguments
+        if (bundle != null) {
+            chatRoomId = bundle.getString(BUNDLE_CHAT_ROOM_ID)
+            chatRoomType = bundle.getString(BUNDLE_CHAT_ROOM_TYPE)
+            isSubscribed = bundle.getBoolean(BUNDLE_IS_SUBSCRIBED)
+            disableMenu = bundle.getBoolean(BUNDLE_DISABLE_MENU)
+        } else {
+            requireNotNull(bundle) { "no arguments supplied when the fragment was instantiated" }
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? = container?.inflate(R.layout.fragment_chat_details)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        viewModel = ViewModelProviders.of(this, factory).get(ChatDetailsViewModel::class.java)
+        setupOptions()
+        setupToolbar()
+        getDetails()
+    }
+
+    override fun displayDetails(room: ChatDetails) {
+        ui {
+            val text = room.name
+            name.text = text
+            bindImage(chatRoomType!!)
+            content_topic.text =
+                    if (room.topic.isNullOrEmpty()) getString(R.string.msg_no_topic) else room.topic
+            content_announcement.text =
+                    if (room.announcement.isNullOrEmpty()) getString(R.string.msg_no_announcement) else room.announcement
+            content_description.text =
+                    if (room.description.isNullOrEmpty()) getString(R.string.msg_no_description) else room.description
+        }
+    }
+
+    override fun showGenericErrorMessage() = showMessage(R.string.msg_generic_error)
+
+    override fun showMessage(resId: Int) {
+        ui {
+            showToast(resId)
+        }
+    }
+
+    override fun showMessage(message: String) {
+        ui {
+            showToast(message)
+        }
+    }
+
+    private fun addOptions(adapter: ChatDetailsAdapter?) {
+        adapter?.let {
+            if (!disableMenu) {
+                it.addOption(getString(R.string.title_files), R.drawable.ic_files_24dp) {
+                    presenter.toFiles(chatRoomId!!)
+                }
+            }
+
+            if (chatRoomType != RoomType.DIRECT_MESSAGE && !disableMenu) {
+                it.addOption(getString(R.string.msg_mentions), R.drawable.ic_at_black_20dp) {
+                    presenter.toMentions(chatRoomId!!)
+                }
+                it.addOption(
+                    getString(R.string.title_members),
+                    R.drawable.ic_people_outline_black_24dp
+                ) {
+                    presenter.toMembers(chatRoomId!!)
+                }
+            }
+
+            it.addOption(
+                getString(R.string.title_favorite_messages),
+                R.drawable.ic_star_border_white_24dp
+            ) {
+                presenter.toFavorites(chatRoomId!!)
+            }
+            it.addOption(
+                getString(R.string.title_pinned_messages),
+                R.drawable.ic_action_message_pin_24dp
+            ) {
+                presenter.toPinned(chatRoomId!!)
+            }
+        }
+    }
+
+    private fun bindImage(chatRoomType: String) {
+        val drawable = when (roomTypeOf(chatRoomType)) {
+            is RoomType.Channel -> {
+                DrawableHelper.getDrawableFromId(R.drawable.ic_hashtag_black_12dp, context!!)
+            }
+            is RoomType.PrivateGroup -> {
+                DrawableHelper.getDrawableFromId(R.drawable.ic_lock_black_12_dp, context!!)
+            }
+            else -> null
+        }
+
+        drawable?.let {
+            val wrappedDrawable = DrawableHelper.wrapDrawable(it)
+            val mutableDrawable = wrappedDrawable.mutate()
+            DrawableHelper.tintDrawable(mutableDrawable, context!!, R.color.colorPrimary)
+            DrawableHelper.compoundDrawable(name, mutableDrawable)
+        }
+    }
+
+    private fun getDetails() {
+        if (isSubscribed)
+            viewModel.getDetails(chatRoomId!!).observe(viewLifecycleOwner, Observer { details ->
+                displayDetails(details)
+            })
+        else
+            presenter.getDetails(chatRoomId!!, chatRoomType!!)
+    }
+
+    private fun setupOptions() {
+        ui {
+            if (options.adapter == null) {
+                adapter = ChatDetailsAdapter()
+                options.adapter = adapter
+
+                with(options) {
+                    layoutManager = LinearLayoutManager(it)
+                    addItemDecoration(
+                        DividerItemDecoration(
+                            it,
+                            resources.getDimensionPixelSize(R.dimen.divider_item_decorator_bound_start),
+                            resources.getDimensionPixelSize(R.dimen.divider_item_decorator_bound_end)
+                        )
+                    )
+                    itemAnimator = DefaultItemAnimator()
+                    isNestedScrollingEnabled = false
+                }
+            }
+            addOptions(adapter)
+        }
+    }
+
+    private fun setupToolbar() {
+        with((activity as ChatRoomActivity)) {
+            hideToolbarChatRoomIcon()
+            showToolbarTitle(getString(R.string.title_channel_details))
+        }
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/viewmodel/ChatDetailsViewModel.kt

+package chat.rocket.android.chatdetails.viewmodel
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Transformations
+import androidx.lifecycle.ViewModel
+import chat.rocket.android.chatdetails.domain.ChatDetails
+import chat.rocket.android.db.ChatRoomDao
+
+class ChatDetailsViewModel(private val chatRoomDao: ChatRoomDao): ViewModel() {
+
+    fun getDetails(chatRoomId: String): LiveData<ChatDetails> {
+        return Transformations.switchMap(chatRoomDao.get(chatRoomId)) { room ->
+            val entity = room.chatRoom
+            val data: MutableLiveData<ChatDetails> = MutableLiveData()
+
+            data.value = ChatDetails(
+                entity.name,
+                entity.fullname,
+                entity.type,
+                entity.topic,
+                entity.announcement,
+                entity.description
+            )
+
+            return@switchMap data
+        }
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/viewmodel/ChatDetailsViewModelFactory.kt

+package chat.rocket.android.chatdetails.viewmodel
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import chat.rocket.android.db.ChatRoomDao
+import javax.inject.Inject
+
+class ChatDetailsViewModelFactory @Inject constructor(private val chatRoomDao: ChatRoomDao) : ViewModelProvider.NewInstanceFactory() {
+
+    @Suppress("UNCHECKED_CAST")
+    override fun <T : ViewModel?> create(modelClass: Class<T>) =
+            ChatDetailsViewModel(chatRoomDao) as T
+}
\ 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 {
@@ -60,14 +61,21 @@ abstract class BaseViewHolder<T : BaseUiModel<*>>(
                             reactionListener?.onReactionAdded(messageId, emoji)
                         }
                     }
+
+                    override fun onReactionLongClicked(shortname: String, isCustom: Boolean, url: String?, usernames: List<String>) {
+                        reactionListener?.onReactionLongClicked(shortname, isCustom,url, usernames)
+                    }
                 }
+
                 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 +137,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

 package chat.rocket.android.chatroom.adapter
 
-import androidx.recyclerview.widget.RecyclerView
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
-import chat.rocket.android.chatroom.uimodel.*
-import chat.rocket.android.util.extensions.inflate
+import chat.rocket.android.chatroom.presentation.ChatRoomNavigator
+import chat.rocket.android.chatroom.uimodel.AttachmentUiModel
+import chat.rocket.android.chatroom.uimodel.BaseUiModel
+import chat.rocket.android.chatroom.uimodel.MessageReplyUiModel
+import chat.rocket.android.chatroom.uimodel.MessageUiModel
+import chat.rocket.android.chatroom.uimodel.UrlPreviewUiModel
+import chat.rocket.android.chatroom.uimodel.toViewType
 import chat.rocket.android.emoji.EmojiReactionListener
+import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.openTabbedUrl
+import chat.rocket.core.model.Message
 import chat.rocket.core.model.attachment.actions.Action
 import chat.rocket.core.model.attachment.actions.ButtonAction
-import chat.rocket.core.model.Message
 import chat.rocket.core.model.isSystemMessage
 import timber.log.Timber
 import java.security.InvalidParameterException
@@ -22,7 +28,8 @@ class ChatRoomAdapter(
     private val roomName: String? = null,
     private val actionSelectListener: OnActionSelected? = null,
     private val enableActions: Boolean = true,
-    private val reactionListener: EmojiReactionListener? = null
+    private val reactionListener: EmojiReactionListener? = null,
+    private val navigator: ChatRoomNavigator? = null
 ) : RecyclerView.Adapter<BaseViewHolder<*>>() {
     private val dataSet = ArrayList<BaseUiModel<*>>()
 
@@ -34,50 +41,35 @@ class ChatRoomAdapter(
         return when (viewType.toViewType()) {
             BaseUiModel.ViewType.MESSAGE -> {
                 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)
+                MessageViewHolder(
+                    view,
+                    actionsListener,
+                    reactionListener
+                ) { userId -> navigator?.toUserDetails(userId) }
             }
             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)
-                MessageReplyViewHolder(view, actionsListener, reactionListener) { roomName, permalink ->
+                MessageReplyViewHolder(
+                    view,
+                    actionsListener,
+                    reactionListener
+                ) { roomName, permalink ->
                     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 +105,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 +118,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()
         }
     }
@@ -160,7 +137,8 @@ class ChatRoomAdapter(
     fun prependData(dataSet: List<BaseUiModel<*>>) {
         //---At first we will update all already saved elements with received updated ones
         val filteredDataSet = dataSet.filter { newItem ->
-            val matchedIndex = this.dataSet.indexOfFirst { it.messageId == newItem.messageId && it.viewType == newItem.viewType }
+            val matchedIndex =
+                this.dataSet.indexOfFirst { it.messageId == newItem.messageId && it.viewType == newItem.viewType }
             if (matchedIndex > -1) {
                 this.dataSet[matchedIndex] = newItem
                 notifyItemChanged(matchedIndex)
@@ -291,6 +269,12 @@ class ChatRoomAdapter(
                     R.id.action_menu_msg_react -> {
                         actionSelectListener?.showReactions(id)
                     }
+                    R.id.action_message_permalink -> {
+                        actionSelectListener?.copyPermalink(id)
+                    }
+                    R.id.action_message_report -> {
+                        actionSelectListener?.reportMessage(id)
+                    }
                     else -> {
                         TODO("Not implemented")
                     }
@@ -300,15 +284,34 @@ class ChatRoomAdapter(
     }
 
     interface OnActionSelected {
+
         fun showMessageInfo(id: String)
-        fun citeMessage(roomName: String, roomType: String, messageId: String, mentionAuthor: Boolean)
+
+        fun citeMessage(
+            roomName: String,
+            roomType: String,
+            messageId: String,
+            mentionAuthor: Boolean
+        )
+
         fun copyMessage(id: String)
+
         fun editMessage(roomId: String, messageId: String, text: String)
+
         fun toogleStar(id: String, star: Boolean)
+
         fun tooglePin(id: String, pin: Boolean)
+
         fun deleteMessage(roomId: String, id: String)
+
         fun showReactions(id: String)
+
         fun openDirectMessage(roomName: String, message: String)
+
         fun sendMessage(chatRoomId: String, text: String)
+
+        fun copyPermalink(id: String)
+
+        fun reportMessage(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,10 +72,10 @@ 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 {
+    ) : RecyclerView.ViewHolder(view), View.OnClickListener, View.OnLongClickListener {
 
         @Inject
         lateinit var localRepository: LocalRepository
@@ -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,18 @@ 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)
+                view_flipper_reaction.setOnLongClickListener(this@ReactionViewHolder)
+                text_count.setOnLongClickListener(this@ReactionViewHolder)
             }
         }
 
@@ -130,6 +134,11 @@ class MessageReactionsAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>()
                 }
             }
         }
+
+        override fun onLongClick(v: View?): Boolean {
+            listener?.onReactionLongClicked(reaction.shortname, reaction.isCustom, reaction.url, reaction.usernames)
+            return true
+        }
     }
 
     class AddReactionViewHolder(

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

@@ -18,7 +18,8 @@ import kotlinx.android.synthetic.main.item_message.view.*
 class MessageViewHolder(
     itemView: View,
     listener: ActionsListener,
-    reactionListener: EmojiReactionListener? = null
+    reactionListener: EmojiReactionListener? = null,
+    private val avatarListener: (String) -> Unit
 ) : BaseViewHolder<MessageUiModel>(itemView, listener, reactionListener), Drawable.Callback {
 
     init {
@@ -70,6 +71,12 @@ class MessageViewHolder(
                 )
                 read_receipt_view.isVisible = true
             }
+
+            image_avatar.setOnClickListener {
+                data.message.sender?.id?.let { userId ->
+                    avatarListener(userId)
+                }
+            }
         }
     }
 

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/di/ChatRoomFragmentModule.kt

 package chat.rocket.android.chatroom.di
 
+import android.app.Application
 import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.chatroom.presentation.ChatRoomView
 import chat.rocket.android.chatroom.ui.ChatRoomFragment
-import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.chatrooms.adapter.RoomUiModelMapper
 import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.db.ChatRoomDao
 import chat.rocket.android.db.DatabaseManager
-import chat.rocket.android.db.DatabaseManagerFactory
-import chat.rocket.android.server.domain.GetCurrentServerInteractor
+import chat.rocket.android.db.UserDao
+import chat.rocket.android.server.domain.GetCurrentUserInteractor
+import chat.rocket.android.server.domain.PermissionsInteractor
+import chat.rocket.android.server.domain.SettingsRepository
+import chat.rocket.android.server.domain.TokenRepository
 import dagger.Module
 import dagger.Provides
-import kotlinx.coroutines.experimental.Job
 import javax.inject.Named
 
 @Module
 class ChatRoomFragmentModule {
 
-    @Provides
-    @PerFragment
-    fun provideJob() = Job()
-
     @Provides
     @PerFragment
     fun chatRoomView(frag: ChatRoomFragment): ChatRoomView {
@@ -35,11 +34,37 @@ class ChatRoomFragmentModule {
 
     @Provides
     @PerFragment
-    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
-        return CancelStrategy(owner, jobs)
+    fun provideChatRoomDao(manager: DatabaseManager): ChatRoomDao = manager.chatRoomDao()
+
+    @Provides
+    @PerFragment
+    fun provideUserDao(manager: DatabaseManager): UserDao = manager.userDao()
+
+    @Provides
+    @PerFragment
+    fun provideGetCurrentUserInteractor(
+        tokenRepository: TokenRepository,
+        @Named("currentServer") serverUrl: String,
+        userDao: UserDao
+    ): GetCurrentUserInteractor {
+        return GetCurrentUserInteractor(tokenRepository, serverUrl, userDao)
     }
 
     @Provides
     @PerFragment
-    fun provideChatRoomDao(manager: DatabaseManager): ChatRoomDao = manager.chatRoomDao()
+    fun provideRoomMapper(
+        context: Application,
+        repository: SettingsRepository,
+        userInteractor: GetCurrentUserInteractor,
+        @Named("currentServer") serverUrl: String,
+        permissionsInteractor: PermissionsInteractor
+    ): RoomUiModelMapper {
+        return RoomUiModelMapper(
+            context,
+            repository.get(serverUrl),
+            userInteractor,
+            serverUrl,
+            permissionsInteractor
+        )
+    }
 }

app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomModule.kt

 package chat.rocket.android.chatroom.di
 
+import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.chatroom.presentation.ChatRoomNavigator
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
+import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerActivity
 import dagger.Module
 import dagger.Provides
+import kotlinx.coroutines.experimental.Job
 
 @Module
 class ChatRoomModule {
+
     @Provides
     @PerActivity
     fun provideChatRoomNavigator(activity: ChatRoomActivity) = ChatRoomNavigator(activity)
+
+    @Provides
+    @PerActivity
+    fun provideJob() = Job()
+
+    @Provides
+    @PerActivity
+    fun provideLifecycleOwner(activity: ChatRoomActivity): LifecycleOwner = activity
+
+    @Provides
+    @PerActivity
+    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
+        return CancelStrategy(owner, jobs)
+    }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/di/MessageServiceProvider.kt

@@ -6,6 +6,7 @@ import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
 @Module abstract class MessageServiceProvider {
+
     @ContributesAndroidInjector(modules = [AppModule::class])
     abstract fun provideMessageService(): MessageService
 }
\ No newline at end of file

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

 package chat.rocket.android.chatroom.presentation
 
 import chat.rocket.android.R
+import chat.rocket.android.chatdetails.ui.TAG_CHAT_DETAILS_FRAGMENT
 import chat.rocket.android.chatinformation.ui.messageInformationIntent
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.chatroom.ui.chatRoomIntent
@@ -10,16 +11,70 @@ import chat.rocket.android.members.ui.TAG_MEMBERS_FRAGMENT
 import chat.rocket.android.mentions.ui.TAG_MENTIONS_FRAGMENT
 import chat.rocket.android.pinnedmessages.ui.TAG_PINNED_MESSAGES_FRAGMENT
 import chat.rocket.android.server.ui.changeServerIntent
+import chat.rocket.android.userdetails.ui.TAG_USER_DETAILS_FRAGMENT
 import chat.rocket.android.util.extensions.addFragmentBackStack
 
 class ChatRoomNavigator(internal val activity: ChatRoomActivity) {
 
+    fun toUserDetails(userId: String) {
+        activity.addFragmentBackStack(TAG_USER_DETAILS_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.userdetails.ui.newInstance(userId)
+        }
+    }
+
+    fun toChatRoom(
+        chatRoomId: String,
+        chatRoomName: String,
+        chatRoomType: String,
+        isReadOnly: Boolean,
+        chatRoomLastSeen: Long,
+        isSubscribed: Boolean,
+        isCreator: Boolean,
+        isFavorite: Boolean
+    ) {
+        activity.startActivity(
+            activity.chatRoomIntent(
+                chatRoomId,
+                chatRoomName,
+                chatRoomType,
+                isReadOnly,
+                chatRoomLastSeen,
+                isSubscribed,
+                isCreator,
+                isFavorite
+            )
+        )
+        activity.overridePendingTransition(R.anim.open_enter, R.anim.open_exit)
+    }
+
+    fun toChatDetails(
+        chatRoomId: String,
+        chatRoomType: String,
+        isChatRoomSubscribed: Boolean,
+        isMenuDisabled: Boolean
+    ) {
+        activity.addFragmentBackStack(TAG_CHAT_DETAILS_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.chatdetails.ui.newInstance(
+                chatRoomId,
+                chatRoomType,
+                isChatRoomSubscribed,
+                isMenuDisabled
+            )
+        }
+    }
+
     fun toMembersList(chatRoomId: String) {
         activity.addFragmentBackStack(TAG_MEMBERS_FRAGMENT, R.id.fragment_container) {
             chat.rocket.android.members.ui.newInstance(chatRoomId)
         }
     }
 
+    fun toMemberDetails(userId: String) {
+        activity.addFragmentBackStack(TAG_USER_DETAILS_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.userdetails.ui.newInstance(userId)
+        }
+    }
+
     fun toMentions(chatRoomId: String) {
         activity.addFragmentBackStack(TAG_MENTIONS_FRAGMENT, R.id.fragment_container) {
             chat.rocket.android.mentions.ui.newInstance(chatRoomId)
@@ -80,4 +135,4 @@ class ChatRoomNavigator(internal val activity: ChatRoomActivity) {
         activity.startActivity(activity.messageInformationIntent(messageId = messageId))
         activity.overridePendingTransition(R.anim.open_enter, R.anim.open_exit)
     }
-}
\ No newline at end of file
+}

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

@@ -5,6 +5,7 @@ import chat.rocket.android.chatroom.uimodel.suggestion.ChatRoomSuggestionUiModel
 import chat.rocket.android.chatroom.uimodel.suggestion.CommandSuggestionUiModel
 import chat.rocket.android.chatroom.uimodel.suggestion.EmojiSuggestionUiModel
 import chat.rocket.android.chatroom.uimodel.suggestion.PeopleSuggestionUiModel
+import chat.rocket.android.chatrooms.adapter.model.RoomUiModel
 import chat.rocket.android.core.behaviours.LoadingView
 import chat.rocket.android.core.behaviours.MessageView
 import chat.rocket.core.internal.realtime.socket.model.State
@@ -131,12 +132,7 @@ interface ChatRoomView : LoadingView, MessageView {
 
     fun populateEmojiSuggestions(emojis: List<EmojiSuggestionUiModel>)
 
-    /**
-     * This user has joined the chat callback.
-     *
-     * @param userCanPost Whether the user can post a message or not.
-     */
-    fun onJoined(userCanPost: Boolean)
+    fun onJoined(roomUiModel: RoomUiModel)
 
     fun showReactionsPopup(messageId: String)
 
@@ -147,9 +143,6 @@ interface ChatRoomView : LoadingView, MessageView {
      */
     fun populateCommandSuggestions(commands: List<CommandSuggestionUiModel>)
 
-    /**
-     * Communicate whether it's a broadcast channel and if current user can post to it.
-     */
-    fun onRoomUpdated(userCanPost: Boolean, channelIsBroadcast: Boolean, userCanMod: Boolean)
+    fun onRoomUpdated(roomUiModel: RoomUiModel)
 
 }

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

@@ -7,7 +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 com.bumptech.glide.load.resource.gif.GifDrawable
+import chat.rocket.common.util.ifNull
 import com.bumptech.glide.request.target.SimpleTarget
 import com.bumptech.glide.request.transition.Transition
 
@@ -15,10 +15,12 @@ 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") -> {
@@ -27,7 +29,6 @@ fun ChatRoomFragment.showFileAttachmentDialog(uri: Uri) {
                             .with(context)
                             .asGif()
                             .load(uri)
-                            .override(imagePreview.width, imagePreview.height)
                             .fitCenter()
                             .into(imagePreview)
                     } else {
@@ -35,7 +36,6 @@ fun ChatRoomFragment.showFileAttachmentDialog(uri: Uri) {
                             .with(context)
                             .asBitmap()
                             .load(uri)
-                            .override(imagePreview.width, imagePreview.height)
                             .fitCenter()
                             .into(object : SimpleTarget<Bitmap>() {
                                 override fun onResourceReady(
@@ -59,16 +59,26 @@ fun ChatRoomFragment.showFileAttachmentDialog(uri: Uri) {
     }
 
     sendButton.setOnClickListener {
-        presenter.uploadFile(
-            chatRoomId,
-            uri,
-            (citation ?: "") + description.text.toString(),
-            bitmap
-        )
-        alertDialog.dismiss()
+        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() }
-    alertDialog.show()
+    cancelButton.setOnClickListener { alertDialog?.dismiss() }
+    alertDialog?.show()
 }
 
 fun ChatRoomFragment.showDrawAttachmentDialog(byteArray: ByteArray) {
@@ -82,9 +92,9 @@ fun ChatRoomFragment.showDrawAttachmentDialog(byteArray: ByteArray) {
             byteArray,
             (citation ?: "") + description.text.toString()
         )
-        alertDialog.dismiss()
+        alertDialog?.dismiss()
     }
 
-    cancelButton.setOnClickListener { alertDialog.dismiss() }
-    alertDialog.show()
-}
\ No newline at end of file
+    cancelButton.setOnClickListener { alertDialog?.dismiss() }
+    alertDialog?.show()
+}

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

@@ -8,63 +8,25 @@ import androidx.appcompat.widget.SearchView
 import androidx.core.content.res.ResourcesCompat
 import chat.rocket.android.R
 import chat.rocket.android.util.extension.onQueryTextListener
-import chat.rocket.common.model.RoomType
 
 internal fun ChatRoomFragment.setupMenu(menu: Menu) {
     setupSearchMessageMenuItem(menu, requireContext())
     setupFavoriteMenuItem(menu)
-
-    menu.add(
-        Menu.NONE,
-        MENU_ACTION_PINNED_MESSAGES,
-        Menu.NONE,
-        R.string.title_pinned_messages
-    )
-
-    menu.add(
-        Menu.NONE,
-        MENU_ACTION_FAVORITE_MESSAGES,
-        Menu.NONE,
-        R.string.title_favorite_messages
-    )
-
-    if (chatRoomType != RoomType.DIRECT_MESSAGE && !disableMenu) {
-        menu.add(
-            Menu.NONE,
-            MENU_ACTION_MEMBER,
-            Menu.NONE,
-            R.string.title_members_list
-        )
-
-        menu.add(
-            Menu.NONE,
-            MENU_ACTION_MENTIONS,
-            Menu.NONE,
-            R.string.msg_mentions
-        )
-    }
-
-    if (!disableMenu) {
-        menu.add(
-            Menu.NONE,
-            MENU_ACTION_FILES,
-            Menu.NONE,
-            R.string.title_files
-        )
-    }
+    setupDetailsMenuItem(menu)
 }
 
 internal fun ChatRoomFragment.setOnMenuItemClickListener(item: MenuItem) {
     when (item.itemId) {
-        MENU_ACTION_FAVORITE_UNFAVORITE_CHAT -> presenter.toggleFavoriteChatRoom(
+        MENU_ACTION_FAVORITE_UNFAVOURITE_CHAT -> presenter.toggleFavoriteChatRoom(
             chatRoomId,
             isFavorite
         )
-        MENU_ACTION_MEMBER -> presenter.toMembersList(chatRoomId)
-        MENU_ACTION_MENTIONS -> presenter.toMentions(chatRoomId)
-        MENU_ACTION_PINNED_MESSAGES -> presenter.toPinnedMessageList(chatRoomId)
-        MENU_ACTION_FAVORITE_MESSAGES -> presenter.toFavoriteMessageList(chatRoomId)
-        MENU_ACTION_FILES -> presenter.toFileList(chatRoomId)
+        MENU_ACTION_SHOW_DETAILS -> presenter.toChatDetails(
+            chatRoomId,
+            chatRoomType,
+            isSubscribed,
+            disableMenu
+        )
     }
 }
 
@@ -125,7 +87,7 @@ private fun ChatRoomFragment.setupFavoriteMenuItem(menu: Menu) {
     if (isFavorite) {
         menu.add(
             Menu.NONE,
-            MENU_ACTION_FAVORITE_UNFAVORITE_CHAT,
+            MENU_ACTION_FAVORITE_UNFAVOURITE_CHAT,
             Menu.NONE,
             R.string.title_unfavorite_chat
         ).setIcon(R.drawable.ic_star_yellow_24dp)
@@ -133,10 +95,20 @@ private fun ChatRoomFragment.setupFavoriteMenuItem(menu: Menu) {
     } else {
         menu.add(
             Menu.NONE,
-            MENU_ACTION_FAVORITE_UNFAVORITE_CHAT,
+            MENU_ACTION_FAVORITE_UNFAVOURITE_CHAT,
             Menu.NONE,
             R.string.title_favorite_chat
         ).setIcon(R.drawable.ic_star_border_white_24dp)
             .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
     }
+}
+
+private fun ChatRoomFragment.setupDetailsMenuItem(menu: Menu) {
+    menu.add(
+            Menu.NONE,
+            MENU_ACTION_SHOW_DETAILS,
+            Menu.NONE,
+            R.string.title_channel_details
+    ).setIcon(R.drawable.ic_info_outline_white_24dp)
+            .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
 }
\ No newline at end of file

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/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,9 @@ 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,
+    val subscriptionId: String
 ) : BaseMessageUiModel<Message> {
     override val viewType: Int
         get() = BaseUiModel.ViewType.MESSAGE.viewType