Merge pull request #1889 from RocketChat/develop

[RELEASE] Merge DEVELOP into BETA

README.md

@@ -4,11 +4,14 @@
 
 [![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) 
 
+## 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 being used on this application. 
@@ -39,7 +42,7 @@ cd Rocket.Chat.Android/app
 
 ## 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
 

app/build.gradle

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

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

@@ -78,6 +78,11 @@
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
 
+        <activity
+            android:name=".chatdetails.ui.ChatDetailsActivity"
+            android:theme="@style/AppTheme"
+            android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
+
         <activity
             android:name=".chatinformation.ui.MessageInfoActivity"
             android:theme="@style/AppTheme"
@@ -88,6 +93,16 @@
             android:name=".settings.password.ui.PasswordActivity"
             android:theme="@style/AppTheme" />
 
+        <activity
+            android:name=".userdetails.ui.UserDetailsActivity"
+            android:theme="@style/AppTheme"
+            android:windowSoftInputMode="stateAlwaysHidden">
+
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".chatroom.ui.ChatRoomActivity" />
+        </activity>
+
         <receiver
             android:name=".push.DirectReplyReceiver"
             android:enabled="true"
@@ -105,6 +120,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/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) {
@@ -63,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...
@@ -77,9 +82,9 @@ class OnBoardingPresenter @Inject constructor(
             try {
                 withContext(DefaultDispatcher) {
                     setupConnectionInfo(serverUrl)
-                    refreshSettingsInteractor.refresh(serverUrl)
 
                     // preparing next fragment before showing it
+                    refreshServerAccounts()
                     checkEnabledAccounts(serverUrl)
                     checkIfLoginFormIsEnabled()
                     checkIfCreateNewAccountIsEnabled()

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()) {
@@ -93,9 +99,8 @@ class ServerPresenter @Inject constructor(
                 view.showLoading()
                 try {
                     withContext(DefaultDispatcher) {
-                        refreshSettingsInteractor.refresh(serverUrl)
-
                         // preparing next fragment before showing it
+                        refreshServerAccounts()
                         checkEnabledAccounts(serverUrl)
                         checkIfLoginFormIsEnabled()
                         checkIfCreateNewAccountIsEnabled()
@@ -112,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 ("$protocol${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/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 androidx.lifecycle.LifecycleOwner
+import chat.rocket.android.chatdetails.presentation.ChatDetailsView
+import chat.rocket.android.chatdetails.ui.ChatDetailsFragment
+import chat.rocket.android.core.lifecycle.CancelStrategy
+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
+import kotlinx.coroutines.experimental.Job
+
+@Module
+class ChatDetailsFragmentModule {
+
+    @Provides
+    @PerFragment
+    fun provideJob() = Job()
+
+    @Provides
+    @PerFragment
+    fun chatDetailsView(frag: ChatDetailsFragment): ChatDetailsView {
+        return frag
+    }
+
+    @Provides
+    @PerFragment
+    fun provideChatRoomDao(manager: DatabaseManager): ChatRoomDao = manager.chatRoomDao()
+
+    @Provides
+    @PerFragment
+    fun provideLifecycleOwner(frag: ChatDetailsFragment): LifecycleOwner {
+        return frag
+    }
+
+    @Provides
+    @PerFragment
+    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
+        return CancelStrategy(owner, jobs)
+    }
+}
\ 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/di/ChatDetailsModule.kt

+package chat.rocket.android.chatdetails.di
+
+import chat.rocket.android.chatdetails.presentation.ChatDetailsNavigator
+import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
+import chat.rocket.android.dagger.scope.PerActivity
+import dagger.Module
+import dagger.Provides
+
+@Module
+class ChatDetailsModule {
+
+    @Provides
+    @PerActivity
+    fun providesNavigator(activity: ChatDetailsActivity) = ChatDetailsNavigator(activity)
+}
\ 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/ChatDetailsNavigator.kt

+package chat.rocket.android.chatdetails.presentation
+
+import chat.rocket.android.R
+import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
+import chat.rocket.android.favoritemessages.ui.TAG_FAVORITE_MESSAGES_FRAGMENT
+import chat.rocket.android.files.ui.TAG_FILES_FRAGMENT
+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.util.extensions.addFragmentBackStack
+
+class ChatDetailsNavigator(internal val activity: ChatDetailsActivity) {
+
+    fun toMembersList(chatRoomId: String) {
+        activity.addFragmentBackStack(TAG_MEMBERS_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.members.ui.newInstance(chatRoomId)
+        }
+    }
+
+    fun toMentions(chatRoomId: String) {
+        activity.addFragmentBackStack(TAG_MENTIONS_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.mentions.ui.newInstance(chatRoomId)
+        }
+    }
+
+    fun toPinnedMessageList(chatRoomId: String) {
+        activity.addFragmentBackStack(TAG_PINNED_MESSAGES_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.pinnedmessages.ui.newInstance(chatRoomId)
+        }
+    }
+
+    fun toFavoriteMessageList(chatRoomId: String) {
+        activity.addFragmentBackStack(TAG_FAVORITE_MESSAGES_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.favoritemessages.ui.newInstance(chatRoomId)
+        }
+    }
+
+    fun toFileList(chatRoomId: String) {
+        activity.addFragmentBackStack(TAG_FILES_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.files.ui.newInstance(chatRoomId)
+        }
+    }
+}

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.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 javax.inject.Inject
+
+class ChatDetailsPresenter @Inject constructor(
+    private val view: ChatDetailsView,
+    private val navigator: ChatDetailsNavigator,
+    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(e: Exception) {
+                e.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/ChatDetailsActivity.kt

+package chat.rocket.android.chatdetails.ui
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import chat.rocket.android.R
+import chat.rocket.android.util.extensions.addFragment
+import dagger.android.AndroidInjection
+import dagger.android.AndroidInjector
+import dagger.android.DispatchingAndroidInjector
+import dagger.android.support.HasSupportFragmentInjector
+import kotlinx.android.synthetic.main.app_bar_chat_details.*
+import javax.inject.Inject
+
+fun Context.chatDetailsIntent(
+        chatRoomId: String,
+        chatRoomType: String,
+        isSubscribed: Boolean = true,
+        isMenuDisabled: Boolean = false
+): Intent {
+    return Intent(this, ChatDetailsActivity::class.java).apply {
+        putExtra(INTENT_CHAT_ROOM_ID, chatRoomId)
+        putExtra(INTENT_CHAT_ROOM_TYPE, chatRoomType)
+        putExtra(INTENT_CHAT_IS_SUBSCRIBED, isSubscribed)
+        putExtra(INTENT_CHAT_DISABLED_MENU, isMenuDisabled)
+    }
+}
+
+private const val INTENT_CHAT_ROOM_ID = "chat_room_id"
+private const val INTENT_CHAT_ROOM_TYPE = "chat_room_type"
+private const val INTENT_CHAT_IS_SUBSCRIBED = "is_chat_room_subscribed"
+private const val INTENT_CHAT_DISABLED_MENU = "is_menu_disabled"
+
+class ChatDetailsActivity: AppCompatActivity(), HasSupportFragmentInjector {
+    @Inject
+    lateinit var fragmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        AndroidInjection.inject(this)
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_chat_details)
+        setupToolbar()
+
+        val chatRoomId = intent.getStringExtra(INTENT_CHAT_ROOM_ID)
+        requireNotNull(chatRoomId) { "no chat_room_id provided in Intent extras" }
+
+        val chatRoomType = intent.getStringExtra(INTENT_CHAT_ROOM_TYPE)
+        requireNotNull(chatRoomType) { "no chat_room_type provided in Intent extras" }
+
+        val isSubscribed = intent.getBooleanExtra(INTENT_CHAT_IS_SUBSCRIBED, true)
+        val disableMenu = intent.getBooleanExtra(INTENT_CHAT_DISABLED_MENU, false)
+
+        if (supportFragmentManager.findFragmentByTag(TAG_CHAT_DETAILS_FRAGMENT) == null) {
+            addFragment(TAG_CHAT_DETAILS_FRAGMENT, R.id.fragment_container) {
+                newInstance(chatRoomId, chatRoomType, isSubscribed, disableMenu)
+            }
+        }
+    }
+
+    override fun supportFragmentInjector(): AndroidInjector<Fragment> =
+            fragmentDispatchingAndroidInjector
+
+    override fun onBackPressed() {
+        super.onBackPressed()
+        overridePendingTransition(R.anim.close_enter, R.anim.close_exit)
+    }
+
+    fun setNavigationIcon(resource: Int) {
+        toolbar.setNavigationIcon(resource)
+    }
+
+    fun setToolbarTitle(title: String) {
+        toolbar_title.text = title
+    }
+
+    private fun setupToolbar() {
+        setSupportActionBar(toolbar)
+        supportActionBar?.setDisplayShowTitleEnabled(false)
+        setToolbarTitle(getString(R.string.title_channel_details))
+        setNavigationIcon(R.drawable.ic_close_white_24dp)
+        toolbar.setNavigationOnClickListener { onBackPressed() }
+    }
+}
\ 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 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.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(1).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)
+        }
+    }
+
+    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() {
+        (activity as ChatDetailsActivity).let {
+            it.setNavigationIcon(R.drawable.ic_close_white_24dp)
+            it.setToolbarTitle(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/AttachmentViewHolder.kt

@@ -146,7 +146,8 @@ class AttachmentViewHolder(
 
     private fun bindAudioOrVideo(data: AttachmentUiModel) {
         with(itemView) {
-            text_file_name.content = data.title
+            file_name.isVisible = data.hasTitle
+            file_name.text = data.title
 
             file_text.isVisible = data.hasText
             file_text.text = data.text

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

@@ -61,6 +61,10 @@ 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

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

@@ -251,6 +251,9 @@ class ChatRoomAdapter(
                     R.id.action_message_permalink -> {
                         actionSelectListener?.copyPermalink(id)
                     }
+                    R.id.action_message_report -> {
+                        actionSelectListener?.reportMessage(id)
+                    }
                     else -> {
                         TODO("Not implemented")
                     }
@@ -260,16 +263,29 @@ class ChatRoomAdapter(
     }
 
     interface OnActionSelected {
+
         fun showMessageInfo(id: String)
+
         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)
     }
 }

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

@@ -75,7 +75,7 @@ class MessageReactionsAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>()
     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
@@ -121,6 +121,8 @@ class MessageReactionsAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>()
 
                 view_flipper_reaction.setOnClickListener(this@ReactionViewHolder)
                 text_count.setOnClickListener(this@ReactionViewHolder)
+                view_flipper_reaction.setOnLongClickListener(this@ReactionViewHolder)
+                text_count.setOnLongClickListener(this@ReactionViewHolder)
             }
         }
 
@@ -132,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

 package chat.rocket.android.chatroom.adapter
 
+import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.text.Spannable
@@ -10,6 +11,7 @@ import androidx.core.view.isVisible
 import chat.rocket.android.R
 import chat.rocket.android.chatroom.uimodel.MessageUiModel
 import chat.rocket.android.emoji.EmojiReactionListener
+import chat.rocket.android.userdetails.ui.userDetailsIntent
 import chat.rocket.core.model.isSystemMessage
 import com.bumptech.glide.load.resource.gif.GifDrawable
 import kotlinx.android.synthetic.main.avatar.view.*
@@ -70,9 +72,25 @@ class MessageViewHolder(
                 )
                 read_receipt_view.isVisible = true
             }
+
+            val senderId = data.message.sender?.id
+            val subscriptionId = data.subscriptionId
+
+            text_sender.setOnClickListener {
+                toUserDetails(context, senderId, subscriptionId)
+            }
+
+            image_avatar.setOnClickListener {
+                toUserDetails(context, senderId, subscriptionId)
+            }
+
         }
     }
 
+    private fun toUserDetails(context: Context, userId: String?, subscriptionId: String) {
+        userId?.let { context.startActivity(context.userDetailsIntent(it, subscriptionId)) }
+    }
+
     override fun unscheduleDrawable(who: Drawable?, what: Runnable?) {
         with(itemView) {
             text_content.removeCallbacks(what)

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.chatrooms.adapter.RoomUiModelMapper
 import chat.rocket.android.core.lifecycle.CancelStrategy
 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
@@ -42,4 +47,30 @@ class ChatRoomFragmentModule {
     @Provides
     @PerFragment
     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 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/presentation/ChatRoomNavigator.kt

 package chat.rocket.android.chatroom.presentation
 
 import chat.rocket.android.R
+import chat.rocket.android.chatdetails.ui.chatDetailsIntent
 import chat.rocket.android.chatinformation.ui.messageInformationIntent
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.chatroom.ui.chatRoomIntent
@@ -13,35 +14,20 @@ import chat.rocket.android.server.ui.changeServerIntent
 import chat.rocket.android.util.extensions.addFragmentBackStack
 
 class ChatRoomNavigator(internal val activity: ChatRoomActivity) {
-
-    fun toMembersList(chatRoomId: String) {
-        activity.addFragmentBackStack(TAG_MEMBERS_FRAGMENT, R.id.fragment_container) {
-            chat.rocket.android.members.ui.newInstance(chatRoomId)
-        }
-    }
-
-    fun toMentions(chatRoomId: String) {
-        activity.addFragmentBackStack(TAG_MENTIONS_FRAGMENT, R.id.fragment_container) {
-            chat.rocket.android.mentions.ui.newInstance(chatRoomId)
-        }
-    }
-
-    fun toPinnedMessageList(chatRoomId: String) {
-        activity.addFragmentBackStack(TAG_PINNED_MESSAGES_FRAGMENT, R.id.fragment_container) {
-            chat.rocket.android.pinnedmessages.ui.newInstance(chatRoomId)
-        }
-    }
-
-    fun toFavoriteMessageList(chatRoomId: String) {
-        activity.addFragmentBackStack(TAG_FAVORITE_MESSAGES_FRAGMENT, R.id.fragment_container) {
-            chat.rocket.android.favoritemessages.ui.newInstance(chatRoomId)
-        }
-    }
-
-    fun toFileList(chatRoomId: String) {
-        activity.addFragmentBackStack(TAG_FILES_FRAGMENT, R.id.fragment_container) {
-            chat.rocket.android.files.ui.newInstance(chatRoomId)
-        }
+    fun toChatDetails(
+        chatRoomId: String,
+        chatRoomType: String,
+        isChatRoomSubscribed: Boolean,
+        isMenuDisabled: Boolean
+    ) {
+        activity.startActivity(
+            activity.chatDetailsIntent(
+                chatRoomId,
+                chatRoomType,
+                isChatRoomSubscribed,
+                isMenuDisabled
+            )
+        )
     }
 
     fun toNewServer() {
@@ -80,4 +66,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/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,
+            "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/uimodel/MessageUiModel.kt

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

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

@@ -6,5 +6,6 @@ data class ReactionUiModel(
     val unicode: CharSequence,
     val count: Int,
     val usernames: List<String> = emptyList(),
-    var url: String? = null
-)
+    var url: String? = null,
+    val isCustom: Boolean = false
\ No newline at end of file
+)

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

@@ -19,6 +19,7 @@ import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.emoji.EmojiParser
 import chat.rocket.android.emoji.EmojiRepository
+import chat.rocket.android.emoji.internal.isCustom
 import chat.rocket.android.helper.MessageHelper
 import chat.rocket.android.helper.MessageParser
 import chat.rocket.android.helper.UserHelper
@@ -31,6 +32,7 @@ import chat.rocket.android.server.domain.messageReadReceiptEnabled
 import chat.rocket.android.server.domain.messageReadReceiptStoreUsers
 import chat.rocket.android.server.domain.useRealName
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.android.util.extension.orFalse
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.ifNotNullNorEmpty
 import chat.rocket.android.util.extensions.isNotNullNorEmpty
@@ -162,7 +164,7 @@ class UiModelMapper @Inject constructor(
 
     // TODO: move this to new interactor or FetchChatRoomsInteractor?
     private suspend fun getChatRoomAsync(roomId: String): ChatRoom? = withContext(CommonPool) {
-        return@withContext dbManager.chatRoomDao().get(roomId)?.let {
+        return@withContext dbManager.chatRoomDao().getSync(roomId)?.let {
             with(it.chatRoom) {
                 ChatRoom(
                     id = id,
@@ -454,7 +456,8 @@ class UiModelMapper @Inject constructor(
             messageId = message.id, avatar = avatar!!, time = time, senderName = sender,
             content = content, isPinned = message.pinned, currentDayMarkerText = dayMarkerText,
             showDayMarker = false, reactions = getReactions(message), isFirstUnread = false,
-            preview = preview, isTemporary = !synced, unread = unread, permalink = permalink)
+            preview = preview, isTemporary = !synced, unread = unread, permalink = permalink,
+            subscriptionId = chatRoom.subscriptionId)
     }
 
     private fun mapMessagePreview(message: Message): Message {
@@ -469,7 +472,7 @@ class UiModelMapper @Inject constructor(
             val list = mutableListOf<ReactionUiModel>()
             val customEmojis = EmojiRepository.getCustomEmojis()
             it.getShortNames().forEach { shortname ->
-                val usernames = it.getUsernames(shortname) ?: emptyList()
+                val usernames = it.getUsernames(shortname).orEmpty()
                 val count = usernames.size
                 val custom = customEmojis.firstOrNull { emoji -> emoji.shortname == shortname }
                 list.add(
@@ -478,7 +481,8 @@ class UiModelMapper @Inject constructor(
                         unicode = EmojiParser.parse(context, shortname),
                         count = count,
                         usernames = usernames,
-                        url = custom?.url)
+                        url = custom?.url,
+                        isCustom = custom != null)
                 )
             }
             list

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

@@ -2,15 +2,11 @@ package chat.rocket.android.chatrooms.adapter
 
 import android.app.Application
 import android.text.SpannableStringBuilder
-import androidx.core.content.ContextCompat
-import androidx.core.text.bold
-import androidx.core.text.color
 import chat.rocket.android.R
 import chat.rocket.android.chatrooms.adapter.model.RoomUiModel
 import chat.rocket.android.db.model.ChatRoom
-import chat.rocket.android.infrastructure.LocalRepository
-import chat.rocket.android.infrastructure.checkIfMyself
 import chat.rocket.android.server.domain.GetCurrentUserInteractor
+import chat.rocket.android.server.domain.PermissionsInteractor
 import chat.rocket.android.server.domain.PublicSettings
 import chat.rocket.android.server.domain.showLastMessage
 import chat.rocket.android.server.domain.useRealName
@@ -30,20 +26,16 @@ class RoomUiModelMapper(
     private val context: Application,
     private val settings: PublicSettings,
     private val userInteractor: GetCurrentUserInteractor,
-    private val serverUrl: String
+    private val serverUrl: String,
+    private val permissions: PermissionsInteractor
 ) {
-    private val nameUnreadColor = ContextCompat.getColor(context, R.color.colorPrimaryText)
-    private val nameColor = ContextCompat.getColor(context, R.color.colorSecondaryText)
-    private val dateUnreadColor = ContextCompat.getColor(context, R.color.colorAccent)
-    private val dateColor = ContextCompat.getColor(context, R.color.colorSecondaryText)
-    private val messageUnreadColor = ContextCompat.getColor(context, android.R.color.primary_text_light)
-    private val messageColor = ContextCompat.getColor(context, R.color.colorSecondaryText)
-
-    private val currentUser by lazy {
-        userInteractor.get()
-    }
+    private val currentUser by lazy { userInteractor.get() }
 
-    fun map(rooms: List<ChatRoom>, grouped: Boolean = false, showLastMessage: Boolean = true): List<ItemHolder<*>> {
+    fun map(
+        rooms: List<ChatRoom>,
+        grouped: Boolean = false,
+        showLastMessage: Boolean = true
+    ): List<ItemHolder<*>> {
         val list = ArrayList<ItemHolder<*>>(rooms.size + 4)
         var lastType: String? = null
         rooms.forEach { room ->
@@ -72,7 +64,7 @@ class RoomUiModelMapper(
 
     private fun mapUser(user: User): RoomUiModel {
         return with(user) {
-            val name = mapName(user.username!!, user.name, false)
+            val name = mapName(user.username!!, user.name)
             val status = user.status
             val avatar = serverUrl.avatarUrl(user.username!!)
             val username = user.username!!
@@ -88,39 +80,56 @@ class RoomUiModelMapper(
         }
     }
 
-    private fun mapRoom(room: Room, showLastMessage:Boolean = true): RoomUiModel {
+    private fun mapRoom(room: Room, showLastMessage: Boolean = true): RoomUiModel {
         return with(room) {
             RoomUiModel(
                 id = id,
                 name = name!!,
                 type = type,
                 avatar = serverUrl.avatarUrl(name!!, isGroupOrChannel = true),
-                lastMessage = if(showLastMessage) { mapLastMessage(lastMessage?.sender?.id, lastMessage?.sender?.username,
+                lastMessage = if (showLastMessage) {
+                    mapLastMessage(
+                        lastMessage?.sender?.id, lastMessage?.sender?.username,
                         lastMessage?.sender?.name, lastMessage?.message,
-                        isDirectMessage = type is RoomType.DirectMessage)} else { null }
+                        isDirectMessage = type is RoomType.DirectMessage
+                    )
+                } else {
+                    null
+                },
+                muted = muted.orEmpty(),
+                writable = isChannelWritable(muted)
             )
         }
     }
 
-    fun map(chatRoom: ChatRoom, showLastMessage:Boolean = true): RoomUiModel {
+    fun map(chatRoom: ChatRoom, showLastMessage: Boolean = true): RoomUiModel {
         return with(chatRoom.chatRoom) {
             val isUnread = alert || unread > 0
             val type = roomTypeOf(type)
             val status = chatRoom.status?.let { userStatusOf(it) }
-            val roomName = mapName(name, fullname, isUnread)
-            val timestamp = mapDate(lastMessageTimestamp ?: updatedAt, isUnread)
+            val roomName = mapName(name, fullname)
+            val timestamp = mapDate(lastMessageTimestamp ?: updatedAt)
             val avatar = if (type is RoomType.DirectMessage) {
                 serverUrl.avatarUrl(name)
             } else {
                 serverUrl.avatarUrl(name, isGroupOrChannel = true)
             }
             val unread = mapUnread(unread)
-            val lastMessage = if(showLastMessage) { mapLastMessage(lastMessageUserId, chatRoom.lastMessageUserName,
-                    chatRoom.lastMessageUserFullName, lastMessageText, isUnread,
-                    type is RoomType.DirectMessage) } else { null }
+            val lastMessage = if (showLastMessage) {
+                mapLastMessage(
+                    lastMessageUserId,
+                    chatRoom.lastMessageUserName,
+                    chatRoom.lastMessageUserFullName,
+                    lastMessageText,
+                    type is RoomType.DirectMessage
+                )
+            } else {
+                null
+            }
+            val hasMentions = mapMentions(userMentions, groupMentions)
             val open = open
-
-            val lastMessageMarkdown = lastMessage?.let { Markwon.markdown(context, it.toString()).toString() }
+            val lastMessageMarkdown =
+                lastMessage?.let { Markwon.markdown(context, it.toString()).toString() }
 
             RoomUiModel(
                 id = id,
@@ -130,14 +139,22 @@ class RoomUiModelMapper(
                 open = open,
                 date = timestamp,
                 unread = unread,
+                mentions = hasMentions,
                 alert = isUnread,
                 lastMessage = lastMessageMarkdown,
                 status = status,
-                username = if (type is RoomType.DirectMessage) name else null
+                username = if (type is RoomType.DirectMessage) name else null,
+                muted = muted.orEmpty(),
+                writable = isChannelWritable(muted)
             )
         }
     }
 
+    private fun isChannelWritable(muted: List<String>?): Boolean {
+        val canWriteToReadOnlyChannels = permissions.canPostToReadOnlyChannels()
+        return canWriteToReadOnlyChannels || !muted.orEmpty().contains(currentUser?.username)
+    }
+
     private fun roomType(type: String): String {
         val resources = context.resources
         return when (type) {
@@ -149,47 +166,37 @@ class RoomUiModelMapper(
         }
     }
 
-    private fun mapLastMessage(userId: String?, name: String?, fullName: String?, text: String?,
-                               unread: Boolean = false,
-                               isDirectMessage: Boolean = false): CharSequence? {
-
+    private fun mapLastMessage(
+        userId: String?,
+        name: String?,
+        fullName: String?,
+        text: String?,
+        isDirectMessage: Boolean = false
+    ): CharSequence? {
         return if (!settings.showLastMessage()) {
             null
         } else if (name != null && text != null) {
             val user = if (currentUser != null && currentUser!!.id == userId) {
                 "${context.getString(R.string.msg_you)}: "
             } else {
-                if (isDirectMessage) "" else "${mapName(name, fullName, unread)}: "
+                if (isDirectMessage) "" else "${mapName(name, fullName)}: "
             }
-
-            val color = if (unread) messageUnreadColor else messageColor
-
-            SpannableStringBuilder()
-                    .color(color) {
-                        bold { append(user) }
-                        append(text)
-                    }
+            SpannableStringBuilder().append(user).append(text)
         } else {
             context.getText(R.string.msg_no_messages_yet)
         }
     }
 
-    private fun mapName(name: String, fullName: String?, unread: Boolean): CharSequence {
-        val roomName = if (settings.useSpecialCharsOnRoom() || settings.useRealName()) {
+    private fun mapName(name: String, fullName: String?): CharSequence {
+        return if (settings.useSpecialCharsOnRoom() || settings.useRealName()) {
             fullName ?: name
         } else {
             name
         }
-
-        val color = if (unread) nameUnreadColor else nameColor
-        return SpannableStringBuilder()
-                .color(color) {
-                    append(roomName)
-                }
     }
 
     private fun mapUnread(unread: Long): String? {
-        return when(unread) {
+        return when (unread) {
             0L -> null
             in 1..99 -> unread.toString()
             else -> context.getString(R.string.msg_more_than_ninety_nine_unread_messages)
@@ -197,12 +204,14 @@ class RoomUiModelMapper(
         }
     }
 
-    private fun mapDate(date: Long?, unread: Boolean): CharSequence? {
-        return date?.localDateTime()?.date(context)?.let {
-            val color = if (unread) dateUnreadColor else dateColor
-            SpannableStringBuilder().color(color) {
-                append(it)
+    private fun mapMentions(userMentions: Long?, groupMentions: Long?): Boolean {
+        if (userMentions != null && groupMentions != null) {
+            if (userMentions > 0 || groupMentions > 0) {
+                return true
             }
         }
+        return false
     }
-}
+
\ No newline at end of file
+    private fun mapDate(date: Long?): CharSequence? = date?.localDateTime()?.date(context)
+}

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

@@ -4,6 +4,7 @@ import android.content.res.Resources
 import android.graphics.drawable.Drawable
 import android.view.View
 import androidx.core.view.isGone
+import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import chat.rocket.android.R
 import chat.rocket.android.chatrooms.adapter.model.RoomUiModel
@@ -11,19 +12,16 @@ import chat.rocket.common.model.RoomType
 import chat.rocket.common.model.UserStatus
 import kotlinx.android.synthetic.main.item_chat.view.*
 import kotlinx.android.synthetic.main.unread_messages_badge.view.*
-import ru.noties.markwon.Markwon
-
-class RoomViewHolder(itemView: View, private val listener: (RoomUiModel) -> Unit) : ViewHolder<RoomItemHolder>(itemView) {
 
+class RoomViewHolder(itemView: View, private val listener: (RoomUiModel) -> Unit) :
+    ViewHolder<RoomItemHolder>(itemView) {
     private val resources: Resources = itemView.resources
-    private val channelUnread: Drawable = resources.getDrawable(R.drawable.ic_hashtag_black_12dp)
-    private val channel: Drawable = resources.getDrawable(R.drawable.ic_hashtag_12dp)
-    private val groupUnread: Drawable = resources.getDrawable(R.drawable.ic_lock_black_12_dp)
-    private val group: Drawable = resources.getDrawable(R.drawable.ic_lock_12_dp)
-    private val online: Drawable = resources.getDrawable(R.drawable.ic_status_online_12dp)
-    private val away: Drawable = resources.getDrawable(R.drawable.ic_status_away_12dp)
-    private val busy: Drawable = resources.getDrawable(R.drawable.ic_status_busy_12dp)
-    private val offline: Drawable = resources.getDrawable(R.drawable.ic_status_invisible_12dp)
+    private val channelIcon: Drawable = resources.getDrawable(R.drawable.ic_hashtag_12dp)
+    private val groupIcon: Drawable = resources.getDrawable(R.drawable.ic_lock_12_dp)
+    private val onlineIcon: Drawable = resources.getDrawable(R.drawable.ic_status_online_12dp)
+    private val awayIcon: Drawable = resources.getDrawable(R.drawable.ic_status_away_12dp)
+    private val busyIcon: Drawable = resources.getDrawable(R.drawable.ic_status_busy_12dp)
+    private val offlineIcon: Drawable = resources.getDrawable(R.drawable.ic_status_invisible_12dp)
 
     override fun bindViews(data: RoomItemHolder) {
         val room = data.data
@@ -31,53 +29,59 @@ class RoomViewHolder(itemView: View, private val listener: (RoomUiModel) -> Unit
             image_avatar.setImageURI(room.avatar)
             text_chat_name.text = room.name
 
+            if (room.status != null && room.type is RoomType.DirectMessage) {
+                image_chat_icon.setImageDrawable(getStatusDrawable(room.status))
+            } else {
+                image_chat_icon.setImageDrawable(getRoomDrawable(room.type))
+            }
+
             if (room.lastMessage != null) {
-                text_last_message.isVisible = true
                 text_last_message.text = room.lastMessage
+                text_last_message.isVisible = true
             } else {
                 text_last_message.isGone = true
             }
 
             if (room.date != null) {
-                text_last_message_date_time.isVisible = true
-                text_last_message_date_time.text = room.date
+                text_timestamp.text = room.date
+                text_timestamp.isVisible = true
             } else {
-                text_last_message_date_time.isGone = true
+                text_timestamp.isInvisible = true
             }
 
-            if (room.unread != null) {
+            if (room.alert) {
+                if (room.unread == null) text_total_unread_messages.text = "!"
+                if (room.unread != null) text_total_unread_messages.text = room.unread
+                if (room.mentions) text_total_unread_messages.text = "@${room.unread}"
+                text_chat_name.setTextAppearance(context, R.style.ChatList_ChatName_Unread_TextView)
+                text_timestamp.setTextAppearance(context, R.style.ChatList_Timestamp_Unread_TextView)
+                text_last_message.setTextAppearance(context, R.style.ChatList_LastMessage_Unread_TextView)
                 text_total_unread_messages.isVisible = true
-                text_total_unread_messages.text = room.unread
             } else {
-                text_total_unread_messages.isGone = true
+                text_chat_name.setTextAppearance(context, R.style.ChatList_ChatName_TextView)
+                text_timestamp.setTextAppearance(context, R.style.ChatList_Timestamp_TextView)
+                text_last_message.setTextAppearance(context, R.style.ChatList_LastMessage_TextView)
+                text_total_unread_messages.isInvisible = true
             }
 
-            if (room.status != null && room.type is RoomType.DirectMessage) {
-                image_chat_icon.setImageDrawable(getStatusDrawable(room.status))
-            } else {
-                image_chat_icon.setImageDrawable(getRoomDrawable(room.type, room.alert))
-            }
-
-            setOnClickListener {
-                listener(room)
-            }
+            setOnClickListener { listener(room) }
         }
     }
 
-    private fun getRoomDrawable(type: RoomType, alert: Boolean): Drawable? {
-        return when(type) {
-            is RoomType.Channel -> if (alert) channelUnread else channel
-            is RoomType.PrivateGroup -> if (alert) groupUnread else group
+    private fun getRoomDrawable(type: RoomType): Drawable? {
+        return when (type) {
+            is RoomType.Channel -> channelIcon
+            is RoomType.PrivateGroup -> groupIcon
             else -> null
         }
     }
 
     private fun getStatusDrawable(status: UserStatus): Drawable {
-        return when(status) {
-            is UserStatus.Online -> online
-            is UserStatus.Away -> away
-            is UserStatus.Busy -> busy
-            else -> offline
+        return when (status) {
+            is UserStatus.Online -> onlineIcon
+            is UserStatus.Away -> awayIcon
+            is UserStatus.Busy -> busyIcon
+            else -> offlineIcon
         }
     }
 }
\ No newline at end of file

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

@@ -6,7 +6,8 @@ import chat.rocket.android.R
 import chat.rocket.android.chatrooms.adapter.model.RoomUiModel
 import chat.rocket.android.util.extensions.inflate
 
-class RoomsAdapter(private val listener: (RoomUiModel) -> Unit) : RecyclerView.Adapter<ViewHolder<*>>() {
+class RoomsAdapter(private val listener: (RoomUiModel) -> Unit) :
+    RecyclerView.Adapter<ViewHolder<*>>() {
 
     init {
         setHasStableIds(true)
@@ -40,16 +41,16 @@ class RoomsAdapter(private val listener: (RoomUiModel) -> Unit) : RecyclerView.A
 
     override fun getItemId(position: Int): Long {
         val item = values[position]
-        return when(item) {
-            is HeaderItemHolder -> item.data.hashCode().toLong()
+        return when (item) {
             is RoomItemHolder -> item.data.id.hashCode().toLong()
+            is HeaderItemHolder -> item.data.hashCode().toLong()
             is LoadingItemHolder -> "loading".hashCode().toLong()
             else -> throw IllegalStateException("View type must be either Room, Header or Loading")
         }
     }
 
     override fun getItemViewType(position: Int): Int {
-        return when(values[position]) {
+        return when (values[position]) {
             is RoomItemHolder -> VIEW_TYPE_ROOM
             is HeaderItemHolder -> VIEW_TYPE_HEADER
             is LoadingItemHolder -> VIEW_TYPE_LOADING

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

@@ -12,7 +12,12 @@ data class RoomUiModel(
     val date: CharSequence? = null,
     val unread: String? = null,
     val alert: Boolean = false,
+    val mentions: Boolean = false,
     val lastMessage: CharSequence? = null,
     val status: UserStatus? = null,
-    val username: String? = null
-)
+    val username: String? = null,
+    val broadcast: Boolean = false,
\ No newline at end of file
+    val canModerate: Boolean = false,
+    val writable: Boolean = true,
+    val muted: List<String> = emptyList()
+)

app/src/main/java/chat/rocket/android/chatrooms/di/ChatRoomsFragmentModule.kt

@@ -12,6 +12,7 @@ import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.db.UserDao
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.server.domain.GetCurrentUserInteractor
+import chat.rocket.android.server.domain.PermissionsInteractor
 import chat.rocket.android.server.domain.PublicSettings
 import chat.rocket.android.server.domain.SettingsRepository
 import chat.rocket.android.server.domain.TokenRepository
@@ -88,9 +89,10 @@ class ChatRoomsFragmentModule {
         context: Application,
         repository: SettingsRepository,
         userInteractor: GetCurrentUserInteractor,
-        @Named("currentServer") serverUrl: String
+        @Named("currentServer") serverUrl: String,
+        permissionsInteractor: PermissionsInteractor
     ): RoomUiModelMapper {
-        return RoomUiModelMapper(context, repository.get(serverUrl), userInteractor, serverUrl)
+        return RoomUiModelMapper(context, repository.get(serverUrl), userInteractor, serverUrl, permissionsInteractor)
     }
 
     @Provides

app/src/main/java/chat/rocket/android/chatrooms/infrastructure/ChatRoomsRepository.kt

@@ -3,9 +3,12 @@ package chat.rocket.android.chatrooms.infrastructure
 import androidx.lifecycle.LiveData
 import chat.rocket.android.db.ChatRoomDao
 import chat.rocket.android.db.model.ChatRoom
+import chat.rocket.android.util.retryDB
 import javax.inject.Inject
 
-class ChatRoomsRepository @Inject constructor(private val dao: ChatRoomDao){
+class ChatRoomsRepository @Inject constructor(private val dao: ChatRoomDao) {
+
+    // TODO - check how to use retryDB here - suspend
     fun getChatRooms(order: Order): LiveData<List<ChatRoom>> {
         return when(order) {
             Order.ACTIVITY -> dao.getAll()
@@ -15,9 +18,10 @@ class ChatRoomsRepository @Inject constructor(private val dao: ChatRoomDao){
         }
     }
 
-    fun search(query: String) = dao.searchSync(query)
+    suspend fun search(query: String) =
+        retryDB("roomSearch($query)") { dao.searchSync(query) }
 
-    fun count() = dao.count()
+    suspend fun count() = retryDB("roomsCount") { dao.count() }
 
     enum class Order {
         ACTIVITY,

app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt

@@ -13,6 +13,7 @@ import chat.rocket.android.server.domain.useRealName
 import chat.rocket.android.server.domain.useSpecialCharsOnRoom
 import chat.rocket.android.server.infraestructure.ConnectionManager
 import chat.rocket.android.util.extension.launchUI
+import chat.rocket.android.util.retryDB
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.RoomType
@@ -41,11 +42,31 @@ class ChatRoomsPresenter @Inject constructor(
     private val client = manager.client
     private val settings = settingsRepository.get(currentServer)
 
+    fun loadChatRoom(roomId: String) {
+        launchUI(strategy) {
+            view.showLoadingRoom("")
+            try {
+                val room = dbManager.getRoom(roomId)
+                if (room != null) {
+                    loadChatRoom(room.chatRoom, true)
+                } else {
+                    Timber.d("Error loading channel")
+                    view.showGenericErrorMessage()
+                }
+            } catch (ex: Exception) {
+                Timber.d(ex, "Error loading channel")
+                view.showGenericErrorMessage()
+            } finally {
+                view.hideLoadingRoom()
+            }
+        }
+    }
+
     fun loadChatRoom(chatRoom: RoomUiModel) {
         launchUI(strategy) {
             view.showLoadingRoom(chatRoom.name)
             try {
-                val room = dbManager.getRoom(chatRoom.id)
+                val room = retryDB("getRoom(${chatRoom.id}") { dbManager.getRoom(chatRoom.id) }
                 if (room != null) {
                     loadChatRoom(room.chatRoom, true)
                 } else {
@@ -56,7 +77,8 @@ class ChatRoomsPresenter @Inject constructor(
                             type = type.toString(),
                             name = username ?: name.toString(),
                             fullname = name.toString(),
-                            open = open
+                            open = open,
+                            muted = muted
                         )
                         loadChatRoom(entity, false)
                     }

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

-package chat.rocket.android.chatrooms.ui
-
-import DateTimeHelper
-import DrawableHelper
-import android.content.Context
-import android.graphics.Color
-import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.RecyclerView
-import android.text.SpannableStringBuilder
-import android.text.style.ForegroundColorSpan
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.core.view.isVisible
-import chat.rocket.android.R
-import chat.rocket.android.infrastructure.LocalRepository
-import chat.rocket.android.infrastructure.checkIfMyself
-import chat.rocket.android.server.domain.PublicSettings
-import chat.rocket.android.server.domain.showLastMessage
-import chat.rocket.android.server.domain.useRealName
-import chat.rocket.android.server.domain.useSpecialCharsOnRoom
-import chat.rocket.android.util.extensions.*
-import chat.rocket.common.model.RoomType
-import chat.rocket.core.model.ChatRoom
-import com.facebook.drawee.view.SimpleDraweeView
-import kotlinx.android.synthetic.main.item_chat.view.*
-import kotlinx.android.synthetic.main.unread_messages_badge.view.*
-
-class ChatRoomsAdapter(
-    private val context: Context,
-    private val settings: PublicSettings,
-    private val localRepository: LocalRepository,
-    private val listener: (ChatRoom) -> Unit
-) : RecyclerView.Adapter<ChatRoomsAdapter.ViewHolder>() {
-
-    var dataSet: MutableList<ChatRoom> = ArrayList()
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder = ViewHolder(parent.inflate(R.layout.item_chat))
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) = holder.bind(dataSet[position])
-
-    override fun getItemCount(): Int = dataSet.size
-
-    fun updateRooms(newRooms: List<ChatRoom>) {
-        dataSet.clear()
-        dataSet.addAll(newRooms)
-    }
-
-    inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-
-        fun bind(chatRoom: ChatRoom) = with(itemView) {
-            bindAvatar(chatRoom, image_avatar)
-            bindName(chatRoom, text_chat_name)
-            bindIcon(chatRoom, image_chat_icon)
-            if (settings.showLastMessage()) {
-                text_last_message.isVisible = true
-                text_last_message_date_time.isVisible = true
-                bindLastMessageDateTime(chatRoom, text_last_message_date_time)
-                bindLastMessage(chatRoom, text_last_message)
-            } else {
-                text_last_message.isVisible = false
-                text_last_message_date_time.isVisible = false
-            }
-            bindUnreadMessages(chatRoom, text_total_unread_messages)
-
-            if (chatRoom.alert || chatRoom.unread > 0) {
-                text_chat_name.setTextColor(ContextCompat.getColor(context,
-                    R.color.colorPrimaryText))
-                text_last_message_date_time.setTextColor(ContextCompat.getColor(context,
-                    R.color.colorAccent))
-                text_last_message.setTextColor(ContextCompat.getColor(context,
-                    android.R.color.primary_text_light))
-            } else {
-                text_chat_name.setTextColor(ContextCompat.getColor(context,
-                    R.color.colorSecondaryText))
-                text_last_message_date_time.setTextColor(ContextCompat.getColor(context,
-                    R.color.colorSecondaryText))
-                text_last_message.setTextColor(ContextCompat.getColor(context,
-                    R.color.colorSecondaryText))
-            }
-
-            setOnClickListener { listener(chatRoom) }
-        }
-
-        private fun bindAvatar(chatRoom: ChatRoom, drawee: SimpleDraweeView) {
-            if (chatRoom.type is RoomType.DirectMessage) {
-                drawee.setImageURI(chatRoom.client.url.avatarUrl(chatRoom.name))
-            } else {
-                drawee.setImageURI(chatRoom.client.url.avatarUrl(chatRoom.name, true))
-            }
-        }
-
-        private fun bindIcon(chatRoom: ChatRoom, imageView: ImageView) {
-            val drawable = when (chatRoom.type) {
-                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
-                )
-                is RoomType.DirectMessage -> DrawableHelper.getUserStatusDrawable(
-                    chatRoom.status,
-                    context
-                )
-                else -> null
-            }
-            drawable?.let {
-                val mutateDrawable = DrawableHelper.wrapDrawable(it).mutate()
-                if (chatRoom.type !is RoomType.DirectMessage) {
-                    val color = when (chatRoom.alert || chatRoom.unread > 0) {
-                        true -> R.color.colorPrimaryText
-                        false -> R.color.colorSecondaryText
-                    }
-                    DrawableHelper.tintDrawable(mutateDrawable, context, color)
-                }
-                imageView.setImageDrawable(mutateDrawable)
-            }
-        }
-
-        private fun bindName(chatRoom: ChatRoom, textView: TextView) {
-            textView.textContent = chatRoomName(chatRoom)
-        }
-
-        private fun chatRoomName(chatRoom: ChatRoom): String {
-            return if (settings.useSpecialCharsOnRoom() || settings.useRealName()) {
-                chatRoom.fullName ?: chatRoom.name
-            } else {
-                chatRoom.name
-            }
-        }
-
-        private fun bindLastMessageDateTime(chatRoom: ChatRoom, textView: TextView) {
-            val lastMessage = chatRoom.lastMessage
-            if (lastMessage != null) {
-                val localDateTime = DateTimeHelper.getLocalDateTime(lastMessage.timestamp)
-                textView.content = DateTimeHelper.getDate(localDateTime, context)
-            } else {
-                textView.content = ""
-            }
-        }
-
-        private fun bindLastMessage(chatRoom: ChatRoom, textView: TextView) {
-            val lastMessage = chatRoom.lastMessage
-            val lastMessageSender = lastMessage?.sender
-            if (lastMessage != null && lastMessageSender != null) {
-                val message = lastMessage.message
-                val senderUsername = if (settings.useRealName()) {
-                    lastMessageSender.name ?: lastMessageSender.username
-                } else {
-                    lastMessageSender.username
-                }
-                when (senderUsername) {
-                    chatRoom.name -> {
-                        textView.content = message
-                    }
-                    else -> {
-                        val user = if (localRepository.checkIfMyself(lastMessageSender.username!!)) {
-                            "${context.getString(R.string.msg_you)}: "
-                        } else {
-                            "$senderUsername: "
-                        }
-                        val spannable = SpannableStringBuilder(user)
-                        val len = spannable.length
-                        spannable.setSpan(ForegroundColorSpan(Color.BLACK), 0, len - 1, 0)
-                        spannable.append(message)
-                        textView.content = spannable
-                    }
-                }
-            } else {
-                textView.content = context.getText(R.string.msg_no_messages_yet)
-            }
-        }
-
-        private fun bindUnreadMessages(chatRoom: ChatRoom, textView: TextView) {
-            val totalUnreadMessage = chatRoom.unread
-            when {
-                totalUnreadMessage in 1..99 -> {
-                    textView.textContent = totalUnreadMessage.toString()
-                    textView.isVisible = true
-                }
-                totalUnreadMessage > 99 -> {
-                    textView.textContent = context.getString(R.string.msg_more_than_ninety_nine_unread_messages)
-                    textView.isVisible = true
-                }
-                else -> textView.isVisible = false
-            }
-        }
-    }
-}
\ No newline at end of file

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

@@ -84,8 +84,7 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
         if (bundle != null) {
             chatRoomId = bundle.getString(BUNDLE_CHAT_ROOM_ID)
             chatRoomId?.let {
-                // TODO - bring back support to load a room from id.
-                //presenter.goToChatRoomWithId(it)
+                presenter.loadChatRoom(it)
                 chatRoomId = null
             }
         }

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

-package chat.rocket.android.chatrooms.ui
-
-import android.content.Context
-import androidx.recyclerview.widget.RecyclerView
-import android.util.SparseArray
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import java.util.*
-
-class SimpleSectionedRecyclerViewAdapter(private val context: Context, private val sectionResourceId: Int, private val textResourceId: Int,
-                                         val baseAdapter: ChatRoomsAdapter) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    private var isValid = true
-    private val sectionsHeaders = SparseArray<Section>()
-
-    init {
-        baseAdapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
-            override fun onChanged() {
-                isValid = baseAdapter.itemCount > 0
-                notifyDataSetChanged()
-            }
-
-            override fun onItemRangeChanged(positionStart: Int, itemCount: Int) {
-                isValid = baseAdapter.itemCount > 0
-                notifyItemRangeChanged(positionStart, itemCount)
-            }
-
-            override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
-                isValid = baseAdapter.itemCount > 0
-                notifyItemRangeInserted(positionStart, itemCount)
-            }
-
-            override fun onItemRangeRemoved(positionStart: Int, itemCount: Int) {
-                isValid = baseAdapter.itemCount > 0
-                notifyItemRangeRemoved(positionStart, itemCount)
-            }
-        })
-    }
-
-    class SectionViewHolder(view: View, textResourceId: Int) : RecyclerView.ViewHolder(view) {
-        var title: TextView = view.findViewById<View>(textResourceId) as TextView
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, typeView: Int): RecyclerView.ViewHolder {
-        return if (typeView == SECTION_TYPE) {
-            val view = LayoutInflater.from(context).inflate(sectionResourceId, parent, false)
-            SectionViewHolder(view, textResourceId)
-        } else {
-            baseAdapter.onCreateViewHolder(parent, typeView - 1)
-        }
-    }
-
-    override fun onBindViewHolder(viewHolder: RecyclerView.ViewHolder, position: Int) {
-        if (isSectionHeaderPosition(position)) {
-            (viewHolder as SectionViewHolder).title.text = sectionsHeaders.get(position).title
-        } else {
-            baseAdapter.onBindViewHolder(viewHolder as ChatRoomsAdapter.ViewHolder, sectionedPositionToPosition(position))
-        }
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        return if (isSectionHeaderPosition(position))
-            SECTION_TYPE
-        else
-            baseAdapter.getItemViewType(sectionedPositionToPosition(position)) + 1
-    }
-
-    class Section(internal var firstPosition: Int, var title: CharSequence) {
-        internal var sectionedPosition: Int = 0
-    }
-
-    fun setSections(sections: Array<Section>) {
-        sectionsHeaders.clear()
-
-        Arrays.sort(sections) { section1, section2 ->
-            when {
-                section1.firstPosition == section2.firstPosition -> 0
-                section1.firstPosition < section2.firstPosition -> -1
-                else -> 1
-            }
-        }
-
-        for ((offset, section) in sections.withIndex()) {
-            section.sectionedPosition = section.firstPosition + offset
-            sectionsHeaders.append(section.sectionedPosition, section)
-        }
-
-        notifyDataSetChanged()
-    }
-
-    fun clearSections(){
-        sectionsHeaders.clear()
-        notifyDataSetChanged()
-    }
-
-    fun positionToSectionedPosition(position: Int): Int {
-        var offset = 0
-        for (i in 0 until sectionsHeaders.size()) {
-            if (sectionsHeaders.valueAt(i).firstPosition > position) {
-                break
-            }
-            ++offset
-        }
-        return position + offset
-    }
-
-    private fun sectionedPositionToPosition(sectionedPosition: Int): Int {
-        if (isSectionHeaderPosition(sectionedPosition)) {
-            return RecyclerView.NO_POSITION
-        }
-
-        var offset = 0
-        for (i in 0 until sectionsHeaders.size()) {
-            if (sectionsHeaders.valueAt(i).sectionedPosition > sectionedPosition) {
-                break
-            }
-            --offset
-        }
-        return sectionedPosition + offset
-    }
-
-    private fun isSectionHeaderPosition(position: Int): Boolean {
-        return sectionsHeaders.get(position) != null
-    }
-
-    override fun getItemId(position: Int): Long {
-        return when (isSectionHeaderPosition(position)) {
-            true -> (Integer.MAX_VALUE - sectionsHeaders.indexOfKey(position)).toLong()
-            false -> baseAdapter.getItemId(sectionedPositionToPosition(position))
-        }
-    }
-
-    override fun getItemCount(): Int {
-        return if (isValid) baseAdapter.itemCount + sectionsHeaders.size() else 0
-    }
-
-    companion object {
-        private const val SECTION_TYPE = 0
-    }
-}

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

@@ -27,7 +27,7 @@ import kotlinx.coroutines.experimental.launch
 import kotlinx.coroutines.experimental.newSingleThreadContext
 import kotlinx.coroutines.experimental.withContext
 import timber.log.Timber
-import java.security.InvalidParameterException
+import java.lang.IllegalArgumentException
 import kotlin.coroutines.experimental.coroutineContext
 
 
@@ -171,6 +171,6 @@ fun Query.asSortingOrder(): ChatRoomsRepository.Order {
                 ChatRoomsRepository.Order.ACTIVITY
             }
         }
-        else -> throw InvalidParameterException("Should be ByName or ByActivity")
+        else -> throw IllegalArgumentException("Should be ByName or ByActivity")
     }
 }

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

@@ -11,6 +11,9 @@ import chat.rocket.android.authentication.server.di.ServerFragmentProvider
 import chat.rocket.android.authentication.signup.di.SignupFragmentProvider
 import chat.rocket.android.authentication.twofactor.di.TwoFAFragmentProvider
 import chat.rocket.android.authentication.ui.AuthenticationActivity
+import chat.rocket.android.chatdetails.di.ChatDetailsFragmentProvider
+import chat.rocket.android.chatdetails.di.ChatDetailsModule
+import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
 import chat.rocket.android.chatinformation.di.MessageInfoFragmentProvider
 import chat.rocket.android.chatinformation.ui.MessageInfoActivity
 import chat.rocket.android.chatroom.di.ChatRoomFragmentProvider
@@ -35,25 +38,26 @@ import chat.rocket.android.server.ui.ChangeServerActivity
 import chat.rocket.android.settings.di.SettingsFragmentProvider
 import chat.rocket.android.settings.password.di.PasswordFragmentProvider
 import chat.rocket.android.settings.password.ui.PasswordActivity
+import chat.rocket.android.userdetails.di.UserDetailsModule
+import chat.rocket.android.userdetails.ui.UserDetailsActivity
 import chat.rocket.android.webview.adminpanel.di.AdminPanelWebViewFragmentProvider
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
 @Module
 abstract class ActivityBuilder {
-
     @PerActivity
     @ContributesAndroidInjector(
-            modules = [AuthenticationModule::class,
-                OnBoardingFragmentProvider::class,
-                ServerFragmentProvider::class,
-                LoginOptionsFragmentProvider::class,
-                LoginFragmentProvider::class,
-                RegisterUsernameFragmentProvider::class,
-                ResetPasswordFragmentProvider::class,
-                SignupFragmentProvider::class,
-                TwoFAFragmentProvider::class
-            ]
+        modules = [AuthenticationModule::class,
+            OnBoardingFragmentProvider::class,
+            ServerFragmentProvider::class,
+            LoginOptionsFragmentProvider::class,
+            LoginFragmentProvider::class,
+            RegisterUsernameFragmentProvider::class,
+            ResetPasswordFragmentProvider::class,
+            SignupFragmentProvider::class,
+            TwoFAFragmentProvider::class
+        ]
     )
     abstract fun bindAuthenticationActivity(): AuthenticationActivity
 
@@ -75,7 +79,16 @@ abstract class ActivityBuilder {
     @ContributesAndroidInjector(
         modules = [
             ChatRoomModule::class,
-            ChatRoomFragmentProvider::class,
+            ChatRoomFragmentProvider::class
+        ]
+    )
+    abstract fun bindChatRoomActivity(): ChatRoomActivity
+
+    @PerActivity
+    @ContributesAndroidInjector(
+        modules = [
+            ChatDetailsModule::class,
+            ChatDetailsFragmentProvider::class,
             MembersFragmentProvider::class,
             MentionsFragmentProvider::class,
             PinnedMessagesFragmentProvider::class,
@@ -83,7 +96,7 @@ abstract class ActivityBuilder {
             FilesFragmentProvider::class
         ]
     )
-    abstract fun bindChatRoomActivity(): ChatRoomActivity
+    abstract fun bindChatDetailsActivity(): ChatDetailsActivity
 
     @PerActivity
     @ContributesAndroidInjector(modules = [PasswordFragmentProvider::class])
@@ -96,6 +109,12 @@ abstract class ActivityBuilder {
     @PerActivity
     @ContributesAndroidInjector(modules = [MessageInfoFragmentProvider::class])
     abstract fun bindMessageInfoActiviy(): MessageInfoActivity
+
+    @PerActivity
     @ContributesAndroidInjector(modules = [DrawModule::class])
     abstract fun bindDrawingActivity(): DrawingActivity
+
+    @PerActivity
+    @ContributesAndroidInjector(modules = [UserDetailsModule::class])
+    abstract fun bindUserDetailsActivity(): UserDetailsActivity
 }

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

@@ -9,7 +9,6 @@ import androidx.room.Transaction
 import androidx.room.Update
 import chat.rocket.android.db.model.ChatRoom
 import chat.rocket.android.db.model.ChatRoomEntity
-import chat.rocket.common.model.RoomType
 
 @Dao
 abstract class ChatRoomDao : BaseDao<ChatRoomEntity> {
@@ -18,7 +17,14 @@ abstract class ChatRoomDao : BaseDao<ChatRoomEntity> {
         $BASE_QUERY
         WHERE chatrooms.id = :id
         """)
-    abstract fun get(id: String): ChatRoom?
+    abstract fun get(id: String): LiveData<ChatRoom>
+
+    @Transaction
+    @Query("""
+        $BASE_QUERY
+        WHERE chatrooms.id = :id
+        """)
+    abstract fun getSync(id: String): ChatRoom?
 
     @Transaction
     @Query("$BASE_QUERY $FILTER_NOT_OPENED")

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

@@ -2,6 +2,7 @@ package chat.rocket.android.db
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
 import chat.rocket.android.db.model.AttachmentActionEntity
 import chat.rocket.android.db.model.AttachmentEntity
 import chat.rocket.android.db.model.AttachmentFieldEntity
@@ -14,6 +15,7 @@ import chat.rocket.android.db.model.MessagesSync
 import chat.rocket.android.db.model.ReactionEntity
 import chat.rocket.android.db.model.UrlEntity
 import chat.rocket.android.db.model.UserEntity
+import chat.rocket.android.emoji.internal.db.StringListConverter
 
 @Database(
     entities = [
@@ -23,11 +25,12 @@ import chat.rocket.android.db.model.UserEntity
         AttachmentFieldEntity::class, AttachmentActionEntity::class, UrlEntity::class,
         ReactionEntity::class, MessagesSync::class
     ],
-    version = 10,
+    version = 11,
     exportSchema = true
 )
+@TypeConverters(StringListConverter::class)
 abstract class RCDatabase : RoomDatabase() {
     abstract fun userDao(): UserDao
     abstract fun chatRoomDao(): ChatRoomDao
     abstract fun messageDao(): MessageDao
-}
+}
\ No newline at end of file

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

@@ -29,7 +29,7 @@ abstract class UserDao : BaseDao<UserEntity> {
     abstract fun findUser(id: String): String?
 
     @Query("SELECT * FROM users WHERE ID = :id")
-    abstract fun getUser(id:String): UserEntity?
+    abstract fun getUser(id: String): UserEntity?
 
     @Transaction
     open fun upsert(user: BaseUserEntity) {

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

@@ -5,6 +5,8 @@ import androidx.room.Entity
 import androidx.room.ForeignKey
 import androidx.room.Index
 import androidx.room.PrimaryKey
+import androidx.room.TypeConverters
+import chat.rocket.android.emoji.internal.db.StringListConverter
 
 @Entity(tableName = "chatrooms",
         indices = [
@@ -20,6 +22,7 @@ import androidx.room.PrimaryKey
             ForeignKey(entity = UserEntity::class, parentColumns = ["id"], childColumns = ["lastMessageUserId"])
         ]
 )
+@TypeConverters(StringListConverter::class)
 data class ChatRoomEntity(
     @PrimaryKey var id: String,
     var subscriptionId: String,
@@ -31,6 +34,9 @@ data class ChatRoomEntity(
     var readonly: Boolean? = false,
     var isDefault: Boolean? = false,
     var favorite: Boolean? = false,
+    var topic: String? = null,
+    var announcement: String? = null,
+    var description: String? = null,
     var open: Boolean = true,
     var alert: Boolean = false,
     var unread: Long = 0,
@@ -42,7 +48,8 @@ data class ChatRoomEntity(
     var lastMessageText: String? = null,
     var lastMessageUserId: String? = null,
     var lastMessageTimestamp: Long? = null,
-    var broadcast: Boolean? = false
+    var broadcast: Boolean? = false,
+    var muted: List<String>? = null
 )
 
 data class ChatRoom(
@@ -52,4 +59,4 @@ data class ChatRoom(
     var status: String?,
     var lastMessageUserName: String?,
     var lastMessageUserFullName: String?
-)
+)
\ No newline at end of file

app/src/main/java/chat/rocket/android/favoritemessages/presentation/FavoriteMessagesPresenter.kt

@@ -5,6 +5,7 @@ import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
+import chat.rocket.android.util.retryDB
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.util.ifNull
@@ -36,7 +37,7 @@ class FavoriteMessagesPresenter @Inject constructor(
                 view.showLoading()
                 dbManager.getRoom(roomId)?.let {
                     val favoriteMessages =
-                        client.getFavoriteMessages(roomId, roomTypeOf(it.chatRoom.type), offset)
+                            client.getFavoriteMessages(roomId, roomTypeOf(it.chatRoom.type), offset)
                     val messageList = mapper.map(favoriteMessages.result, asNotReversed = true)
                     view.showFavoriteMessages(messageList)
                     offset += 1 * 30

app/src/main/java/chat/rocket/android/favoritemessages/ui/FavoriteMessagesFragment.kt

@@ -12,6 +12,7 @@ import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
 import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.analytics.event.ScreenViewEvent
+import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
 import chat.rocket.android.chatroom.adapter.ChatRoomAdapter
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.chatroom.uimodel.BaseUiModel
@@ -115,9 +116,9 @@ class FavoriteMessagesFragment : Fragment(), FavoriteMessagesView {
     }
 
     private fun setupToolbar() {
-        (activity as ChatRoomActivity).let {
-            it.showToolbarTitle(getString(R.string.title_favorite_messages))
-            it.hideToolbarChatRoomIcon()
+        (activity as ChatDetailsActivity).let {
+            it.setToolbarTitle(getString(R.string.title_favorite_messages))
+            it.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
         }
     }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/files/presentation/FilesPresenter.kt

@@ -7,6 +7,7 @@ import chat.rocket.android.files.uimodel.FileUiModel
 import chat.rocket.android.files.uimodel.FileUiModelMapper
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
+import chat.rocket.android.util.retryDB
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.util.ifNull

app/src/main/java/chat/rocket/android/files/ui/FilesFragment.kt

@@ -15,7 +15,7 @@ import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
 import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.analytics.event.ScreenViewEvent
-import chat.rocket.android.chatroom.ui.ChatRoomActivity
+import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
 import chat.rocket.android.files.adapter.FilesAdapter
 import chat.rocket.android.files.presentation.FilesPresenter
 import chat.rocket.android.files.presentation.FilesView
@@ -152,9 +152,9 @@ class FilesFragment : Fragment(), FilesView {
     }
 
     private fun setupToolbar(totalFiles: Long) {
-        (activity as ChatRoomActivity).let {
-            it.showToolbarTitle(getString(R.string.title_files_total, totalFiles))
-            it.hideToolbarChatRoomIcon()
+        (activity as ChatDetailsActivity).let {
+            it.setToolbarTitle(getString(R.string.title_files_total, totalFiles))
+            it.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
         }
     }
 }
\ No newline at end of file

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

 package chat.rocket.android.helper
 
+import android.os.Build
 import android.text.SpannableString
 import android.text.Spanned
 import android.text.method.LinkMovementMethod
 import android.text.style.ClickableSpan
 import android.widget.TextView
+import chat.rocket.android.BuildConfig
 import chat.rocket.android.util.extensions.ifEmpty
 
 object TextHelper {
@@ -23,7 +25,12 @@ object TextHelper {
             val link = links[i]
 
             val startIndexOfLink = textView.text.indexOf(link)
-            spannableString.setSpan(clickableSpan, startIndexOfLink, startIndexOfLink + link.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+            spannableString.setSpan(
+                clickableSpan,
+                startIndexOfLink,
+                startIndexOfLink + link.length,
+                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+            )
         }
         textView.movementMethod = LinkMovementMethod.getInstance()
         textView.setText(spannableString, TextView.BufferType.SPANNABLE)
@@ -39,4 +46,13 @@ object TextHelper {
         string.ifEmpty("?")
         return string.substring(0, 1).toUpperCase()
     }
+
+    /**
+     * Returns the user device information as well as the app information being used by the user.
+     */
+    fun getDeviceAndAppInformation(): String {
+        return "v${BuildConfig.VERSION_NAME} - (${BuildConfig.VERSION_CODE}) \n" +
+                "${Build.MANUFACTURER}  - ${Build.MODEL} \n" +
+                "Android ${Build.VERSION.RELEASE}"
+    }
 }
\ No newline at end of file

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

 package chat.rocket.android.main.presentation
 
 import android.content.Context
-import chat.rocket.android.R
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManagerFactory
 import chat.rocket.android.emoji.Emoji
@@ -36,13 +35,9 @@ import chat.rocket.common.model.UserStatus
 import chat.rocket.common.util.ifNull
 import chat.rocket.core.RocketChatClient
 import chat.rocket.core.internal.rest.getCustomEmojis
-import chat.rocket.core.internal.rest.logout
 import chat.rocket.core.internal.rest.me
-import chat.rocket.core.internal.rest.unregisterPushToken
 import chat.rocket.core.model.Myself
-import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.channels.Channel
-import kotlinx.coroutines.experimental.withContext
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -51,23 +46,33 @@ class MainPresenter @Inject constructor(
     private val strategy: CancelStrategy,
     private val navigator: MainNavigator,
     private val tokenRepository: TokenRepository,
-    private val serverInteractor: GetCurrentServerInteractor,
     private val refreshSettingsInteractor: RefreshSettingsInteractor,
     private val refreshPermissionsInteractor: RefreshPermissionsInteractor,
-    private val localRepository: LocalRepository,
     private val navHeaderMapper: NavHeaderUiModelMapper,
     private val saveAccountInteractor: SaveAccountInteractor,
     private val getAccountsInteractor: GetAccountsInteractor,
-    private val removeAccountInteractor: RemoveAccountInteractor,
-    factory: RocketChatClientFactory,
     private val groupedPush: GroupedPush,
+    serverInteractor: GetCurrentServerInteractor,
+    localRepository: LocalRepository,
+    removeAccountInteractor: RemoveAccountInteractor,
+    factory: RocketChatClientFactory,
     dbManagerFactory: DatabaseManagerFactory,
     getSettingsInteractor: GetSettingsInteractor,
     managerFactory: ConnectionManagerFactory
-) : CheckServerPresenter(strategy, factory, view = view) {
+) : CheckServerPresenter(
+    strategy = strategy,
+    factory = factory,
+    serverInteractor = serverInteractor,
+    localRepository = localRepository,
+    removeAccountInteractor = removeAccountInteractor,
+    tokenRepository = tokenRepository,
+    managerFactory = managerFactory,
+    dbManagerFactory = dbManagerFactory,
+    tokenView = view,
+    navigator = navigator
+) {
     private val currentServer = serverInteractor.get()!!
     private val manager = managerFactory.create(currentServer)
-    private val dbManager = dbManagerFactory.create(currentServer)
     private val client: RocketChatClient = factory.create(currentServer)
     private var settings: PublicSettings = getSettingsInteractor.get(serverInteractor.get()!!)
     private val userDataChannel = Channel<Myself>()
@@ -114,9 +119,7 @@ class MainPresenter @Inject constructor(
                 view.setupUserAccountInfo(model)
             } catch (ex: Exception) {
                 when (ex) {
-                    is RocketChatAuthException -> {
-                        logout()
-                    }
+                    is RocketChatAuthException -> logout()
                     else -> {
                         Timber.d(ex, "Error loading my information for navheader")
                         ex.message?.let {
@@ -163,36 +166,9 @@ class MainPresenter @Inject constructor(
         }
     }
 
-    /**
-     * Logout from current server.
-     */
     fun logout() {
-        launchUI(strategy) {
-            view.showProgress()
-            try {
-                clearTokens()
-                retryIO("logout") { client.logout() }
-            } catch (exception: RocketChatException) {
-                Timber.d(exception, "Error calling logout")
-                exception.message?.let {
-                    view.showMessage(it)
-                }.ifNull {
-                    view.showGenericErrorMessage()
-                }
-            }
-
-            try {
-                disconnect()
-                removeAccountInteractor.remove(currentServer)
-                tokenRepository.remove(currentServer)
-
-                withContext(CommonPool) { dbManager.logout() }
-                navigator.switchOrAddNewServer()
-            } catch (ex: Exception) {
-                Timber.d(ex, "Error cleaning up the session...")
-            }
-            view.hideProgress()
-        }
+        setupConnectionInfo(currentServer)
+        super.logout(userDataChannel)
     }
 
     fun connect() {
@@ -202,8 +178,8 @@ class MainPresenter @Inject constructor(
     }
 
     fun disconnect() {
-        manager.removeUserDataChannel(userDataChannel)
-        manager.disconnect()
+        setupConnectionInfo(currentServer)
+        super.disconnect(userDataChannel)
     }
 
     fun changeServer(serverUrl: String) {
@@ -247,20 +223,6 @@ class MainPresenter @Inject constructor(
         saveAccountInteractor.save(account)
     }
 
-    private suspend fun clearTokens() {
-        serverInteractor.clear()
-        val pushToken = localRepository.get(LocalRepository.KEY_PUSH_TOKEN)
-        if (pushToken != null) {
-            try {
-                retryIO("unregisterPushToken") { client.unregisterPushToken(pushToken) }
-                view.invalidateToken(pushToken)
-            } catch (ex: Exception) {
-                Timber.d(ex, "Error unregistering push token")
-            }
-        }
-        localRepository.clearAllFromServer(currentServer)
-    }
-
     private suspend fun subscribeMyselfUpdates() {
         manager.addUserDataChannel(userDataChannel)
         for (myself in userDataChannel) {

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

@@ -4,9 +4,10 @@ import chat.rocket.android.authentication.server.presentation.VersionCheckView
 import chat.rocket.android.core.behaviours.MessageView
 import chat.rocket.android.main.uimodel.NavHeaderUiModel
 import chat.rocket.android.server.domain.model.Account
+import chat.rocket.android.server.presentation.TokenView
 import chat.rocket.common.model.UserStatus
 
-interface MainView : MessageView, VersionCheckView {
+interface MainView : MessageView, VersionCheckView, TokenView {
 
     /**
      * Shows the current user status.
@@ -31,8 +32,6 @@ interface MainView : MessageView, VersionCheckView {
 
     fun closeServerSelection()
 
-    fun invalidateToken(token: String)
-
     fun showProgress()
 
     fun hideProgress()

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

@@ -62,10 +62,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
         setContentView(R.layout.activity_main)
 
         refreshPushToken()
-
         chatRoomId = intent.getStringExtra(INTENT_CHAT_ROOM_ID)
-
-        println("ChatRoomId: $chatRoomId")
         presenter.clearNotificationsForChatroom(chatRoomId)
 
         presenter.connect()
@@ -202,8 +199,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
             .show()
     }
 
-    override fun invalidateToken(token: String) =
-        invalidateFirebaseToken(token)
+    override fun invalidateToken(token: String) = invalidateFirebaseToken(token)
 
     override fun showMessage(resId: Int) = showToast(resId)
 
@@ -234,11 +230,11 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
 
     fun showLogoutDialog() {
         val builder = AlertDialog.Builder(this)
-        builder.setTitle(R.string.action_logout)
-        builder.setMessage(R.string.title_confirmation)
-        builder.setPositiveButton(R.string.action_logout) { _, _ -> presenter.logout()}
-            .setNegativeButton(R.string.action_stay) { dialog, _ -> dialog.cancel() }
-        builder.create().show()
+        builder.setTitle(R.string.title_are_you_sure)
+            .setPositiveButton(R.string.action_logout) { _, _ -> presenter.logout()}
+            .setNegativeButton(android.R.string.no) { dialog, _ -> dialog.cancel() }
+            .create()
+            .show()
     }
 
     fun setAvatar(avatarUrl: String) {

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

@@ -47,4 +47,4 @@ class MembersAdapter(private val listener: (MemberUiModel) -> Unit) :
             setOnClickListener { listener(memberUiModel) }
         }
     }
-}
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/members/di/MembersFragmentModule.kt

 package chat.rocket.android.members.di
 
 import androidx.lifecycle.LifecycleOwner
-import chat.rocket.android.chatroom.ui.ChatRoomActivity
+import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.members.presentation.MembersNavigator
@@ -22,7 +22,7 @@ class MembersFragmentModule {
 
     @Provides
     @PerFragment
-    fun provideChatRoomNavigator(activity: ChatRoomActivity) = MembersNavigator(activity)
+    fun provideChatRoomNavigator(activity: ChatDetailsActivity) = MembersNavigator(activity)
 
     @Provides
     @PerFragment

app/src/main/java/chat/rocket/android/members/presentation/MembersNavigator.kt

 package chat.rocket.android.members.presentation
 
-import chat.rocket.android.chatroom.ui.ChatRoomActivity
-import chat.rocket.android.members.ui.TAG_MEMBER_BOTTOM_SHEET_FRAGMENT
-import chat.rocket.android.members.ui.newInstance
+import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
+import chat.rocket.android.userdetails.ui.userDetailsIntent
 
-class MembersNavigator(internal val activity: ChatRoomActivity) {
+class MembersNavigator(internal val activity: ChatDetailsActivity) {
 
-    fun toMemberDetails(avatarUri: String, realName: String, username: String, email: String, utcOffset: String) {
+    fun toMemberDetails(userId: String) {
         activity.apply {
-            newInstance(avatarUri, realName, username, email, utcOffset)
-                .show(supportFragmentManager, TAG_MEMBER_BOTTOM_SHEET_FRAGMENT)
+            startActivity(this.userDetailsIntent(userId, ""))
         }
     }
 }

app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt

@@ -6,6 +6,7 @@ import chat.rocket.android.members.uimodel.MemberUiModel
 import chat.rocket.android.members.uimodel.MemberUiModelMapper
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
+import chat.rocket.android.util.retryDB
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.util.ifNull
@@ -38,7 +39,7 @@ class MembersPresenter @Inject constructor(
                 view.showLoading()
                 dbManager.getRoom(roomId)?.let {
                     val members =
-                        client.getMembers(roomId, roomTypeOf(it.chatRoom.type), offset, 60)
+                            client.getMembers(roomId, roomTypeOf(it.chatRoom.type), offset, 60)
                     val memberUiModels = mapper.mapToUiModelList(members.result)
                     view.showMembers(memberUiModels, members.total)
                     offset += 1 * 60L
@@ -58,12 +59,6 @@ class MembersPresenter @Inject constructor(
     }
 
     fun toMemberDetails(memberUiModel: MemberUiModel) {
-        navigator.toMemberDetails(
-            memberUiModel.avatarUri.toString(),
-            memberUiModel.realName.toString(),
-            "@${memberUiModel.username}",
-            memberUiModel.email ?: "",
-            memberUiModel.utcOffset.toString()
-        )
+        navigator.toMemberDetails(memberUiModel.userId)
     }
-}
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt

@@ -12,7 +12,7 @@ import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
 import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.analytics.event.ScreenViewEvent
-import chat.rocket.android.chatroom.ui.ChatRoomActivity
+import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
 import chat.rocket.android.helper.EndlessRecyclerViewScrollListener
 import chat.rocket.android.members.adapter.MembersAdapter
 import chat.rocket.android.members.presentation.MembersPresenter
@@ -127,13 +127,13 @@ class MembersFragment : Fragment(), MembersView {
     }
 
     private fun setupToolbar(totalMembers: Long? = null) {
-        (activity as ChatRoomActivity).let {
+        (activity as ChatDetailsActivity).let {
             if (totalMembers != null) {
-                it.showToolbarTitle(getString(R.string.title_counted_members, totalMembers))
+                it.setToolbarTitle(getString(R.string.title_counted_members, totalMembers))
             } else {
-                it.showToolbarTitle(getString(R.string.title_members))
+                it.setToolbarTitle(getString(R.string.title_members))
             }
-            it.hideToolbarChatRoomIcon()
+            it.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
         }
     }
 }
\ No newline at end of file

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

@@ -11,6 +11,7 @@ class MemberUiModel(
     private val settings: Map<String, Value<Any>>,
     private val baseUrl: String?
 ) {
+    val userId: String = member.id
     val avatarUri: String?
     val displayName: String
     val realName: String?
@@ -52,4 +53,4 @@ class MemberUiModel(
     private fun getUserUtcOffset(): Float? = member.utcOffset
 
     private fun getUserStatus(): UserStatus? = member.status
-}
+}
\ No newline at end of file

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

@@ -7,11 +7,14 @@ import chat.rocket.common.model.User
 import chat.rocket.core.model.Value
 import javax.inject.Inject
 
-class MemberUiModelMapper @Inject constructor(serverInteractor: GetCurrentServerInteractor, getSettingsInteractor: GetSettingsInteractor) {
+class MemberUiModelMapper @Inject constructor(
+    serverInteractor: GetCurrentServerInteractor,
+    getSettingsInteractor: GetSettingsInteractor
+) {
     private var settings: Map<String, Value<Any>> = getSettingsInteractor.get(serverInteractor.get()!!)
     private val baseUrl = settings.baseUrl()
 
     fun mapToUiModelList(memberList: List<User>): List<MemberUiModel> {
         return memberList.map { MemberUiModel(it, settings, baseUrl) }
     }
-}
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/mentions/ui/MentionsFragment.kt

@@ -12,8 +12,8 @@ import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
 import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.analytics.event.ScreenViewEvent
+import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
 import chat.rocket.android.chatroom.adapter.ChatRoomAdapter
-import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.chatroom.uimodel.BaseUiModel
 import chat.rocket.android.helper.EndlessRecyclerViewScrollListener
 import chat.rocket.android.mentions.presentention.MentionsPresenter
@@ -122,9 +122,9 @@ class MentionsFragment : Fragment(), MentionsView {
     }
 
     private fun setupToolbar() {
-        (activity as ChatRoomActivity).let {
-            it.showToolbarTitle(getString(R.string.msg_mentions))
-            it.hideToolbarChatRoomIcon()
+        (activity as ChatDetailsActivity).let {
+            it.setToolbarTitle(getString(R.string.msg_mentions))
+            it.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
         }
     }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/pinnedmessages/presentation/PinnedMessagesPresenter.kt

@@ -5,6 +5,7 @@ import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
+import chat.rocket.android.util.retryDB
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.util.ifNull
@@ -36,7 +37,7 @@ class PinnedMessagesPresenter @Inject constructor(
                 view.showLoading()
                 dbManager.getRoom(roomId)?.let {
                     val pinnedMessages =
-                        client.getPinnedMessages(roomId, roomTypeOf(it.chatRoom.type), offset)
+                            client.getPinnedMessages(roomId, roomTypeOf(it.chatRoom.type), offset)
                     val messageList = mapper.map(pinnedMessages.result, asNotReversed = true)
                     view.showPinnedMessages(messageList)
                     offset += 1 * 30

app/src/main/java/chat/rocket/android/pinnedmessages/ui/PinnedMessagesFragment.kt

@@ -12,6 +12,7 @@ import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
 import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.analytics.event.ScreenViewEvent
+import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
 import chat.rocket.android.chatroom.adapter.ChatRoomAdapter
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.chatroom.uimodel.BaseUiModel
@@ -122,9 +123,9 @@ class PinnedMessagesFragment : Fragment(), PinnedMessagesView {
     }
 
     private fun setupToolbar() {
-        (activity as ChatRoomActivity).let {
-            it.showToolbarTitle(getString(R.string.title_pinned_messages))
-            it.hideToolbarChatRoomIcon()
+        (activity as ChatDetailsActivity).let {
+            it.setToolbarTitle(getString(R.string.title_pinned_messages))
+            it.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
         }
     }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/profile/presentation/ProfileView.kt

@@ -2,8 +2,9 @@ package chat.rocket.android.profile.presentation
 
 import chat.rocket.android.core.behaviours.LoadingView
 import chat.rocket.android.core.behaviours.MessageView
+import chat.rocket.android.server.presentation.TokenView
 
-interface ProfileView : LoadingView, MessageView {
+interface ProfileView : TokenView, LoadingView, MessageView {
 
     /**
      * Shows the user profile.

app/src/main/java/chat/rocket/android/push/PushManager.kt

@@ -296,11 +296,8 @@ class PushManager @Inject constructor(
     }
 
     private fun getContentIntent(context: Context, notificationId: Int, pushMessage: PushMessage, grouped: Boolean = false): PendingIntent {
-        val notificationIntent = context.changeServerIntent(pushMessage.info.host, chatRoomId = pushMessage.info.roomId)
-        // TODO - add support to go directly to the chatroom
-        /*if (!isGrouped) {
-            notificationIntent.putExtra(EXTRA_ROOM_ID, pushMessage.info.roomId)
-        }*/
+        val roomId = if (!grouped) pushMessage.info.roomId else null
+        val notificationIntent = context.changeServerIntent(pushMessage.info.host, chatRoomId = roomId)
         return PendingIntent.getActivity(context, random.nextInt(), notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT)
     }
 

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

+package chat.rocket.android.server.presentation
+
+interface TokenView {
+
+    fun invalidateToken(token: String)
+}
\ No newline at end of file

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

@@ -23,6 +23,7 @@ fun Context.changeServerIntent(serverUrl: String? = null, chatRoomId: String? =
         flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_CLEAR_TASK
     }
 }
+
 class ChangeServerActivity : AppCompatActivity(), ChangeServerView {
     @Inject lateinit var presenter: ChangeServerPresenter