From 60f0c4d4eb0623d68c5e27c6c65d85cebd4b07e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Rutkowski?= <lukus178@gmail.com>
Date: Sat, 20 Oct 2018 14:13:32 +0200
Subject: [PATCH 001/149] Show users summary when long-clicking reaction

---
 .../chatroom/adapter/BaseViewHolder.kt        |  4 +++
 .../adapter/MessageReactionsAdapter.kt        | 10 +++++--
 .../presentation/ChatRoomPresenter.kt         |  4 +++
 .../chatroom/presentation/ChatRoomView.kt     |  2 ++
 .../android/chatroom/ui/ChatRoomFragment.kt   | 28 +++++++++++++++++++
 app/src/main/res/values-de/strings.xml        |  3 ++
 app/src/main/res/values-es/strings.xml        |  3 ++
 app/src/main/res/values-fr/strings.xml        |  3 ++
 app/src/main/res/values-ja/strings.xml        |  3 ++
 app/src/main/res/values-pt-rBR/strings.xml    |  3 ++
 app/src/main/res/values-ru-rRU/strings.xml    |  3 ++
 app/src/main/res/values-tr/strings.xml        |  3 ++
 app/src/main/res/values-uk/strings.xml        |  3 ++
 app/src/main/res/values/strings.xml           |  3 ++
 .../android/emoji/EmojiReactionListener.kt    |  8 ++++++
 15 files changed, 81 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatroom/adapter/BaseViewHolder.kt b/app/src/main/java/chat/rocket/android/chatroom/adapter/BaseViewHolder.kt
index 6b1fd175e9..4ad0d5f8ec 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/adapter/BaseViewHolder.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/adapter/BaseViewHolder.kt
@@ -60,6 +60,10 @@ abstract class BaseViewHolder<T : BaseUiModel<*>>(
                             reactionListener?.onReactionAdded(messageId, emoji)
                         }
                     }
+
+                    override fun onReactionLongClicked(emojiShortname: String, usernames: List<String>) {
+                        reactionListener?.onReactionLongClicked(emojiShortname, usernames)
+                    }
                 }
                 val context = itemView.context
                 val manager = FlexboxLayoutManager(context, FlexDirection.ROW)
diff --git a/app/src/main/java/chat/rocket/android/chatroom/adapter/MessageReactionsAdapter.kt b/app/src/main/java/chat/rocket/android/chatroom/adapter/MessageReactionsAdapter.kt
index 3d09975851..a59f34e494 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/adapter/MessageReactionsAdapter.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/adapter/MessageReactionsAdapter.kt
@@ -4,7 +4,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
@@ -76,7 +75,7 @@ class MessageReactionsAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>()
     class SingleReactionViewHolder(
         view: View,
         private val listener: EmojiReactionListener?
-    ) : RecyclerView.ViewHolder(view), View.OnClickListener {
+    ) : RecyclerView.ViewHolder(view), View.OnClickListener, View.OnLongClickListener {
 
         @Inject
         lateinit var localRepository: LocalRepository
@@ -119,6 +118,8 @@ class MessageReactionsAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>()
 
                 view_flipper_reaction.setOnClickListener(this@SingleReactionViewHolder)
                 text_count.setOnClickListener(this@SingleReactionViewHolder)
+                view_flipper_reaction.setOnLongClickListener(this@SingleReactionViewHolder)
+                text_count.setOnLongClickListener(this@SingleReactionViewHolder)
             }
         }
 
@@ -130,6 +131,11 @@ class MessageReactionsAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>()
                 }
             }
         }
+
+        override fun onLongClick(v: View?): Boolean {
+            listener?.onReactionLongClicked(reaction.shortname, reaction.usernames)
+            return true
+        }
     }
 
     class AddReactionViewHolder(
diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
index e442cf940a..4948de490d 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
@@ -989,6 +989,10 @@ class ChatRoomPresenter @Inject constructor(
         view.showReactionsPopup(messageId)
     }
 
+    fun showReactionsSummary(emojiShortname: String, usernames: List<String>) {
+        view.showReactionsSummary(emojiShortname, usernames, currentLoggedUsername)
+    }
+
     fun loadCommands() {
         launchUI(strategy) {
             try {
diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomView.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomView.kt
index 7b226e62cb..b894687fe3 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomView.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomView.kt
@@ -140,6 +140,8 @@ interface ChatRoomView : LoadingView, MessageView {
 
     fun showReactionsPopup(messageId: String)
 
+    fun showReactionsSummary(emojiShortname: String, usernames: List<String>, currentLoggedUsername: String?)
+
     /**
      * Show list of commands.
      *
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index 03d310f585..c2d899a21c 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -22,6 +22,7 @@ import android.widget.EditText
 import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.TextView
+import android.widget.Toast
 import androidx.annotation.DrawableRes
 import androidx.core.text.bold
 import androidx.core.view.isVisible
@@ -665,6 +666,33 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         presenter.react(messageId, emoji.shortname)
     }
 
+    override fun onReactionLongClicked(emojiShortname: String, usernames: List<String>) {
+        presenter.showReactionsSummary(emojiShortname, usernames)
+    }
+
+    override fun showReactionsSummary(emojiShortname: String, usernames: List<String>, currentLoggedUsername: String?) {
+        var usernamesString = usernames.asSequence()
+            .take(15)
+            .joinToString { username ->
+                if (username == currentLoggedUsername) {
+                    getString(R.string.msg_you).toLowerCase()
+                } else {
+                    "@$username"
+                }
+            }
+        if (usernames.size > 15) {
+            usernamesString += " " + getString(R.string.And_more, usernames.size - 15).toLowerCase()
+        } else {
+            usernamesString = usernamesString.replace(""",([^,]+)$""".toRegex()) {
+                " ${getString(R.string.and)}${it.groupValues[1]}"
+            }
+        }
+        if (usernamesString[0] != '@') {
+            usernamesString = usernamesString.capitalize()
+        }
+        showToast("$usernamesString ${getString(R.string.Reacted_with).toLowerCase()} $emojiShortname", Toast.LENGTH_LONG)
+    }
+
     override fun showReactionsPopup(messageId: String) {
         ui {
             val emojiPickerPopup = EmojiPickerPopup(it)
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9492b752bb..17fd3d1615 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -277,6 +277,9 @@
     <!-- Emoji message-->
     <string name="msg_no_recent_emoji">Keine letzten Emojis</string>
     <string name="alert_title_default_skin_tone">Standart Hautton</string>
+    <string name="And_more">Und %1$d mehr</string>
+    <string name="and">und</string>
+    <string name="Reacted_with">Reagierte mit</string>
 
     <!-- Sorting and grouping-->
     <string name="menu_chatroom_sort">Sortiere</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d1c4e727e3..ff42011392 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -275,6 +275,9 @@
     <!-- Emoji message-->
     <string name="msg_no_recent_emoji">Sin emojis recientes</string>
     <string name="alert_title_default_skin_tone">Tono de piel predeterminado</string>
+    <string name="And_more">Y %1$d mas</string>
+    <string name="and">y</string>
+    <string name="Reacted_with">Reacciono con</string>
 
     <!-- Sorting and grouping-->
     <string name="menu_chatroom_sort">Ordenar</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 367803daa1..55da2ba2df 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -280,6 +280,9 @@
     <!-- Emoji message-->
     <string name="msg_no_recent_emoji">Aucun emoji récent</string>
     <string name="alert_title_default_skin_tone">Tonalité de peau par défaut</string>
+    <string name="And_more">et encore %1$d</string>
+    <string name="and">et</string>
+    <string name="Reacted_with">a réagi avec</string>
 
     <!-- Sorting and grouping-->
     <string name="menu_chatroom_sort">Trier</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index ed838e29ba..b5307a22f4 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -282,6 +282,9 @@
     <!-- Emoji message-->
     <string name="msg_no_recent_emoji">最近の絵文字はありません</string>
     <string name="alert_title_default_skin_tone">デフォルトスキントークン</string>
+    <string name="And_more">さらに %1$d</string>
+    <string name="and">と</string>
+    <string name="Reacted_with">がリアクションしています</string>
 
     <!-- Sorting and grouping-->
     <string name="menu_chatroom_sort">ソート</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index b16f788c7e..aa3b11f62b 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -278,6 +278,9 @@
     <!-- Emoji message-->
     <string name="msg_no_recent_emoji">Nenhum emoji recente</string>
     <string name="alert_title_default_skin_tone">Tom de pele padrão</string>
+    <string name="And_more">E mais %1$d</string>
+    <string name="and">e</string>
+    <string name="Reacted_with">Reagiu com</string>
 
     <!-- Sorting and grouping-->
     <string name="menu_chatroom_sort">Ordenar</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 914588dae8..b91ab64b48 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -275,6 +275,9 @@
     <!-- Emoji message-->
     <string name="msg_no_recent_emoji">Пусто</string>
     <string name="alert_title_default_skin_tone">Тон кожи по умолчанию</string>
+    <string name="And_more">И еще %1$d</string>
+    <string name="and">и</string>
+    <string name="Reacted_with">Реагирует с</string>
 
     <!-- Sorting and grouping-->
     <string name="menu_chatroom_sort">Сортировать</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index f219bc0287..06ed421a74 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -279,6 +279,9 @@
     <!-- Emoji message-->
     <string name="msg_no_recent_emoji">Son kullanılan emoji bulunmamaktadır</string>
     <string name="alert_title_default_skin_tone">Varsayılan tasarım tonu</string>
+    <string name="And_more">Ve %1$d kadar daha fazla</string>
+    <string name="and">ve</string>
+    <string name="Reacted_with">ile reaksiyona sokulur</string>
 
     <!-- Sorting and grouping-->
     <string name="menu_chatroom_sort">Sırala</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 48947363f4..6c3d7a0a51 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -276,6 +276,9 @@
     <!-- Emoji message-->
     <string name="msg_no_recent_emoji">Пусто</string>
     <string name="alert_title_default_skin_tone">Тон шкіри за замовчуванням</string>
+    <string name="And_more">І ще %1$d</string>
+    <string name="and">і</string>
+    <string name="Reacted_with">реагує з</string>
 
     <!-- Sorting and grouping-->
     <string name="menu_chatroom_sort">Сортувати</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5ca860868f..b99621855b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -292,6 +292,9 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <!-- Emoji message-->
     <string name="msg_no_recent_emoji">No recent emojis</string>
     <string name="alert_title_default_skin_tone">Default skin tone</string>
+    <string name="And_more">And %1$d more</string>
+    <string name="and">and</string>
+    <string name="Reacted_with">Reacted with</string>
 
     <!-- Sorting and grouping-->
     <string name="menu_chatroom_sort">Sort</string>
diff --git a/emoji/src/main/java/chat/rocket/android/emoji/EmojiReactionListener.kt b/emoji/src/main/java/chat/rocket/android/emoji/EmojiReactionListener.kt
index 6bbc7873fd..309a4d5c11 100644
--- a/emoji/src/main/java/chat/rocket/android/emoji/EmojiReactionListener.kt
+++ b/emoji/src/main/java/chat/rocket/android/emoji/EmojiReactionListener.kt
@@ -16,4 +16,12 @@ interface EmojiReactionListener {
      * @param emojiShortname The shortname of the emoji (:grin:, :smiley:, etc).
      */
     fun onReactionTouched(messageId: String, emojiShortname: String)
+
+    /**
+     * Callback when an added reaction is long-clicked.
+     *
+     * @param emojiShortname The shortname of the emoji (:grin:, :smiley:, etc).
+     * @param usernames The list of usernames of users who added the reaction.
+     */
+    fun onReactionLongClicked(emojiShortname: String, usernames: List<String>)
 }
\ No newline at end of file

From b95cad2f4fed37a3e497a8e77f60a2c7616702c7 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Mon, 22 Oct 2018 18:12:04 -0700
Subject: [PATCH 002/149] Adds analytics for reset password event.

---
 .../rocket/android/analytics/Analytics.kt     | 25 ++++++++++++-------
 .../android/analytics/AnalyticsManager.kt     |  6 +++++
 .../presentation/PasswordPresenter.kt         |  6 ++++-
 .../android/analytics/AnswersAnalytics.kt     |  7 ++++++
 .../analytics/GoogleAnalyticsForFirebase.kt   |  5 ++++
 5 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/analytics/Analytics.kt b/app/src/main/java/chat/rocket/android/analytics/Analytics.kt
index d03ab2b738..9e21db338e 100644
--- a/app/src/main/java/chat/rocket/android/analytics/Analytics.kt
+++ b/app/src/main/java/chat/rocket/android/analytics/Analytics.kt
@@ -12,7 +12,7 @@ interface Analytics {
      * @param event The [AuthenticationEvent] used to log in.
      * @param loginSucceeded True if successful logged in, false otherwise.
      */
-    fun logLogin(event: AuthenticationEvent, loginSucceeded: Boolean) {}
+    fun logLogin(event: AuthenticationEvent, loginSucceeded: Boolean)
 
     /**
      * Logs the sign up event.
@@ -20,14 +20,14 @@ interface Analytics {
      * @param event The [AuthenticationEvent] used to sign up.
      * @param signUpSucceeded True if successful signed up, false otherwise.
      */
-    fun logSignUp(event: AuthenticationEvent, signUpSucceeded: Boolean) {}
+    fun logSignUp(event: AuthenticationEvent, signUpSucceeded: Boolean)
 
     /**
      * Logs the screen view event.
      *
      * @param event The [ScreenViewEvent] to log.
      */
-    fun logScreenView(event: ScreenViewEvent) {}
+    fun logScreenView(event: ScreenViewEvent)
 
     /**
      * Logs the message sent event.
@@ -35,7 +35,7 @@ interface Analytics {
      * @param event The [SubscriptionTypeEvent] to log.
      * @param serverUrl The server URL to log.
      */
-    fun logMessageSent(event: SubscriptionTypeEvent, serverUrl: String) {}
+    fun logMessageSent(event: SubscriptionTypeEvent, serverUrl: String)
 
     /**
      * Logs the media upload event.
@@ -43,14 +43,14 @@ interface Analytics {
      * @param event The [SubscriptionTypeEvent] to log.
      * @param mimeType The mime type of the media uploaded to log.
      */
-    fun logMediaUploaded(event: SubscriptionTypeEvent, mimeType: String) {}
+    fun logMediaUploaded(event: SubscriptionTypeEvent, mimeType: String)
 
     /**
      * Logs the reaction event.
      *
      * @param event The [SubscriptionTypeEvent] to log.
      */
-    fun logReaction(event: SubscriptionTypeEvent) {}
+    fun logReaction(event: SubscriptionTypeEvent)
 
     /**
      * Logs the server switch event.
@@ -58,10 +58,17 @@ interface Analytics {
      * @param serverUrl The server URL to log.
      * @param serverCount The number of server(s) the use own.
      */
-    fun logServerSwitch(serverUrl: String, serverCount: Int) {}
+    fun logServerSwitch(serverUrl: String, serverCount: Int)
 
     /**
-     * Logs the admin opening.
+     * Logs the admin opening event.
      */
-    fun logOpenAdmin() {}
+    fun logOpenAdmin()
+
+    /**
+     * Logs the reset password event.
+     *
+     * @param resetPasswordSucceeded True if successful reset password, false otherwise.
+     */
+    fun logResetPassword(resetPasswordSucceeded: Boolean)
 }
diff --git a/app/src/main/java/chat/rocket/android/analytics/AnalyticsManager.kt b/app/src/main/java/chat/rocket/android/analytics/AnalyticsManager.kt
index 92c21c449f..084561bbfe 100644
--- a/app/src/main/java/chat/rocket/android/analytics/AnalyticsManager.kt
+++ b/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) }
+        }
+    }
 }
diff --git a/app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordPresenter.kt b/app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordPresenter.kt
index 81a09e51e1..edc501f060 100644
--- a/app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordPresenter.kt
@@ -1,5 +1,6 @@
 package chat.rocket.android.settings.password.presentation
 
+import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
@@ -14,6 +15,7 @@ import javax.inject.Inject
 class PasswordPresenter @Inject constructor(
     private val view: PasswordView,
     private val strategy: CancelStrategy,
+    private val analyticsManager: AnalyticsManager,
     serverInteractor: GetCurrentServerInteractor,
     factory: RocketChatClientFactory
 ) {
@@ -30,10 +32,12 @@ class PasswordPresenter @Inject constructor(
                     client.updateProfile(me.id, null, null, password, null)
                 }
 
+                analyticsManager.logResetPassword(true)
                 view.showPasswordSuccessfullyUpdatedMessage()
-                view.hideLoading()
             } catch (exception: RocketChatException) {
+                analyticsManager.logResetPassword(false)
                 view.showPasswordFailsUpdateMessage(exception.message)
+            } finally {
                 view.hideLoading()
             }
         }
diff --git a/app/src/play/java/chat/rocket/android/analytics/AnswersAnalytics.kt b/app/src/play/java/chat/rocket/android/analytics/AnswersAnalytics.kt
index cf23161ce6..8a9a30277e 100644
--- a/app/src/play/java/chat/rocket/android/analytics/AnswersAnalytics.kt
+++ b/app/src/play/java/chat/rocket/android/analytics/AnswersAnalytics.kt
@@ -67,4 +67,11 @@ class AnswersAnalytics : Analytics {
             )
 
     override fun logOpenAdmin() = Answers.getInstance().logCustom(CustomEvent("open_admin"))
+
+    override fun logResetPassword(resetPasswordSucceeded: Boolean) =
+        Answers.getInstance()
+            .logCustom(
+                CustomEvent("reset_password")
+                    .putCustomAttribute("resetPasswordSucceeded", resetPasswordSucceeded.toString())
+            )
 }
diff --git a/app/src/play/java/chat/rocket/android/analytics/GoogleAnalyticsForFirebase.kt b/app/src/play/java/chat/rocket/android/analytics/GoogleAnalyticsForFirebase.kt
index f8b6556291..71a5170391 100644
--- a/app/src/play/java/chat/rocket/android/analytics/GoogleAnalyticsForFirebase.kt
+++ b/app/src/play/java/chat/rocket/android/analytics/GoogleAnalyticsForFirebase.kt
@@ -60,4 +60,9 @@ class GoogleAnalyticsForFirebase @Inject constructor(val context: Context) :
     }
 
     override fun logOpenAdmin() = firebaseAnalytics.logEvent("open_admin", null)
+
+    override fun logResetPassword(resetPasswordSucceeded: Boolean) =
+        firebaseAnalytics.logEvent("reset_password", Bundle(1).apply {
+            putBoolean("resetPasswordSucceeded", resetPasswordSucceeded)
+        })
 }

From c03782fc23d93ee646f38c106e64565d283e3a90 Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Mon, 5 Nov 2018 22:20:20 +0530
Subject: [PATCH 003/149] feat: rate app on playstore

---
 .../android/settings/ui/SettingsFragment.kt    | 18 ++++++++++++++++++
 app/src/main/res/values/strings.xml            |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
index ba98112af4..5c2b2fce00 100644
--- a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
@@ -1,6 +1,8 @@
 package chat.rocket.android.settings.ui
 
+import android.content.ActivityNotFoundException
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -75,6 +77,22 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
                     AboutFragment.newInstance()
                 }
             }
+            resources.getString(R.string.title_rate_us) ->
+                startAppPlayStore()
+        }
+    }
+
+    fun getMarketAppLink(): String {
+        return "market://details?id=chat.rocket.android"
+    }
+    fun getMarketWebLink(): String {
+        return "https://play.google.com/store/apps/details?id=chat.rocket.android"
+    }
+    private fun startAppPlayStore() {
+        try {
+            startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getMarketAppLink())))
+        } catch (error: ActivityNotFoundException) {
+            startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getMarketWebLink())))
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c4a98a25eb..e7b25a35da 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -27,6 +27,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="title_settings">Settings</string>
     <string name="title_preferences">Preferences</string>
     <string name="title_change_password">Change Password</string>
+    <string name="title_rate_us">Rate Us</string>
     <string name="title_admin_panel">Admin panel</string>
     <string name="title_password">Change Password</string>
     <string name="title_update_profile">Update profile</string>
@@ -70,6 +71,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
         <item name="item_preferences">Preferences</item>
         <item name="item_password">Change Password</item>
         <item name="item_password">About</item>
+        <item name="item_rate_us">Rate Us</item>
     </string-array>
 
     <!-- Regular information messages -->

From fdc55abda310fef1fbc384598e99bf2732e0d6cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Rutkowski?= <lukus178@gmail.com>
Date: Mon, 5 Nov 2018 18:01:53 +0100
Subject: [PATCH 004/149] Displays users who reacted in dialog

---
 .../presentation/ChatRoomPresenter.kt         |  4 ---
 .../chatroom/presentation/ChatRoomView.kt     |  2 --
 .../android/chatroom/ui/ChatRoomFragment.kt   | 29 ++++---------------
 app/src/main/res/values-de/strings.xml        |  3 --
 app/src/main/res/values-es/strings.xml        |  3 --
 app/src/main/res/values-fr/strings.xml        |  3 --
 app/src/main/res/values-ja/strings.xml        |  3 --
 app/src/main/res/values-pt-rBR/strings.xml    |  3 --
 app/src/main/res/values-ru-rRU/strings.xml    |  3 --
 app/src/main/res/values-tr/strings.xml        |  3 --
 app/src/main/res/values-uk/strings.xml        |  3 --
 app/src/main/res/values/strings.xml           |  4 +--
 12 files changed, 6 insertions(+), 57 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
index 8108c52a9b..be1bea6af1 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
@@ -1084,10 +1084,6 @@ class ChatRoomPresenter @Inject constructor(
         view.showReactionsPopup(messageId)
     }
 
-    fun showReactionsSummary(emojiShortname: String, usernames: List<String>) {
-        view.showReactionsSummary(emojiShortname, usernames, currentLoggedUsername)
-    }
-
     fun loadCommands() {
         launchUI(strategy) {
             try {
diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomView.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomView.kt
index b894687fe3..7b226e62cb 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomView.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomView.kt
@@ -140,8 +140,6 @@ interface ChatRoomView : LoadingView, MessageView {
 
     fun showReactionsPopup(messageId: String)
 
-    fun showReactionsSummary(emojiShortname: String, usernames: List<String>, currentLoggedUsername: String?)
-
     /**
      * Show list of commands.
      *
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index 92c12651d8..2ecd604bd7 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -666,30 +666,11 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     }
 
     override fun onReactionLongClicked(emojiShortname: String, usernames: List<String>) {
-        presenter.showReactionsSummary(emojiShortname, usernames)
-    }
-
-    override fun showReactionsSummary(emojiShortname: String, usernames: List<String>, currentLoggedUsername: String?) {
-        var usernamesString = usernames.asSequence()
-            .take(15)
-            .joinToString { username ->
-                if (username == currentLoggedUsername) {
-                    getString(R.string.msg_you).toLowerCase()
-                } else {
-                    "@$username"
-                }
-            }
-        if (usernames.size > 15) {
-            usernamesString += " " + getString(R.string.And_more, usernames.size - 15).toLowerCase()
-        } else {
-            usernamesString = usernamesString.replace(""",([^,]+)$""".toRegex()) {
-                " ${getString(R.string.and)}${it.groupValues[1]}"
-            }
-        }
-        if (usernamesString[0] != '@') {
-            usernamesString = usernamesString.capitalize()
-        }
-        showToast("$usernamesString ${getString(R.string.Reacted_with).toLowerCase()} $emojiShortname", Toast.LENGTH_LONG)
+        AlertDialog.Builder(requireContext())
+            .setTitle(EmojiParser.parse(requireContext(), getString(R.string.alert_title_reactions_by, emojiShortname)))
+            .setItems(usernames.toTypedArray(), null)
+            .setPositiveButton(R.string.msg_ok, null)
+            .show()
     }
 
     override fun showReactionsPopup(messageId: String) {
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 729d2bae73..5ff7c7f495 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -282,9 +282,6 @@
     <!-- Emoji message-->
     <string name="msg_no_recent_emoji">Keine letzten Emojis</string>
     <string name="alert_title_default_skin_tone">Standart Hautton</string>
-    <string name="And_more">Und %1$d mehr</string>
-    <string name="and">und</string>
-    <string name="Reacted_with">Reagierte mit</string>
 
     <!-- Sorting and grouping-->
     <string name="menu_chatroom_sort">Sortiere</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 3503f098a2..3269ccd08e 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -278,9 +278,6 @@
     <!-- Emoji message-->
     <string name="msg_no_recent_emoji">Sin emojis recientes</string>
     <string name="alert_title_default_skin_tone">Tono de piel predeterminado</string>
-    <string name="And_more">Y %1$d mas</string>
-    <string name="and">y</string>
-    <string name="Reacted_with">Reacciono con</string>
 
     <!-- Sorting and grouping-->
     <string name="menu_chatroom_sort">Ordenar</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 3758e725c2..26a74b7104 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -286,9 +286,6 @@
     <!-- Emoji message-->
     <string name="msg_no_recent_emoji">Aucun emoji récent</string>
     <string name="alert_title_default_skin_tone">Tonalité de peau par défaut</string>
-    <string name="And_more">et encore %1$d</string>
-    <string name="and">et</string>
-    <string name="Reacted_with">a réagi avec</string>
 
     <!-- Sorting and grouping-->
     <string name="menu_chatroom_sort">Trier</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 82121ba3d7..0b4f6eed2e 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -288,9 +288,6 @@
     <!-- Emoji message-->
     <string name="msg_no_recent_emoji">最近の絵文字はありません</string>
     <string name="alert_title_default_skin_tone">デフォルトスキントークン</string>
-    <string name="And_more">さらに %1$d</string>
-    <string name="and">と</string>
-    <string name="Reacted_with">がリアクションしています</string>
 
     <!-- Sorting and grouping-->
     <string name="menu_chatroom_sort">ソート</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 0a0c1bce5f..8faee241e6 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -283,9 +283,6 @@
     <!-- Emoji message-->
     <string name="msg_no_recent_emoji">Nenhum emoji recente</string>
     <string name="alert_title_default_skin_tone">Tom de pele padrão</string>
-    <string name="And_more">E mais %1$d</string>
-    <string name="and">e</string>
-    <string name="Reacted_with">Reagiu com</string>
 
     <!-- Sorting and grouping-->
     <string name="menu_chatroom_sort">Ordenar</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index eae723c8f1..fb7541bc5d 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -279,9 +279,6 @@
     <!-- Emoji message-->
     <string name="msg_no_recent_emoji">Пусто</string>
     <string name="alert_title_default_skin_tone">Тон кожи по умолчанию</string>
-    <string name="And_more">И еще %1$d</string>
-    <string name="and">и</string>
-    <string name="Reacted_with">Реагирует с</string>
 
     <!-- Sorting and grouping-->
     <string name="menu_chatroom_sort">Сортировать</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index a7257cc9e9..cee409697a 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -285,9 +285,6 @@
     <!-- Emoji message-->
     <string name="msg_no_recent_emoji">Son kullanılan emoji bulunmamaktadır</string>
     <string name="alert_title_default_skin_tone">Varsayılan tasarım tonu</string>
-    <string name="And_more">Ve %1$d kadar daha fazla</string>
-    <string name="and">ve</string>
-    <string name="Reacted_with">ile reaksiyona sokulur</string>
 
     <!-- Sorting and grouping-->
     <string name="menu_chatroom_sort">Sırala</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index f584c76695..b3fd14faa2 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -282,9 +282,6 @@
     <!-- Emoji message-->
     <string name="msg_no_recent_emoji">Пусто</string>
     <string name="alert_title_default_skin_tone">Тон шкіри за замовчуванням</string>
-    <string name="And_more">І ще %1$d</string>
-    <string name="and">і</string>
-    <string name="Reacted_with">реагує з</string>
 
     <!-- Sorting and grouping-->
     <string name="menu_chatroom_sort">Сортувати</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8c037d3160..9948e6bd6b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -295,9 +295,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <!-- Emoji message-->
     <string name="msg_no_recent_emoji">No recent emojis</string>
     <string name="alert_title_default_skin_tone">Default skin tone</string>
-    <string name="And_more">And %1$d more</string>
-    <string name="and">and</string>
-    <string name="Reacted_with">Reacted with</string>
+    <string name="alert_title_reactions_by">%1$s reactions by</string>
 
     <!-- Sorting and grouping-->
     <string name="menu_chatroom_sort">Sort</string>

From 39d016dcb813d81218ebf810857ef4617ebcef88 Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Mon, 5 Nov 2018 22:20:20 +0530
Subject: [PATCH 005/149] feat: add sharing feature

---
 .../rocket/android/settings/ui/SettingsFragment.kt   | 12 ++++++++++++
 app/src/main/res/values/strings.xml                  |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
index ba98112af4..0cf268e9d8 100644
--- a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
@@ -1,6 +1,8 @@
 package chat.rocket.android.settings.ui
 
+import android.content.ActivityNotFoundException
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -75,6 +77,16 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
                     AboutFragment.newInstance()
                 }
             }
+            resources.getString(R.string.title_share_the_app) ->{
+                val shareIntent = Intent(Intent.ACTION_SEND)
+                shareIntent.type = "text/plain"
+                val shareBody = "Check This Out"
+                val shareSub = "https://play.google.com/store/apps/details?id=chat.rocket.android"
+                shareIntent.putExtra(Intent.EXTRA_SUBJECT, shareBody)
+                shareIntent.putExtra(Intent.EXTRA_TEXT, shareSub)
+                startActivity(Intent.createChooser(shareIntent, "Share Using"))
+            }
+
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c4a98a25eb..ee59369545 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,6 +31,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="title_password">Change Password</string>
     <string name="title_update_profile">Update profile</string>
     <string name="title_about">About</string>
+    <string name="title_share_the_app">Share App</string>
     <string name="title_create_channel">Create Channel</string>
     <string name="title_confirmation">Are You Sure you want to logout?</string>
 
@@ -70,6 +71,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
         <item name="item_preferences">Preferences</item>
         <item name="item_password">Change Password</item>
         <item name="item_password">About</item>
+        <item name="item_share_app">Share App</item>
     </string-array>
 
     <!-- Regular information messages -->

From dc75f75eb25c6694f70cdb9b3b1fc2873c205728 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Tue, 6 Nov 2018 15:30:44 -0800
Subject: [PATCH 006/149] Adds delete own account.

---
 .../rocket/android/main/ui/MainActivity.kt    | 10 ++---
 .../profile/presentation/ProfilePresenter.kt  | 21 ++++++++++
 .../android/profile/ui/ProfileFragment.kt     | 41 ++++++++++++++++++-
 app/src/main/res/menu/action_mode_profile.xml |  9 ++++
 app/src/main/res/menu/profile.xml             |  9 ++--
 app/src/main/res/values-de/strings.xml        |  4 +-
 app/src/main/res/values-es/strings.xml        |  5 ++-
 app/src/main/res/values-fr/strings.xml        |  6 +--
 app/src/main/res/values-hi-rIN/strings.xml    |  5 +--
 app/src/main/res/values-ja/strings.xml        |  5 +--
 app/src/main/res/values-pt-rBR/strings.xml    | 15 ++++---
 app/src/main/res/values-ru-rRU/strings.xml    |  5 +--
 app/src/main/res/values-tr/strings.xml        |  5 +--
 app/src/main/res/values-uk/strings.xml        |  5 +--
 app/src/main/res/values/strings.xml           |  4 +-
 .../rocket/android/util/extension/Text.kt     | 14 +++++++
 16 files changed, 120 insertions(+), 43 deletions(-)
 create mode 100644 app/src/main/res/menu/action_mode_profile.xml
 create mode 100644 util/src/main/java/chat/rocket/android/util/extension/Text.kt

diff --git a/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt b/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
index 602a558e7e..5013b92d91 100644
--- a/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
+++ b/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
@@ -234,11 +234,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) {
diff --git a/app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt b/app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt
index 4adc8db97a..7487097d63 100644
--- a/app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt
+++ b/app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt
@@ -9,15 +9,19 @@ import chat.rocket.android.helper.UserHelper
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.compressImageAndGetByteArray
+import chat.rocket.android.util.extension.gethash
 import chat.rocket.android.util.extension.launchUI
+import chat.rocket.android.util.extension.toHex
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.util.ifNull
 import chat.rocket.core.RocketChatClient
+import chat.rocket.core.internal.rest.deleteOwnAccount
 import chat.rocket.core.internal.rest.resetAvatar
 import chat.rocket.core.internal.rest.setAvatar
 import chat.rocket.core.internal.rest.updateProfile
+import java.lang.Exception
 import java.util.*
 import javax.inject.Inject
 
@@ -147,4 +151,21 @@ class ProfilePresenter @Inject constructor(
             }
         }
     }
+
+    fun deleteAccount(password: String) {
+        launchUI(strategy) {
+            view.showLoading()
+            try {
+                retryIO { client.deleteOwnAccount(password.gethash().toHex()) }
+            } catch (exception: Exception) {
+                exception.message?.let {
+                    view.showMessage(it)
+                }.ifNull {
+                    view.showGenericErrorMessage()
+                }
+            } finally {
+                view.hideLoading()
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt b/app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt
index 4d6585e2be..deef89b05b 100644
--- a/app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt
+++ b/app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt
@@ -2,6 +2,7 @@ package chat.rocket.android.profile.ui
 
 import DrawableHelper
 import android.app.Activity
+import android.app.AlertDialog
 import android.content.Intent
 import android.graphics.Bitmap
 import android.os.Build
@@ -11,6 +12,8 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import android.view.MenuInflater
+import android.widget.EditText
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ActionMode
 import androidx.core.net.toUri
@@ -61,6 +64,7 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
     override fun onCreate(savedInstanceState: Bundle?) {
         AndroidSupportInjection.inject(this)
         super.onCreate(savedInstanceState)
+        setHasOptionsMenu(true)
     }
 
     override fun onCreateView(
@@ -98,6 +102,25 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
         }
     }
 
+    override fun onPrepareOptionsMenu(menu: Menu) {
+        if (actionMode != null) {
+            menu.clear()
+        }
+        super.onPrepareOptionsMenu(menu)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        super.onCreateOptionsMenu(menu, inflater)
+        inflater.inflate(R.menu.profile, menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.action_delete_account -> showDeleteAccountDialog()
+        }
+        return true
+    }
+
     override fun showProfile(avatarUrl: String, name: String, username: String, email: String?) {
         ui {
             image_avatar.setImageURI(avatarUrl)
@@ -148,7 +171,7 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
     override fun showGenericErrorMessage() = showMessage(getString(R.string.msg_generic_error))
 
     override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
-        mode.menuInflater.inflate(R.menu.profile, menu)
+        mode.menuInflater.inflate(R.menu.action_mode_profile, menu)
         mode.title = getString(R.string.title_update_profile)
         return true
     }
@@ -239,6 +262,7 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
                     text_username.toString() != currentUsername ||
                     text_email.toString() != currentEmail)
         }.subscribe { isValid ->
+            activity?.invalidateOptionsMenu()
             if (isValid) {
                 startActionMode()
             } else {
@@ -264,4 +288,19 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
             text_email.isEnabled = value
         }
     }
+
+    fun showDeleteAccountDialog() {
+        val passwordEditText = EditText(context)
+        passwordEditText.hint = getString(R.string.msg_password)
+
+        val builder = AlertDialog.Builder(context)
+        builder.setTitle(R.string.title_are_you_sure)
+            .setView(passwordEditText)
+            .setPositiveButton(R.string.action_delete_account) { _, _ ->
+                presenter.deleteAccount(passwordEditText.text.toString())
+            }
+            .setNegativeButton(android.R.string.no) { dialog, _ -> dialog.cancel() }
+            .create()
+            .show()
+    }
 }
diff --git a/app/src/main/res/menu/action_mode_profile.xml b/app/src/main/res/menu/action_mode_profile.xml
new file mode 100644
index 0000000000..fc6815b62e
--- /dev/null
+++ b/app/src/main/res/menu/action_mode_profile.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/action_update_profile"
+        android:icon="@drawable/ic_check_white_24dp"
+        android:title="@string/action_update" />
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/profile.xml b/app/src/main/res/menu/profile.xml
index fc6815b62e..07b62474d7 100644
--- a/app/src/main/res/menu/profile.xml
+++ b/app/src/main/res/menu/profile.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/action_update_profile"
-        android:icon="@drawable/ic_check_white_24dp"
-        android:title="@string/action_update" />
+        android:id="@+id/action_delete_account"
+        android:title="@string/action_delete_account"
+        app:showAsAction="never" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5ff7c7f495..a4cad31a16 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -20,7 +20,7 @@
     <string name="title_update_profile">Update Profil</string>
     <string name="title_about">Über</string>
     <string name="title_create_channel">Erstelle Raum</string>
-    <string name="title_confirmation">Are You Sure you want to logout?</string><!-- TODO Add translation -->
+    <string name="title_are_you_sure">Are you sure?</string><!-- TODO Add translation -->
 
     <!-- Actions -->
     <string name="action_connect">Verbinde</string>
@@ -33,7 +33,6 @@
     <string name="action_create_channel">Erstelle Raum</string>
     <string name="action_create">Erstelle</string>
     <string name="action_logout">Abmelden</string>
-    <string name="action_stay">Stay</string> <!-- TODO Add translation -->
     <string name="action_files">Dateien</string>
     <string name="action_confirm_password">Bestätige Passwort Änderung</string>
     <string name="action_join_chat">Trete Chat bei</string>
@@ -52,6 +51,7 @@
     <string name="action_create_server">Create a new server</string> <!-- TODO Add translation -->
     <string name="action_register">Register</string> <!-- TODO Add translation -->
     <string name="action_confirm">Confirm</string> <!-- TODO Add translation -->
+    <string name="action_delete_account">Delete account</string> <!-- TODO Add translation -->
 
     <!-- Settings List -->
     <string-array name="settings_actions">
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 3269ccd08e..d9f870092b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -19,7 +19,8 @@
     <string name="title_update_profile">Actualización del perfil</string>
     <string name="title_about">Acerca de</string>
     <string name="title_create_channel">Crear canal</string>
-    <string name="title_confirmation">Are You Sure you want to logout?</string> <!-- TODO Add translation -->
+    <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
+
     <!-- Actions -->
     <string name="action_connect">Conectar</string>
     <string name="action_use_this_username">Usa este nombre de usuario</string>
@@ -31,7 +32,6 @@
     <string name="action_create_channel">Crear canal</string>
     <string name="action_create">Create</string>
     <string name="action_logout">Cerrar sesión</string>
-    <string name="action_stay">Stay</string> <!-- TODO Add translation -->
     <string name="action_files">Archivos</string>
     <string name="action_confirm_password">Confirmar cambio de contraseña</string>
     <string name="action_join_chat">Unirse al chat</string>
@@ -50,6 +50,7 @@
     <string name="action_create_server">Create a new server</string> <!-- TODO Add translation -->
     <string name="action_register">Register</string> <!-- TODO Add translation -->
     <string name="action_confirm">Confirm</string> <!-- TODO Add translation -->
+    <string name="action_delete_account">Delete account</string> <!-- TODO Add translation -->
 
     <!-- Settings List -->
     <string-array name="settings_actions">
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 26a74b7104..29c9a3e487 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -20,9 +20,7 @@
     <string name="title_update_profile">Mettre à jour le profil</string>
     <string name="title_about">À propos</string>
     <string name="title_create_channel">Créer salon</string>
-    <string name="title_confirmation">Are You Sure you want to logout?</string> <!-- TODO Add translation -->
-
-
+    <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
 
     <!-- Actions -->
     <string name="action_connect">Se connecter</string>
@@ -35,7 +33,6 @@
     <string name="action_create_channel">Créer salon</string>
     <string name="action_create">Créer</string>
     <string name="action_logout">Se déconnecter</string>
-    <string name="action_stay">Stay</string> <!-- TODO Add translation -->
     <string name="action_files">Fichiers</string>
     <string name="action_confirm_password">Confirmer le mot de passe</string>
     <string name="action_join_chat">Rejoignez le chat</string>
@@ -54,6 +51,7 @@
     <string name="action_create_server">Create a new server</string> <!-- TODO Add translation -->
     <string name="action_register">Register</string> <!-- TODO Add translation -->
     <string name="action_confirm">Confirm</string> <!-- TODO Add translation -->
+    <string name="action_delete_account">Delete account</string> <!-- TODO Add translation -->
 
     <!-- Settings List -->
     <string-array name="settings_actions">
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index a2145c7340..1317dc4441 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -20,8 +20,7 @@
     <string name="title_update_profile">प्रोफ़ाइल अपडेट करें</string>
     <string name="title_about">परिचय</string>
     <string name="title_create_channel">चैनल बनाएं</string>
-    <string name="title_confirmation">Are You Sure you want to logout?</string> <!-- TODO Add translation -->
-
+    <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
 
     <!-- Actions -->
     <string name="action_connect">जुडिये</string>
@@ -34,7 +33,6 @@
     <string name="action_create_channel">चैनल बनाएं</string>
     <string name="action_create">बनाएं</string>
     <string name="action_logout">लोग आउट करें</string>
-    <string name="action_stay">Stay</string> <!-- TODO Add translation -->
     <string name="action_files">फ़ाइलें</string>
     <string name="action_confirm_password">पासवर्ड परिवर्तन की पुष्टि करें</string>
     <string name="action_join_chat">चैट में शामिल हों</string>
@@ -53,6 +51,7 @@
     <string name="action_create_server">नया सर्वर बनाएं</string>
     <string name="action_register">रजिस्टर</string>
     <string name="action_confirm">पुष्टि करें</string>
+    <string name="action_delete_account">Delete account</string> <!-- TODO Add translation -->
 
     <!-- Settings List -->
     <string-array name="settings_actions">
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 0b4f6eed2e..6d3ee7137d 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -22,8 +22,7 @@
     <string name="title_update_profile">プロフィールの更新</string>
     <string name="title_about">About</string>
     <string name="title_create_channel">新しいチャネルを作成します</string>
-    <string name="title_confirmation">Are You Sure you want to logout?</string> <!-- TODO Add translation -->
-
+    <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
 
     <!-- Actions -->
     <string name="action_connect">接続</string>
@@ -36,7 +35,6 @@
     <string name="action_create_channel">チャンネル作成</string>
     <string name="action_create">作ります</string>
     <string name="action_logout">ログアウト</string>
-    <string name="action_stay">Stay</string> <!-- TODO Add translation -->
     <string name="action_files">ファイル</string>
     <string name="action_confirm_password">変更したパスワードの確認</string>
     <string name="action_join_chat">チャットに参加</string>
@@ -55,6 +53,7 @@
     <string name="action_create_server">Create a new server</string> <!-- TODO Add translation -->
     <string name="action_register">Register</string> <!-- TODO Add translation -->
     <string name="action_confirm">Confirm</string> <!-- TODO Add translation -->
+    <string name="action_delete_account">Delete account</string> <!-- TODO Add translation -->
 
     <!-- Settings List -->
     <string-array name="settings_actions">
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 8faee241e6..11869bf800 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -20,8 +20,7 @@
     <string name="title_update_profile">Editar perfil</string>
     <string name="title_about">Sobre</string>
     <string name="title_create_channel">Criar chat</string>
-    <string name="title_confirmation">Are You Sure you want to logout?</string> <!-- TODO Add translation -->
-
+    <string name="title_are_you_sure">Você tem certeza?</string>
 
     <!-- Actions -->
     <string name="action_connect">Conectar</string>
@@ -34,7 +33,6 @@
     <string name="action_create_channel">Criar chat</string>
     <string name="action_create">Criar</string>
     <string name="action_logout">Sair</string>
-    <string name="action_stay">Stay</string> <!-- TODO Add translation -->
     <string name="action_files">Arquivos</string>
     <string name="action_confirm_password">Confirme a nova senha</string>
     <string name="action_join_chat">Entrar no Chat</string>
@@ -48,11 +46,12 @@
     <string name="action_select_photo_from_gallery">Escolher foto da galeria</string>
     <string name="action_take_photo">Tirar foto</string>
     <string name="action_reset_avatar">Resetar avatar</string>
-    <string name="action_connect_server">Connect with a server</string> <!-- TODO Add translation -->
-    <string name="action_join_community">Join in the community</string> <!-- TODO Add translation -->
-    <string name="action_create_server">Create a new server</string> <!-- TODO Add translation -->
-    <string name="action_register">Register</string> <!-- TODO Add translation -->
-    <string name="action_confirm">Confirm</string> <!-- TODO Add translation -->
+    <string name="action_connect_server">Conectar com um servidor</string>
+    <string name="action_join_community">Junte-se à comunidade</string>
+    <string name="action_create_server">Criar um novo servidor</string>
+    <string name="action_register">Registrar</string>
+    <string name="action_confirm">Confirmar</string>
+    <string name="action_delete_account">Deletar conta</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index fb7541bc5d..bd698704bc 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -20,8 +20,7 @@
     <string name="title_update_profile">Обновить профиль</string>
     <string name="title_about">О программе</string>
     <string name="title_create_channel">Создать новый канал</string>
-    <string name="title_confirmation">Вы действительно хотите выйти?</string>
-
+    <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
 
     <!-- Actions -->
     <string name="action_connect">Подключиться</string>
@@ -34,7 +33,6 @@
     <string name="action_create_channel">Создать канал</string>
     <string name="action_create">Создать</string>
     <string name="action_logout">Выйти</string>
-    <string name="action_stay">Остаться</string>
     <string name="action_files">Файлы</string>
     <string name="action_confirm_password">Подтверждение изменения пароля</string>
     <string name="action_join_chat">Присоединиться к чату</string>
@@ -53,6 +51,7 @@
     <string name="action_create_server">Создать новый сервер</string>
     <string name="action_register">Зарегистрировать</string>
     <string name="action_confirm">Подтвердить</string>
+    <string name="action_delete_account">Delete account</string> <!-- TODO Add translation -->
 
     <!-- Settings List -->
     <string-array name="settings_actions">
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index cee409697a..c4c5019857 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -20,8 +20,7 @@
     <string name="title_update_profile">Profilinizi Düzenleyin</string>
     <string name="title_about">Hakkında</string>
     <string name="title_create_channel">Yeni Kanal Oluştur</string>
-    <string name="title_confirmation">Are You Sure you want to logout?</string> <!-- TODO Add translation -->
-
+    <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
 
     <!-- Actions -->
     <string name="action_connect">Bağlan</string>
@@ -34,7 +33,6 @@
     <string name="action_create_channel">Yeni Kanal Oluştur</string>
     <string name="action_create">Oluştur</string>
     <string name="action_logout">Çıkış Yap</string>
-    <string name="action_stay">Stay</string> <!-- TODO Add translation -->
     <string name="action_files">Dosyalar</string>
     <string name="action_confirm_password">Şifre Değişikliğini Onaylayın</string>
     <string name="action_join_chat">Sohbete Bağlan</string>
@@ -53,6 +51,7 @@
     <string name="action_create_server">Create a new server</string> <!-- TODO Add translation -->
     <string name="action_register">Register</string> <!-- TODO Add translation -->
     <string name="action_confirm">Confirm</string> <!-- TODO Add translation -->
+    <string name="action_delete_account">Delete account</string> <!-- TODO Add translation -->
 
     <!-- Settings List -->
     <string-array name="settings_actions">
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index b3fd14faa2..9b1d4fabd4 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -20,8 +20,7 @@
     <string name="title_update_profile">Оновити профіль</string>
     <string name="title_about">"Про програму"</string>
     <string name="title_create_channel">Створити новий канал</string>
-    <string name="title_confirmation">Are You Sure you want to logout?</string> <!-- TODO Add translation -->
-
+    <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
 
     <!-- Actions -->
     <string name="action_connect">Підключитися</string>
@@ -34,7 +33,6 @@
     <string name="action_create_channel">Створити канал</string>
     <string name="action_create">Створити</string>
     <string name="action_logout">Вийти</string>
-    <string name="action_stay">Stay</string> <!-- TODO Add translation -->
     <string name="action_files">Файли</string>
     <string name="action_confirm_password">Підтвердження зміни пароля</string>
     <string name="action_join_chat">Приєднатися до чату</string>
@@ -53,6 +51,7 @@
     <string name="action_create_server">Create a new server</string> <!-- TODO Add translation -->
     <string name="action_register">Register</string> <!-- TODO Add translation -->
     <string name="action_confirm">Confirm</string> <!-- TODO Add translation -->
+    <string name="action_delete_account">Delete account</string> <!-- TODO Add translation -->
 
     <!-- Settings List -->
     <string-array name="settings_actions">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c4a98a25eb..45e98d3a93 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,7 +32,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="title_update_profile">Update profile</string>
     <string name="title_about">About</string>
     <string name="title_create_channel">Create Channel</string>
-    <string name="title_confirmation">Are You Sure you want to logout?</string>
+    <string name="title_are_you_sure">Are you sure?</string>
 
     <!-- Actions -->
     <string name="action_connect">Connect</string>
@@ -45,7 +45,6 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="action_create_channel">Create channel</string>
     <string name="action_create">Create</string>
     <string name="action_logout">Logout</string>
-    <string name="action_stay">Stay</string>
     <string name="action_files">Files</string>
     <string name="action_confirm_password">Confirm Password Change</string>
     <string name="action_join_chat">Join Chat</string>
@@ -64,6 +63,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="action_create_server">Create a new server</string>
     <string name="action_register">Register</string>
     <string name="action_confirm">Confirm</string>
+    <string name="action_delete_account">Delete account</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
diff --git a/util/src/main/java/chat/rocket/android/util/extension/Text.kt b/util/src/main/java/chat/rocket/android/util/extension/Text.kt
new file mode 100644
index 0000000000..8435a4472e
--- /dev/null
+++ b/util/src/main/java/chat/rocket/android/util/extension/Text.kt
@@ -0,0 +1,14 @@
+package chat.rocket.android.util.extension
+
+import java.math.BigInteger
+import java.security.MessageDigest
+import java.security.NoSuchAlgorithmException
+
+@Throws(NoSuchAlgorithmException::class)
+fun String.gethash(): ByteArray {
+    val digest = MessageDigest.getInstance("SHA-256")
+    digest.reset()
+    return digest.digest(this.toByteArray())
+}
+
+fun ByteArray.toHex(): String = String.format("%0" + this.size * 2 + "X", BigInteger(1, this))

From f634f66112b6d50ce200080251ad3b9286e88cd0 Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Wed, 7 Nov 2018 22:44:06 +0530
Subject: [PATCH 007/149] add sharing feature

---
 .../chat/rocket/android/settings/ui/SettingsFragment.kt     | 6 +++---
 app/src/main/res/values/strings.xml                         | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
index 0cf268e9d8..4c78ed45ce 100644
--- a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
@@ -80,11 +80,11 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
             resources.getString(R.string.title_share_the_app) ->{
                 val shareIntent = Intent(Intent.ACTION_SEND)
                 shareIntent.type = "text/plain"
-                val shareBody = "Check This Out"
-                val shareSub = "https://play.google.com/store/apps/details?id=chat.rocket.android"
+                val shareBody = getString(R.string.check_this_out)
+                val shareSub = getString(R.string.play_store_link)
                 shareIntent.putExtra(Intent.EXTRA_SUBJECT, shareBody)
                 shareIntent.putExtra(Intent.EXTRA_TEXT, shareSub)
-                startActivity(Intent.createChooser(shareIntent, "Share Using"))
+                startActivity(Intent.createChooser(shareIntent, getString(R.string.share_using)))
             }
 
         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ee59369545..c6bc25c02a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -77,6 +77,8 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <!-- Regular information messages -->
     <string name="msg_generic_error">Sorry, an error has occurred, please try again</string>
     <string name="msg_no_data_to_display">No data to display</string>
+    <string name="check_this_out">Check this out</string>
+    <string name="share_using">Share using</string>
     <string name="msg_profile_update_successfully">Profile update successfully</string>
     <string name="msg_username">username</string>
     <string name="msg_username_or_email">Username or email</string>
@@ -315,6 +317,9 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="header_live_chats">Live Chats</string>
     <string name="header_unknown">Unknown</string>
 
+    <!--Links-->
+    <string name="play_store_link">"https://play.google.com/store/apps/details?id=chat.rocket.android"</string>
+
     <!--Notifications-->
     <string name="share_label">Edit shared message</string>
     <string name="notif_action_reply_hint">REPLY</string>

From 93c59c6de463438d4a0ad27d75fb676e98485e0c Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Thu, 8 Nov 2018 00:03:04 +0530
Subject: [PATCH 008/149] update all string.xml files

---
 .../java/chat/rocket/android/settings/ui/SettingsFragment.kt  | 4 ++--
 app/src/main/res/values-de/strings.xml                        | 3 +++
 app/src/main/res/values-es/strings.xml                        | 3 +++
 app/src/main/res/values-fr/strings.xml                        | 4 ++++
 app/src/main/res/values-hi-rIN/strings.xml                    | 3 +++
 app/src/main/res/values-ja/strings.xml                        | 3 +++
 app/src/main/res/values-pt-rBR/strings.xml                    | 3 +++
 app/src/main/res/values-ru-rRU/strings.xml                    | 3 +++
 app/src/main/res/values-tr/strings.xml                        | 4 ++++
 app/src/main/res/values-uk/strings.xml                        | 3 +++
 app/src/main/res/values/strings.xml                           | 4 ++--
 11 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
index 4c78ed45ce..4ae0e9f4d5 100644
--- a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
@@ -80,11 +80,11 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
             resources.getString(R.string.title_share_the_app) ->{
                 val shareIntent = Intent(Intent.ACTION_SEND)
                 shareIntent.type = "text/plain"
-                val shareBody = getString(R.string.check_this_out)
+                val shareBody = getString(R.string.msg_check_this_out)
                 val shareSub = getString(R.string.play_store_link)
                 shareIntent.putExtra(Intent.EXTRA_SUBJECT, shareBody)
                 shareIntent.putExtra(Intent.EXTRA_TEXT, shareSub)
-                startActivity(Intent.createChooser(shareIntent, getString(R.string.share_using)))
+                startActivity(Intent.createChooser(shareIntent, getString(R.string.msg_share_using)))
             }
 
         }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5ff7c7f495..c92617e50a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -58,11 +58,14 @@
         <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
         <item name="item_password">Ändere Passwort</item>
         <item name="item_password">Über</item>
+        <item name="item_share_app">App teilen</item>
     </string-array>
 
     <!-- Regular information messages -->
     <string name="msg_generic_error">Entschuldigung, ein Fehler ist aufgetreten, bitte versuchen Sie es noch einmal.</string>
     <string name="msg_no_data_to_display">Keine Anzeigedaten vorhanden</string>
+    <string name="msg_check_this_out">Schau dir das an</string>
+    <string name="msg_share_using">Teilen Sie mit</string>
     <string name="msg_profile_update_successfully">Profil update erfolgreich</string>
     <string name="msg_username">Benutzername</string>
     <string name="msg_username_or_email">Benutzername oder E-Mail</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 3269ccd08e..8f265ae277 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -56,11 +56,14 @@
         <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
         <item name="item_password">Cambia la contraseña</item>
         <item name="item_password">Acerca de</item>
+        <item name="item_share_app">Compartir aplicación</item>
     </string-array>
 
     <!-- Regular information messages -->
     <string name="msg_generic_error">Lo sentimos, ha ocurrido un error, por favor intente de nuevo</string>
     <string name="msg_no_data_to_display">No hay información para mostrar</string>
+    <string name="msg_check_this_out">Mira esto</string>
+    <string name="msg_share_using">Compartir usando</string>
     <string name="msg_profile_update_successfully">Actualización de perfil con éxito</string>
     <string name="msg_username">usuario</string>
     <string name="msg_username_or_email">Nombre de usuario o correo electrónico</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 26a74b7104..eb819640c1 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -60,11 +60,15 @@
         <item name="item_preferences">Préférences</item>
         <item name="item_password">Changer le mot de passe</item>
         <item name="item_password">À propos</item>
+        <item name="item_share_app">Partager l'application
+</item>
     </string-array>
 
     <!-- Regular information messages -->
     <string name="msg_generic_error">Désolé, une erreur s\'est produite. Veuillez réessayer</string>
     <string name="msg_no_data_to_display">Aucune donnée à afficher</string>
+    <string name="msg_check_this_out">regarde ça</string>
+    <string name="msg_share_using">Partager en utilisant</string>
     <string name="msg_profile_update_successfully">Mise à jour du profil avec succès</string>
     <string name="msg_username">nom d\'utilisateur</string>
     <string name="msg_username_or_email">Nom d\'utilisateur ou email</string>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index a2145c7340..cc2fb5b99a 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -59,11 +59,14 @@
         <item name="item_preferences">प्राथमिकताएँ</item>
         <item name="item_password">पासवर्ड बदलें</item>
         <item name="item_password">परिचय</item>
+        <item name="item_share_app">ऐप शेयर करें</item>
     </string-array>
 
     <!-- Regular information messages -->
     <string name="msg_generic_error">क्षमा करें, एक त्रुटि हुई है, कृपया पुनः प्रयास करें</string>
     <string name="msg_no_data_to_display">डेटा प्रदर्शित करने के लिए उपलब्ध नहीं हैं</string>
+    <string name="msg_check_this_out">इसकी जांच करें</string>
+    <string name="msg_share_using">उपयोग कर साझा करें</string>
     <string name="msg_profile_update_successfully">प्रोफ़ाइल सफलतापूर्वक अपडेट हो गया है</string>
     <string name="msg_username">यूजरनेम</string>
     <string name="msg_username_or_email">यूजरनेम या ईमेल</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 0b4f6eed2e..0d7430e994 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -61,11 +61,14 @@
         <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
         <item name="item_password">Change Password</item> <!-- TODO Add translation -->
         <item name="item_password">About</item> <!-- TODO Add translation -->
+        <item name="item_share_app">アプリを共有する</item>
     </string-array>
 
     <!-- Regular information messages -->
     <string name="msg_generic_error">エラーが発生しました。もう一度お試しください。</string>
     <string name="msg_no_data_to_display">表示するデータがありません</string>
+    <string name="msg_check_this_out">これをチェックする</string>
+    <string name="msg_share_using">共有する</string>
     <string name="msg_profile_update_successfully">プロフィールの更新に成功しました</string>
     <string name="msg_username">ユーザー名</string>
     <string name="msg_username_or_email">メールアドレスまたはユーザー名</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 8faee241e6..5825daff8b 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -59,11 +59,14 @@
         <item name="item_preferences">Preferencias</item>
         <item name="item_password">Alterar senha</item>
         <item name="item_password">Sobre</item>
+        <item name="item_share_app">Compartilhe o aplicativo</item>
     </string-array>
 
     <!-- Regular information messages -->
     <string name="msg_generic_error">Desculpe, ocorreu um erro, tente novamente</string>
     <string name="msg_no_data_to_display">Nenhum dado para exibir</string>
+    <string name="msg_check_this_out">Veja isso</string>
+    <string name="msg_share_using">compartilhar usando</string>
     <string name="msg_profile_update_successfully">Perfil atualizado com sucesso</string>
     <string name="msg_username">nome de usuário</string>
     <string name="msg_username_or_email">Nome de usuário ou email</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index fb7541bc5d..a4c1559ed5 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -59,11 +59,14 @@
         <item name="item_preferences">Персональные</item>
         <item name="item_password">Изменить пароль</item>
         <item name="item_password">О программе</item>
+        <item name="item_share_app">добавить приложение</item>
     </string-array>
 
     <!-- Regular information messages -->
     <string name="msg_generic_error">Произошла ошибка, повторите попытку.</string>
     <string name="msg_no_data_to_display">Нет данных для отображения</string>
+    <string name="msg_check_this_out">Проверь это</string>
+    <string name="msg_share_using">Совместное использование</string>
     <string name="msg_profile_update_successfully">Профиль успешно обновлен</string>
     <string name="msg_username">имя пользователя</string>
     <string name="msg_username_or_email">имя пользователя или e-mail</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index cee409697a..01fff9f729 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -59,11 +59,15 @@
         <item name="item_preferences">Tercihler</item>
         <item name="item_password">Şifre Değiştir</item>
         <item name="item_password">Hakkında</item>
+        <item name="item_share_app">uygulamayı Paylaş
+</item>
     </string-array>
 
     <!-- Regular information messages -->
     <string name="msg_generic_error">Üzgünüz! bir hata oluştu. Lütfen daha sonra tekrar deneyiniz.</string>
     <string name="msg_no_data_to_display">Görüntülenecek veri bulunmamaktadır.</string>
+    <string name="msg_check_this_out">bunu kontrol et</string>
+    <string name="msg_share_using">kullanarak paylaş</string>
     <string name="msg_profile_update_successfully">Profil bilgileri başarıyla güncellenmiştir.</string>
     <string name="msg_username">kullanıcı adı</string>
     <string name="msg_username_or_email">kullanıcı adı veya eposta</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index b3fd14faa2..9b7b8a52ea 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -59,11 +59,14 @@
         <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
         <item name="item_password">Change Password</item> <!-- TODO Add translation -->
         <item name="item_password">About</item> <!-- TODO Add translation -->
+        <item name="item_share_app">поділитися прикладом</item>
     </string-array>
 
     <!-- Regular information messages -->
     <string name="msg_generic_error">Сталася помилка, спробуйте ще раз.</string>
     <string name="msg_no_data_to_display">Немає даних для відображення</string>
+    <string name="msg_check_this_out">Перевір це</string>
+    <string name="msg_share_using">поділитися використанням</string>
     <string name="msg_profile_update_successfully">"Профіль оновлено успішно "</string>
     <string name="msg_username">Ім\'я користувача</string>
     <string name="msg_username_or_email">Ім\'я користувача або e-mail</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c6bc25c02a..0741b7430d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -77,8 +77,8 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <!-- Regular information messages -->
     <string name="msg_generic_error">Sorry, an error has occurred, please try again</string>
     <string name="msg_no_data_to_display">No data to display</string>
-    <string name="check_this_out">Check this out</string>
-    <string name="share_using">Share using</string>
+    <string name="msg_check_this_out">Check this out</string>
+    <string name="msg_share_using">Share using</string>
     <string name="msg_profile_update_successfully">Profile update successfully</string>
     <string name="msg_username">username</string>
     <string name="msg_username_or_email">Username or email</string>

From c89d9c0589bf697c6382ebb06b66bdc09d2810ad Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Thu, 8 Nov 2018 00:39:22 +0530
Subject: [PATCH 009/149] fix build failure

---
 app/src/main/res/values-fr/strings.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index eb819640c1..eb6efbd670 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -60,8 +60,7 @@
         <item name="item_preferences">Préférences</item>
         <item name="item_password">Changer le mot de passe</item>
         <item name="item_password">À propos</item>
-        <item name="item_share_app">Partager l'application
-</item>
+        <item name="item_share_app">Partager l\'application</item>
     </string-array>
 
     <!-- Regular information messages -->

From b90269c177c892b92132c946c6cd33916a83a323 Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Thu, 8 Nov 2018 01:43:24 +0530
Subject: [PATCH 010/149] fix build failure

---
 app/src/main/res/values-de/strings.xml     | 3 +++
 app/src/main/res/values-es/strings.xml     | 3 +++
 app/src/main/res/values-fr/strings.xml     | 3 +++
 app/src/main/res/values-hi-rIN/strings.xml | 3 +++
 app/src/main/res/values-ja/strings.xml     | 3 +++
 app/src/main/res/values-pt-rBR/strings.xml | 3 +++
 app/src/main/res/values-ru-rRU/strings.xml | 3 +++
 app/src/main/res/values-tr/strings.xml     | 3 +++
 app/src/main/res/values-uk/strings.xml     | 3 +++
 app/src/main/res/values/strings.xml        | 1 -
 10 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c92617e50a..fa9ccaef01 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -303,6 +303,9 @@
     <string name="header_live_chats">Live Chats</string>
     <string name="header_unknown">Unbekannt</string>
 
+    <!--Links-->
+    <string name="play_store_link">"https://play.google.com/store/apps/details?id=chat.rocket.android"</string>
+
     <!--Notifications-->
     <string name="share_label">Bearbeite geteilte Nachricht</string>
     <string name="notif_action_reply_hint">Antworten</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 8f265ae277..6b3327086b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -299,6 +299,9 @@
     <string name="header_live_chats">Chats en vivo</string>
     <string name="header_unknown">Desconocido</string>
 
+    <!--Links-->
+    <string name="play_store_link">"https://play.google.com/store/apps/details?id=chat.rocket.android"</string>
+
     <!--Notifications-->
     <string name="share_label">Edita mensaje compartido</string>
     <string name="notif_action_reply_hint">RESPUESTA</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index eb6efbd670..a7c85de883 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -307,6 +307,9 @@
     <string name="header_live_chats">Chats en direct</string>
     <string name="header_unknown">Inconnu</string>
 
+    <!--Links-->
+    <string name="play_store_link">"https://play.google.com/store/apps/details?id=chat.rocket.android"</string>
+
     <!--Notifications-->
     <string name="share_label">Modifier le message partagé</string>
     <string name="notif_action_reply_hint">RÉPONDRE</string>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index cc2fb5b99a..edc54458ee 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -305,6 +305,9 @@
     <string name="header_live_chats">लाइव चैट</string>
     <string name="header_unknown">अज्ञात</string>
 
+    <!--Links-->
+    <string name="play_store_link">"https://play.google.com/store/apps/details?id=chat.rocket.android"</string>
+
     <!--Notifications-->
     <string name="share_label">साझा संदेश संपादित करें</string>
     <string name="notif_action_reply_hint">जवाब</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 0d7430e994..94c6f89cbf 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -310,6 +310,9 @@
     <string name="header_live_chats">ライブチャット</string>
     <string name="header_unknown">不明</string>
 
+    <!--Links-->
+    <string name="play_store_link">"https://play.google.com/store/apps/details?id=chat.rocket.android"</string>
+
     <!--Notifications-->
     <string name="share_label">Edit shared message</string> <!-- TODO Add translation -->
     <string name="notif_action_reply_hint">返信</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 5825daff8b..db917ea48f 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -304,6 +304,9 @@
     <string name="header_live_chats">Live Chats</string>
     <string name="header_unknown">Desconhecido</string>
 
+    <!--Links-->
+    <string name="play_store_link">"https://play.google.com/store/apps/details?id=chat.rocket.android"</string>
+
     <!--Notifications-->
     <string name="share_label">Editar mensagem compartilhada</string>
     <string name="notif_action_reply_hint">RESPONDER</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index a4c1559ed5..912cdb390b 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -300,6 +300,9 @@
     <string name="header_live_chats">Живые чаты</string>
     <string name="header_unknown">Неизвестные</string>
 
+    <!--Links-->
+    <string name="play_store_link">"https://play.google.com/store/apps/details?id=chat.rocket.android"</string>
+
     <!--Notifications-->
     <string name="share_label">Редактировать сообщение</string>
     <string name="notif_action_reply_hint">ОТВЕТИТЬ</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 01fff9f729..77bdfefe7f 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -307,6 +307,9 @@
     <string name="header_live_chats">Canlı Sohbetler</string>
     <string name="header_unknown">Bilinmeyen</string>
 
+    <!--Links-->
+    <string name="play_store_link">"https://play.google.com/store/apps/details?id=chat.rocket.android"</string>
+
     <!--Notifications-->
     <string name="share_label">Paylaşılan mesajı düzenle</string>
     <string name="notif_action_reply_hint">YANITLA</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 9b7b8a52ea..87e0c528b1 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -303,6 +303,9 @@
     <string name="header_live_chats">Живі чати</string>
     <string name="header_unknown">Невідомі</string>
 
+    <!--Links-->
+    <string name="play_store_link">"https://play.google.com/store/apps/details?id=chat.rocket.android"</string>
+
     <!--Notifications-->
     <string name="share_label">Редагувати повідомлення</string>
     <string name="notif_action_reply_hint">ВІДПОВІСТИ</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0741b7430d..50d88f11b6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,7 +31,6 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="title_password">Change Password</string>
     <string name="title_update_profile">Update profile</string>
     <string name="title_about">About</string>
-    <string name="title_share_the_app">Share App</string>
     <string name="title_create_channel">Create Channel</string>
     <string name="title_confirmation">Are You Sure you want to logout?</string>
 

From 2c973cc25cc39a9e40205f6737469eb26b0aee33 Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Thu, 8 Nov 2018 01:56:06 +0530
Subject: [PATCH 011/149] fix build failure

---
 app/src/main/res/values-de/strings.xml     | 1 +
 app/src/main/res/values-es/strings.xml     | 1 +
 app/src/main/res/values-fr/strings.xml     | 1 +
 app/src/main/res/values-hi-rIN/strings.xml | 1 +
 app/src/main/res/values-ja/strings.xml     | 1 +
 app/src/main/res/values-pt-rBR/strings.xml | 1 +
 app/src/main/res/values-ru-rRU/strings.xml | 1 +
 app/src/main/res/values-tr/strings.xml     | 4 ++--
 app/src/main/res/values-uk/strings.xml     | 1 +
 app/src/main/res/values/strings.xml        | 1 +
 10 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index fa9ccaef01..3fff4b3a58 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -3,6 +3,7 @@
     <!-- Titles -->
     <string name="title_sign_in_your_server">Anmelden am Server</string>
     <string name="title_log_in">Anmelden</string>
+    <string name="title_share_the_app">App teilen</string>
     <string name="title_register_username">Registriere Benutzernamen</string>
     <string name="title_reset_password">Passwort zurücksetzen</string>
     <string name="title_sign_up">registrieren</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 6b3327086b..5759d8c990 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2,6 +2,7 @@
     <!-- Titles -->
     <string name="title_sign_in_your_server">Inicia sesión en tu servidor</string>
     <string name="title_log_in">Iniciar sesión</string>
+    <string name="title_share_the_app">Compartir aplicación</string>
     <string name="title_register_username">Registrar nombre de usuario</string>
     <string name="title_reset_password">Restablecer la contraseña</string>
     <string name="title_sign_up">Regístrate</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a7c85de883..c5767d38b0 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -3,6 +3,7 @@
     <!-- Titles -->
     <string name="title_sign_in_your_server">Connectez-vous sur votre serveur</string>
     <string name="title_log_in">S\'identifier</string>
+    <string name="title_share_the_app">Partager l\'application</string>
     <string name="title_register_username">Enregistrer le nom d\'utilisateur</string>
     <string name="title_reset_password">Réinitialiser mot de passe</string>
     <string name="title_sign_up">S\'inscrire</string>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index edc54458ee..51a6f973f1 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -3,6 +3,7 @@
     <!-- Titles -->
     <string name="title_sign_in_your_server">अपने सर्वर में साइन इन करें</string>
     <string name="title_log_in">लॉग इन करें</string>
+    <string name="title_share_the_app">ऐप शेयर करे</string>
     <string name="title_register_username">रजिस्टर उपयोगकर्ता नाम</string>
     <string name="title_reset_password">पासवर्ड रीसेट करें</string>
     <string name="title_sign_up">साइन अप करें</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 94c6f89cbf..c0a04c38b8 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -5,6 +5,7 @@
     <!-- Titles -->
     <string name="title_sign_in_your_server">サーバーに接続</string>
     <string name="title_log_in">ログイン</string>
+    <string name="title_share_the_app">アプリを共有する</string>
     <string name="title_register_username">ユーザー名を登録する</string>
     <string name="title_reset_password">パスワードリセット</string>
     <string name="title_sign_up">サインアップ</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index db917ea48f..fe01f89e9a 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -3,6 +3,7 @@
     <!-- Titles -->
     <string name="title_sign_in_your_server">Faça login no seu servidor</string>
     <string name="title_log_in">Entrar</string>
+    <string name="title_share_the_app">Compartilhe o aplicativo</string>
     <string name="title_register_username">Registre o nome de usuário</string>
     <string name="title_reset_password">Redefinir senha</string>
     <string name="title_sign_up">Inscreva-se</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 912cdb390b..cc576b8ca0 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -3,6 +3,7 @@
     <!-- Titles -->
     <string name="title_sign_in_your_server">Ваш сервер</string>
     <string name="title_log_in">Войти</string>
+    <string name="title_share_the_app">добавить приложение</string>
     <string name="title_register_username">Зарегистрировать имя</string>
     <string name="title_reset_password">Сброс пароля</string>
     <string name="title_sign_up">Зарегистрироваться</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 77bdfefe7f..99aff3cffb 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -3,6 +3,7 @@
     <!-- Titles -->
     <string name="title_sign_in_your_server">Sunucunuza Bağlantı Kurun</string>
     <string name="title_log_in">Giriş Yapın</string>
+    <string name="title_share_the_app">uygulamayı Paylaş</string>
     <string name="title_register_username">Kullanıcı Adıyla Kaydolun</string>
     <string name="title_reset_password">Şifre Sıfırlama</string>
     <string name="title_sign_up">Kayıt Olun</string>
@@ -59,8 +60,7 @@
         <item name="item_preferences">Tercihler</item>
         <item name="item_password">Şifre Değiştir</item>
         <item name="item_password">Hakkında</item>
-        <item name="item_share_app">uygulamayı Paylaş
-</item>
+        <item name="item_share_app">uygulamayı Paylaş</item>
     </string-array>
 
     <!-- Regular information messages -->
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 87e0c528b1..8105f29e58 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -3,6 +3,7 @@
     <!-- Titles -->
     <string name="title_sign_in_your_server">Ваш сервер</string>
     <string name="title_log_in">Увійти</string>
+    <string name="title_share_the_app">поділитися прикладом</string>
     <string name="title_register_username">Зареєструвати ім\'я</string>
     <string name="title_reset_password">Відновлення паролю</string>
     <string name="title_sign_up">Зареєструватися</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 50d88f11b6..49cc26d2f6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,6 +15,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <!-- Titles -->
     <string name="title_sign_in_your_server">Sign in to your server</string>
     <string name="title_log_in">Login</string>
+    <string name="title_share_the_app">Share App</string>
     <string name="title_register_username">Register username</string>
     <string name="title_reset_password">Reset password</string>
     <string name="title_sign_up">Sign up</string>

From bee2392e5886a826ec391ff21a7cb670866c8e7a Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Thu, 8 Nov 2018 08:31:34 +0530
Subject: [PATCH 012/149] add app link to default.xml

---
 app/src/main/res/values-de/strings.xml     | 3 ---
 app/src/main/res/values-es/strings.xml     | 3 ---
 app/src/main/res/values-fr/strings.xml     | 3 ---
 app/src/main/res/values-hi-rIN/strings.xml | 3 ---
 app/src/main/res/values-ja/strings.xml     | 3 ---
 app/src/main/res/values-pt-rBR/strings.xml | 3 ---
 app/src/main/res/values-ru-rRU/strings.xml | 3 ---
 app/src/main/res/values-tr/strings.xml     | 3 ---
 app/src/main/res/values-uk/strings.xml     | 3 ---
 app/src/main/res/values/defaults.xml       | 1 +
 app/src/main/res/values/strings.xml        | 3 ---
 11 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 3fff4b3a58..ea58275e2d 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -304,9 +304,6 @@
     <string name="header_live_chats">Live Chats</string>
     <string name="header_unknown">Unbekannt</string>
 
-    <!--Links-->
-    <string name="play_store_link">"https://play.google.com/store/apps/details?id=chat.rocket.android"</string>
-
     <!--Notifications-->
     <string name="share_label">Bearbeite geteilte Nachricht</string>
     <string name="notif_action_reply_hint">Antworten</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5759d8c990..accbd13a4a 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -300,9 +300,6 @@
     <string name="header_live_chats">Chats en vivo</string>
     <string name="header_unknown">Desconocido</string>
 
-    <!--Links-->
-    <string name="play_store_link">"https://play.google.com/store/apps/details?id=chat.rocket.android"</string>
-
     <!--Notifications-->
     <string name="share_label">Edita mensaje compartido</string>
     <string name="notif_action_reply_hint">RESPUESTA</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c5767d38b0..d17a441874 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -308,9 +308,6 @@
     <string name="header_live_chats">Chats en direct</string>
     <string name="header_unknown">Inconnu</string>
 
-    <!--Links-->
-    <string name="play_store_link">"https://play.google.com/store/apps/details?id=chat.rocket.android"</string>
-
     <!--Notifications-->
     <string name="share_label">Modifier le message partagé</string>
     <string name="notif_action_reply_hint">RÉPONDRE</string>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 51a6f973f1..c6734206dd 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -306,9 +306,6 @@
     <string name="header_live_chats">लाइव चैट</string>
     <string name="header_unknown">अज्ञात</string>
 
-    <!--Links-->
-    <string name="play_store_link">"https://play.google.com/store/apps/details?id=chat.rocket.android"</string>
-
     <!--Notifications-->
     <string name="share_label">साझा संदेश संपादित करें</string>
     <string name="notif_action_reply_hint">जवाब</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index c0a04c38b8..6b232a90c6 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -311,9 +311,6 @@
     <string name="header_live_chats">ライブチャット</string>
     <string name="header_unknown">不明</string>
 
-    <!--Links-->
-    <string name="play_store_link">"https://play.google.com/store/apps/details?id=chat.rocket.android"</string>
-
     <!--Notifications-->
     <string name="share_label">Edit shared message</string> <!-- TODO Add translation -->
     <string name="notif_action_reply_hint">返信</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index fe01f89e9a..dbcc08ada9 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -305,9 +305,6 @@
     <string name="header_live_chats">Live Chats</string>
     <string name="header_unknown">Desconhecido</string>
 
-    <!--Links-->
-    <string name="play_store_link">"https://play.google.com/store/apps/details?id=chat.rocket.android"</string>
-
     <!--Notifications-->
     <string name="share_label">Editar mensagem compartilhada</string>
     <string name="notif_action_reply_hint">RESPONDER</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index cc576b8ca0..7fdca105fc 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -301,9 +301,6 @@
     <string name="header_live_chats">Живые чаты</string>
     <string name="header_unknown">Неизвестные</string>
 
-    <!--Links-->
-    <string name="play_store_link">"https://play.google.com/store/apps/details?id=chat.rocket.android"</string>
-
     <!--Notifications-->
     <string name="share_label">Редактировать сообщение</string>
     <string name="notif_action_reply_hint">ОТВЕТИТЬ</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 99aff3cffb..78afc7cd8f 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -307,9 +307,6 @@
     <string name="header_live_chats">Canlı Sohbetler</string>
     <string name="header_unknown">Bilinmeyen</string>
 
-    <!--Links-->
-    <string name="play_store_link">"https://play.google.com/store/apps/details?id=chat.rocket.android"</string>
-
     <!--Notifications-->
     <string name="share_label">Paylaşılan mesajı düzenle</string>
     <string name="notif_action_reply_hint">YANITLA</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 8105f29e58..2613b224d7 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -304,9 +304,6 @@
     <string name="header_live_chats">Живі чати</string>
     <string name="header_unknown">Невідомі</string>
 
-    <!--Links-->
-    <string name="play_store_link">"https://play.google.com/store/apps/details?id=chat.rocket.android"</string>
-
     <!--Notifications-->
     <string name="share_label">Редагувати повідомлення</string>
     <string name="notif_action_reply_hint">ВІДПОВІСТИ</string>
diff --git a/app/src/main/res/values/defaults.xml b/app/src/main/res/values/defaults.xml
index acc8c4d22a..4df7ef4e1a 100644
--- a/app/src/main/res/values/defaults.xml
+++ b/app/src/main/res/values/defaults.xml
@@ -4,4 +4,5 @@
     <string name="server_hint_url" translatable="false">your-company.rocket.chat</string>
     <string name="community_server_url" translatable="false">open.rocket.chat</string>
     <string name="create_server_url" translatable="false">cloud.rocket.chat/trial</string>
+    <string name="play_store_link" translatable="false">https://play.google.com/store/apps/details?id=chat.rocket.android</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 49cc26d2f6..48415cdc16 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -317,9 +317,6 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="header_live_chats">Live Chats</string>
     <string name="header_unknown">Unknown</string>
 
-    <!--Links-->
-    <string name="play_store_link">"https://play.google.com/store/apps/details?id=chat.rocket.android"</string>
-
     <!--Notifications-->
     <string name="share_label">Edit shared message</string>
     <string name="notif_action_reply_hint">REPLY</string>

From 9353ef5342dd716a4c58d3a2931a7841852219ef Mon Sep 17 00:00:00 2001
From: Govind Dixit <lit2017018@iiita.ac.in>
Date: Thu, 8 Nov 2018 10:01:09 +0530
Subject: [PATCH 013/149] Update SettingsFragment.kt

---
 .../java/chat/rocket/android/settings/ui/SettingsFragment.kt    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
index 4ae0e9f4d5..7712c58467 100644
--- a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
@@ -1,8 +1,6 @@
 package chat.rocket.android.settings.ui
 
-import android.content.ActivityNotFoundException
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View

From 8d569b843f2ce984d0de02ffcbbb5a4e85fd27a9 Mon Sep 17 00:00:00 2001
From: Rafael Kellermann Streit <rafaelks@me.com>
Date: Thu, 8 Nov 2018 14:00:41 -0200
Subject: [PATCH 014/149] Include Google Play and F-Droid links to README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 8e50209474..322d3a8c5b 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@
 
 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.
 
+[![](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/)
 
 ## How to build
 

From 1db3663a57364e9fabade71964510a94158d0fef Mon Sep 17 00:00:00 2001
From: Rafael Kellermann Streit <rafaelks@me.com>
Date: Thu, 8 Nov 2018 14:01:18 -0200
Subject: [PATCH 015/149] Update README.md

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 322d3a8c5b..2c40056b5e 100644
--- a/README.md
+++ b/README.md
@@ -4,12 +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.
 
-[![](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/)
-
 ## 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. 

From 6eb4868036b418864c49fc3e4dee27f5e37b83d9 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Thu, 8 Nov 2018 16:07:57 -0800
Subject: [PATCH 016/149] Finishes the delete own account feature.

---
 .../presentation/OnBoardingPresenter.kt       |  13 +-
 .../server/presentation/ServerPresenter.kt    |  12 +-
 .../main/presentation/MainPresenter.kt        |  80 ++++---------
 .../android/main/presentation/MainView.kt     |   5 +-
 .../rocket/android/main/ui/MainActivity.kt    |   3 +-
 .../profile/presentation/ProfilePresenter.kt  |  33 ++++-
 .../profile/presentation/ProfileView.kt       |   3 +-
 .../android/profile/ui/ProfileFragment.kt     |   3 +
 .../presentation/CheckServerPresenter.kt      | 113 ++++++++++++++++--
 .../android/server/presentation/TokenView.kt  |   6 +
 10 files changed, 184 insertions(+), 87 deletions(-)
 create mode 100644 app/src/main/java/chat/rocket/android/server/presentation/TokenView.kt

diff --git a/app/src/main/java/chat/rocket/android/authentication/onboarding/presentation/OnBoardingPresenter.kt b/app/src/main/java/chat/rocket/android/authentication/onboarding/presentation/OnBoardingPresenter.kt
index 5057a3e3ab..23f9f7df02 100644
--- a/app/src/main/java/chat/rocket/android/authentication/onboarding/presentation/OnBoardingPresenter.kt
+++ b/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()
diff --git a/app/src/main/java/chat/rocket/android/authentication/server/presentation/ServerPresenter.kt b/app/src/main/java/chat/rocket/android/authentication/server/presentation/ServerPresenter.kt
index 1ca5909b6d..d294506ff4 100644
--- a/app/src/main/java/chat/rocket/android/authentication/server/presentation/ServerPresenter.kt
+++ b/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
diff --git a/app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt b/app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt
index bb8ad3e93b..e299409ed9 100644
--- a/app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt
@@ -1,7 +1,6 @@
 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) {
diff --git a/app/src/main/java/chat/rocket/android/main/presentation/MainView.kt b/app/src/main/java/chat/rocket/android/main/presentation/MainView.kt
index b4f2b981c7..2047f21bf8 100644
--- a/app/src/main/java/chat/rocket/android/main/presentation/MainView.kt
+++ b/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()
diff --git a/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt b/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
index 5013b92d91..935a918825 100644
--- a/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
+++ b/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
@@ -202,8 +202,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)
 
diff --git a/app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt b/app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt
index 7487097d63..0de68ab496 100644
--- a/app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt
+++ b/app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt
@@ -5,9 +5,15 @@ import android.net.Uri
 import chat.rocket.android.chatroom.domain.UriInteractor
 import chat.rocket.android.core.behaviours.showMessage
 import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.db.DatabaseManagerFactory
 import chat.rocket.android.helper.UserHelper
+import chat.rocket.android.main.presentation.MainNavigator
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
+import chat.rocket.android.server.domain.RemoveAccountInteractor
+import chat.rocket.android.server.domain.TokenRepository
+import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.presentation.CheckServerPresenter
 import chat.rocket.android.util.extension.compressImageAndGetByteArray
 import chat.rocket.android.util.extension.gethash
 import chat.rocket.android.util.extension.launchUI
@@ -21,6 +27,8 @@ import chat.rocket.core.internal.rest.deleteOwnAccount
 import chat.rocket.core.internal.rest.resetAvatar
 import chat.rocket.core.internal.rest.setAvatar
 import chat.rocket.core.internal.rest.updateProfile
+import kotlinx.coroutines.experimental.DefaultDispatcher
+import kotlinx.coroutines.experimental.withContext
 import java.lang.Exception
 import java.util.*
 import javax.inject.Inject
@@ -30,8 +38,23 @@ class ProfilePresenter @Inject constructor(
     private val strategy: CancelStrategy,
     private val uriInteractor: UriInteractor,
     val userHelper: UserHelper,
+    navigator: MainNavigator,
     serverInteractor: GetCurrentServerInteractor,
-    factory: RocketChatClientFactory
+    factory: RocketChatClientFactory,
+    removeAccountInteractor: RemoveAccountInteractor,
+    tokenRepository: TokenRepository,
+    dbManagerFactory: DatabaseManagerFactory,
+    managerFactory: ConnectionManagerFactory
+) : CheckServerPresenter(
+    strategy = strategy,
+    factory = factory,
+    serverInteractor = serverInteractor,
+    removeAccountInteractor = removeAccountInteractor,
+    tokenRepository = tokenRepository,
+    dbManagerFactory = dbManagerFactory,
+    managerFactory = managerFactory,
+    tokenView = view,
+    navigator = navigator
 ) {
     private val serverUrl = serverInteractor.get()!!
     private val client: RocketChatClient = factory.create(serverUrl)
@@ -156,7 +179,13 @@ class ProfilePresenter @Inject constructor(
         launchUI(strategy) {
             view.showLoading()
             try {
-                retryIO { client.deleteOwnAccount(password.gethash().toHex()) }
+                withContext(DefaultDispatcher) {
+                    // REMARK: Backend API is only working with a lowercase hash.
+                    // https://github.com/RocketChat/Rocket.Chat/issues/12573
+                    retryIO { client.deleteOwnAccount(password.gethash().toHex().toLowerCase()) }
+                    setupConnectionInfo(serverUrl)
+                    logout(null)
+                }
             } catch (exception: Exception) {
                 exception.message?.let {
                     view.showMessage(it)
diff --git a/app/src/main/java/chat/rocket/android/profile/presentation/ProfileView.kt b/app/src/main/java/chat/rocket/android/profile/presentation/ProfileView.kt
index 9ebf141fff..86c8f97620 100644
--- a/app/src/main/java/chat/rocket/android/profile/presentation/ProfileView.kt
+++ b/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.
diff --git a/app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt b/app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt
index deef89b05b..0e861025e2 100644
--- a/app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt
+++ b/app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt
@@ -32,6 +32,7 @@ import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.showToast
 import chat.rocket.android.util.extensions.textContent
 import chat.rocket.android.util.extensions.ui
+import chat.rocket.android.util.invalidateFirebaseToken
 import com.facebook.drawee.backends.pipeline.Fresco
 import dagger.android.support.AndroidSupportInjection
 import io.reactivex.disposables.CompositeDisposable
@@ -146,6 +147,8 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
         showMessage(getString(R.string.msg_profile_update_successfully))
     }
 
+    override fun invalidateToken(token: String) = invalidateFirebaseToken(token)
+
     override fun showLoading() {
         enableUserInput(false)
         ui { view_loading.isVisible = true }
diff --git a/app/src/main/java/chat/rocket/android/server/presentation/CheckServerPresenter.kt b/app/src/main/java/chat/rocket/android/server/presentation/CheckServerPresenter.kt
index 879eb086b4..a1c01b78ee 100644
--- a/app/src/main/java/chat/rocket/android/server/presentation/CheckServerPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/server/presentation/CheckServerPresenter.kt
@@ -3,7 +3,11 @@ package chat.rocket.android.server.presentation
 import chat.rocket.android.BuildConfig
 import chat.rocket.android.authentication.server.presentation.VersionCheckView
 import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.db.DatabaseManager
+import chat.rocket.android.db.DatabaseManagerFactory
 import chat.rocket.android.helper.OauthHelper
+import chat.rocket.android.infrastructure.LocalRepository
+import chat.rocket.android.main.presentation.MainNavigator
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.PublicSettings
 import chat.rocket.android.server.domain.casLoginUrl
@@ -18,6 +22,12 @@ import chat.rocket.android.server.domain.isLoginFormEnabled
 import chat.rocket.android.server.domain.isRegistrationEnabledForNewUsers
 import chat.rocket.android.server.domain.isWordpressAuthenticationEnabled
 import chat.rocket.android.server.domain.wordpressUrl
+import chat.rocket.android.server.domain.GetCurrentServerInteractor
+import chat.rocket.android.server.domain.RemoveAccountInteractor
+import chat.rocket.android.server.domain.TokenRepository
+import chat.rocket.android.server.domain.RefreshSettingsInteractor
+import chat.rocket.android.server.infraestructure.ConnectionManager
+import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.VersionInfo
 import chat.rocket.android.util.extension.launchUI
@@ -30,9 +40,15 @@ import chat.rocket.common.RocketChatException
 import chat.rocket.common.RocketChatInvalidProtocolException
 import chat.rocket.common.model.ServerInfo
 import chat.rocket.core.RocketChatClient
+import chat.rocket.core.internal.rest.logout
 import chat.rocket.core.internal.rest.serverInfo
 import chat.rocket.core.internal.rest.settingsOauth
+import chat.rocket.core.internal.rest.unregisterPushToken
+import chat.rocket.core.model.Myself
+import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.Job
+import kotlinx.coroutines.experimental.channels.Channel
+import kotlinx.coroutines.experimental.withContext
 import timber.log.Timber
 
 private const val SERVICE_NAME_FACEBOOK = "facebook"
@@ -42,16 +58,26 @@ private const val SERVICE_NAME_LINKEDIN = "linkedin"
 private const val SERVICE_NAME_GILAB = "gitlab"
 private const val SERVICE_NAME_WORDPRESS = "wordpress"
 
-
 abstract class CheckServerPresenter constructor(
     private val strategy: CancelStrategy,
     private val factory: RocketChatClientFactory,
     private val settingsInteractor: GetSettingsInteractor? = null,
-    private val view: VersionCheckView? = null
+    private val serverInteractor: GetCurrentServerInteractor? = null,
+    private val localRepository: LocalRepository? = null,
+    private val removeAccountInteractor: RemoveAccountInteractor? = null,
+    private val tokenRepository: TokenRepository? = null,
+    private val managerFactory: ConnectionManagerFactory? = null,
+    private val dbManagerFactory: DatabaseManagerFactory? = null,
+    private val versionCheckView: VersionCheckView? = null,
+    private val tokenView: TokenView? = null,
+    private val navigator: MainNavigator? = null,
+    private val refreshSettingsInteractor: RefreshSettingsInteractor? = null
 ) {
     private lateinit var currentServer: String
     private lateinit var client: RocketChatClient
     private lateinit var settings: PublicSettings
+    private lateinit var manager: ConnectionManager
+    private lateinit var dbManager: DatabaseManager
     internal var state: String = ""
     internal var facebookOauthUrl: String? = null
     internal var githubOauthUrl: String? = null
@@ -78,10 +104,22 @@ abstract class CheckServerPresenter constructor(
     internal var isNewAccountCreationEnabled = false
 
     internal fun setupConnectionInfo(serverUrl: String) {
-        settingsInteractor?.get(serverUrl)?.let {
+        currentServer = serverUrl
+        client = factory.create(serverUrl)
+        managerFactory?.create(serverUrl)?.let {
+            manager = it
+        }
+        dbManagerFactory?.create(serverUrl)?.let {
+            dbManager = it
+        }
+    }
+
+    internal suspend fun refreshServerAccounts() {
+        refreshSettingsInteractor?.refresh(currentServer)
+
+        settingsInteractor?.get(currentServer)?.let {
             settings = it
         }
-        client = factory.create(serverUrl)
 
         state = ""
         facebookOauthUrl = null
@@ -117,28 +155,28 @@ abstract class CheckServerPresenter constructor(
                     client.serverInfo()
                 }
                 if (serverInfo.redirected) {
-                    view?.updateServerUrl(serverInfo.url)
+                    versionCheckView?.updateServerUrl(serverInfo.url)
                 }
                 val version = checkServerVersion(serverInfo)
                 when (version) {
                     is Version.VersionOk -> {
                         Timber.i("Your version is nice! (Requires: 0.62.0, Yours: ${version.version})")
-                        view?.versionOk()
+                        versionCheckView?.versionOk()
                     }
                     is Version.RecommendedVersionWarning -> {
                         Timber.i("Your server ${version.version} is bellow recommended version ${BuildConfig.RECOMMENDED_SERVER_VERSION}")
-                        view?.alertNotRecommendedVersion()
+                        versionCheckView?.alertNotRecommendedVersion()
                     }
                     is Version.OutOfDateError -> {
                         Timber.i("Oops. Looks like your server ${version.version} is out-of-date! Minimum server version required ${BuildConfig.REQUIRED_SERVER_VERSION}!")
-                        view?.blockAndAlertNotRequiredVersion()
+                        versionCheckView?.blockAndAlertNotRequiredVersion()
                     }
                 }
             } catch (ex: Exception) {
                 Timber.d(ex, "Error getting server info")
                 when (ex) {
-                    is RocketChatInvalidProtocolException -> view?.errorInvalidProtocol()
-                    else -> view?.errorCheckingServerVersion()
+                    is RocketChatInvalidProtocolException -> versionCheckView?.errorInvalidProtocol()
+                    else -> versionCheckView?.errorCheckingServerVersion()
                 }
             }
         }
@@ -162,8 +200,59 @@ abstract class CheckServerPresenter constructor(
         }
     }
 
-    private fun checkEnabledOauthAccounts(services: List<Map<String,Any>>, serverUrl: String) {
+    /**
+     * Logout the user from the current server.
+     *
+     * @param userDataChannel the user data channel to stop listening to changes (if currently subscribed).
+     */
+    internal fun logout(userDataChannel: Channel<Myself>?) {
+        launchUI(strategy) {
+            try {
+                clearTokens()
+                retryIO("logout") { client.logout() }
+            } catch (exception: RocketChatException) {
+                Timber.e(exception, "Error calling logout")
+            }
 
+            try {
+                if (userDataChannel != null) {
+                    disconnect(userDataChannel)
+                }
+                removeAccountInteractor?.remove(currentServer)
+                tokenRepository?.remove(currentServer)
+                withContext(CommonPool) { dbManager.logout() }
+                navigator?.switchOrAddNewServer()
+            } catch (ex: Exception) {
+                Timber.e(ex, "Error cleaning up the session...")
+            }
+        }
+    }
+
+    /**
+     * Stops listening to user data changes and disconnects the user.
+     *
+     * @param userDataChannel the user data channel to stop listening to changes.
+     */
+    fun disconnect(userDataChannel: Channel<Myself>) {
+        manager.removeUserDataChannel(userDataChannel)
+        manager.disconnect()
+    }
+
+    private suspend fun clearTokens() {
+        serverInteractor?.clear()
+        val pushToken = localRepository?.get(LocalRepository.KEY_PUSH_TOKEN)
+        if (pushToken != null) {
+            try {
+                retryIO("unregisterPushToken") { client.unregisterPushToken(pushToken) }
+                tokenView?.invalidateToken(pushToken)
+            } catch (ex: Exception) {
+                Timber.e(ex, "Error unregistering push token")
+            }
+        }
+        localRepository?.clearAllFromServer(currentServer)
+    }
+
+    private fun checkEnabledOauthAccounts(services: List<Map<String,Any>>, serverUrl: String) {
         if (settings.isFacebookAuthenticationEnabled()) {
             getServiceMap(services, SERVICE_NAME_FACEBOOK)?.let { serviceMap ->
                 getOauthClientId(serviceMap)?.let { clientId ->
@@ -552,4 +641,4 @@ abstract class CheckServerPresenter constructor(
 
         data class OutOfDateError(private val currentVersion: String) : Version(currentVersion)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/chat/rocket/android/server/presentation/TokenView.kt b/app/src/main/java/chat/rocket/android/server/presentation/TokenView.kt
new file mode 100644
index 0000000000..72476cacbf
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/server/presentation/TokenView.kt
@@ -0,0 +1,6 @@
+package chat.rocket.android.server.presentation
+
+interface TokenView {
+
+    fun invalidateToken(token: String)
+}
\ No newline at end of file

From b3c0fb7851001fe52a0584763cb99b8eb6ef521c Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Fri, 9 Nov 2018 23:50:00 +0530
Subject: [PATCH 017/149] feat: add rate us feature

---
 app/src/main/res/values-de/strings.xml     | 4 +++-
 app/src/main/res/values-es/strings.xml     | 4 +++-
 app/src/main/res/values-fr/strings.xml     | 4 +++-
 app/src/main/res/values-hi-rIN/strings.xml | 4 +++-
 app/src/main/res/values-ja/strings.xml     | 4 +++-
 app/src/main/res/values-pt-rBR/strings.xml | 4 +++-
 app/src/main/res/values-ru-rRU/strings.xml | 4 +++-
 app/src/main/res/values-tr/strings.xml     | 4 +++-
 app/src/main/res/values-uk/strings.xml     | 4 +++-
 9 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ea58275e2d..eba974630d 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -16,6 +16,7 @@
     <string name="title_settings">Einstellungen</string>
     <string name="title_preferences">Preferences</string> <!-- TODO Add translation -->
     <string name="title_change_password">Ändere Passwort</string>
+    <string name="title_rate_us">Bewerten Sie uns</string>
     <string name="title_admin_panel">Admin panel</string> <!-- TODO Add translation -->
     <string name="title_password">Ändere Passwort</string>
     <string name="title_update_profile">Update Profil</string>
@@ -58,8 +59,9 @@
     <string-array name="settings_actions">
         <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
         <item name="item_password">Ändere Passwort</item>
-        <item name="item_password">Über</item>
         <item name="item_share_app">App teilen</item>
+        <item name="item_rate_us">Bewerten Sie uns</item>
+        <item name="item_password">Über</item>
     </string-array>
 
     <!-- Regular information messages -->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index accbd13a4a..3123420ebc 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -15,6 +15,7 @@
     <string name="title_settings">Configuraciones</string>
     <string name="title_preferences">Preferences</string> <!-- TODO Add translation -->
     <string name="title_change_password">Cambia la contraseña</string>
+    <string name="title_rate_us">Nos califica</string>
     <string name="title_admin_panel">Admin panel</string> <!-- TODO Add translation -->
     <string name="title_password">Cambia la contraseña</string>
     <string name="title_update_profile">Actualización del perfil</string>
@@ -56,8 +57,9 @@
     <string-array name="settings_actions">
         <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
         <item name="item_password">Cambia la contraseña</item>
-        <item name="item_password">Acerca de</item>
         <item name="item_share_app">Compartir aplicación</item>
+        <item name="item_rate_us">Nos califica</item>
+        <item name="item_password">Acerca de</item>
     </string-array>
 
     <!-- Regular information messages -->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index d17a441874..a074d85652 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -16,6 +16,7 @@
     <string name="title_settings">Paramètres</string>
     <string name="title_preferences">Préférences</string>
     <string name="title_change_password">Changer le mot de passe</string>
+    <string name="title_rate_us">évaluez nous</string>
     <string name="title_admin_panel">Administration</string>
     <string name="title_password">Changer le mot de passe</string>
     <string name="title_update_profile">Mettre à jour le profil</string>
@@ -60,8 +61,9 @@
     <string-array name="settings_actions">
         <item name="item_preferences">Préférences</item>
         <item name="item_password">Changer le mot de passe</item>
-        <item name="item_password">À propos</item>
         <item name="item_share_app">Partager l\'application</item>
+        <item name="item_rate_us">évaluez nous</item>
+        <item name="item_password">À propos</item>
     </string-array>
 
     <!-- Regular information messages -->
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index c6734206dd..717d3e175f 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -16,6 +16,7 @@
     <string name="title_settings">सेटिंग्स</string>
     <string name="title_preferences">प्राथमिकताएँ</string>
     <string name="title_change_password">पासवर्ड बदलें</string>
+    <string name="title_rate_us">हमें रेटिंग दें</string>
     <string name="title_admin_panel">एडमिन पैनल</string>
     <string name="title_password">पासवर्ड बदलें</string>
     <string name="title_update_profile">प्रोफ़ाइल अपडेट करें</string>
@@ -59,8 +60,9 @@
     <string-array name="settings_actions">
         <item name="item_preferences">प्राथमिकताएँ</item>
         <item name="item_password">पासवर्ड बदलें</item>
-        <item name="item_password">परिचय</item>
         <item name="item_share_app">ऐप शेयर करें</item>
+        <item name="item_rate_us">हमें रेटिंग दें</item>
+        <item name="item_password">परिचय</item>
     </string-array>
 
     <!-- Regular information messages -->
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 6b232a90c6..cabf49b3ee 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -18,6 +18,7 @@
     <string name="title_settings">設定</string>
     <string name="title_preferences">Preferences</string> <!-- TODO Add translation -->
     <string name="title_change_password">Change Password</string> <!-- TODO Add translation -->
+    <string name="title_rate_us">私たちを評価してください</string>
     <string name="title_admin_panel">Admin panel</string> <!-- TODO Add translation -->
     <string name="title_password">パスワードの変更</string>
     <string name="title_update_profile">プロフィールの更新</string>
@@ -61,8 +62,9 @@
     <string-array name="settings_actions">
         <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
         <item name="item_password">Change Password</item> <!-- TODO Add translation -->
-        <item name="item_password">About</item> <!-- TODO Add translation -->
         <item name="item_share_app">アプリを共有する</item>
+        <item name="item_rate_us">私たちを評価してください</item>
+        <item name="item_password">About</item> <!-- TODO Add translation -->
     </string-array>
 
     <!-- Regular information messages -->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index dbcc08ada9..4255f2840d 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -16,6 +16,7 @@
     <string name="title_settings">Configurações</string>
     <string name="title_preferences">Preferencias</string>
     <string name="title_change_password">Alterar senha</string>
+    <string name="title_rate_us">nos avalie</string>
     <string name="title_admin_panel">Painel administrativo</string>
     <string name="title_password">Alterar senha</string>
     <string name="title_update_profile">Editar perfil</string>
@@ -59,8 +60,9 @@
     <string-array name="settings_actions">
         <item name="item_preferences">Preferencias</item>
         <item name="item_password">Alterar senha</item>
-        <item name="item_password">Sobre</item>
         <item name="item_share_app">Compartilhe o aplicativo</item>
+        <item name="item_rate_us">nos avalie</item>
+        <item name="item_password">Sobre</item>
     </string-array>
 
     <!-- Regular information messages -->
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 7fdca105fc..c1a2017931 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -16,6 +16,7 @@
     <string name="title_settings">Настройки</string>
     <string name="title_preferences">Персональные</string>
     <string name="title_change_password">Изменить пароль</string>
+    <string name="title_rate_us">оцените нас</string>
     <string name="title_admin_panel">Панель админа</string>
     <string name="title_password">Изменить пароль</string>
     <string name="title_update_profile">Обновить профиль</string>
@@ -59,8 +60,9 @@
     <string-array name="settings_actions">
         <item name="item_preferences">Персональные</item>
         <item name="item_password">Изменить пароль</item>
-        <item name="item_password">О программе</item>
+        <item name="item_rate_us">оцените нас</item>
         <item name="item_share_app">добавить приложение</item>
+        <item name="item_password">О программе</item>
     </string-array>
 
     <!-- Regular information messages -->
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 78afc7cd8f..2a4cd34b2e 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -16,6 +16,7 @@
     <string name="title_settings">Ayarlar</string>
     <string name="title_preferences">Tercihler</string>
     <string name="title_change_password">Şifre Değişikliği</string>
+    <string name="title_rate_us">Bizi değerlendirin</string>
     <string name="title_admin_panel">Yönetici Paneli</string>
     <string name="title_password">Şifrenizi Değiştirin</string>
     <string name="title_update_profile">Profilinizi Düzenleyin</string>
@@ -59,8 +60,9 @@
     <string-array name="settings_actions">
         <item name="item_preferences">Tercihler</item>
         <item name="item_password">Şifre Değiştir</item>
-        <item name="item_password">Hakkında</item>
         <item name="item_share_app">uygulamayı Paylaş</item>
+        <item name="item_rate_us">Bizi değerlendirin</item>
+        <item name="item_password">Hakkında</item>
     </string-array>
 
     <!-- Regular information messages -->
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 2613b224d7..8c998d7990 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -16,6 +16,7 @@
     <string name="title_settings">Налаштування</string>
     <string name="title_preferences">Персональні</string>
     <string name="title_change_password">Змінити пароль</string>
+    <string name="title_rate_us">Оцініть нас</string>
     <string name="title_admin_panel">Панель адміністратора</string>
     <string name="title_password">Змінити пароль</string>
     <string name="title_update_profile">Оновити профіль</string>
@@ -59,8 +60,9 @@
     <string-array name="settings_actions">
         <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
         <item name="item_password">Change Password</item> <!-- TODO Add translation -->
-        <item name="item_password">About</item> <!-- TODO Add translation -->
         <item name="item_share_app">поділитися прикладом</item>
+        <item name="item_rate_us">Оцініть нас</item>
+        <item name="item_password">About</item> <!-- TODO Add translation -->
     </string-array>
 
     <!-- Regular information messages -->

From cca9bd88a315c90d6ac7a2d859fc6c8bed52ffa5 Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Sat, 10 Nov 2018 09:50:32 +0530
Subject: [PATCH 018/149] minor changes

---
 .../chat/rocket/android/settings/ui/SettingsFragment.kt  | 9 +++++----
 app/src/main/res/values/defaults.xml                     | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
index 813ec3d214..5e20df4c7b 100644
--- a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
@@ -9,6 +9,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.net.toUri
 import androidx.fragment.app.Fragment
 import chat.rocket.android.R
 import chat.rocket.android.about.ui.AboutFragment
@@ -92,16 +93,16 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
     }
 
     fun getMarketAppLink(): String {
-        return "market://details?id=chat.rocket.android"
+        return getString(R.string.market_link)
     }
     fun getMarketWebLink(): String {
-        return "https://play.google.com/store/apps/details?id=chat.rocket.android"
+        return getString(R.string.play_store_link)
     }
     private fun startAppPlayStore() {
         try {
-            startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getMarketAppLink())))
+            startActivity(Intent(Intent.ACTION_VIEW, getMarketAppLink().toUri()))
         } catch (error: ActivityNotFoundException) {
-            startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getMarketWebLink())))
+            startActivity(Intent(Intent.ACTION_VIEW, getMarketWebLink().toUri()))
         }
     }
 
diff --git a/app/src/main/res/values/defaults.xml b/app/src/main/res/values/defaults.xml
index 4df7ef4e1a..009315a330 100644
--- a/app/src/main/res/values/defaults.xml
+++ b/app/src/main/res/values/defaults.xml
@@ -5,4 +5,5 @@
     <string name="community_server_url" translatable="false">open.rocket.chat</string>
     <string name="create_server_url" translatable="false">cloud.rocket.chat/trial</string>
     <string name="play_store_link" translatable="false">https://play.google.com/store/apps/details?id=chat.rocket.android</string>
+    <string name="market_link" translatable="false">market://details?id=chat.rocket.android</string>
 </resources>
\ No newline at end of file

From 6dd788702d7eea694d88267049a2c92392acc012 Mon Sep 17 00:00:00 2001
From: Yuu <yuu.taka94@gmail.com>
Date: Sat, 10 Nov 2018 14:28:12 +0900
Subject: [PATCH 019/149] update ja language'

---
 app/build-sdk.sh                       |   0
 app/src/main/ic_launcher-web.png       | Bin
 app/src/main/res/values-ja/strings.xml | 113 +++++++++++++------------
 gradlew                                |   0
 4 files changed, 57 insertions(+), 56 deletions(-)
 mode change 100755 => 100644 app/build-sdk.sh
 mode change 100755 => 100644 app/src/main/ic_launcher-web.png
 mode change 100755 => 100644 gradlew

diff --git a/app/build-sdk.sh b/app/build-sdk.sh
old mode 100755
new mode 100644
diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png
old mode 100755
new mode 100644
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 6b232a90c6..fbd489bbe1 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -16,14 +16,14 @@
     <string name="title_members">メンバー</string>
     <string name="title_counted_members">メンバー (%d)</string>
     <string name="title_settings">設定</string>
-    <string name="title_preferences">Preferences</string> <!-- TODO Add translation -->
-    <string name="title_change_password">Change Password</string> <!-- TODO Add translation -->
-    <string name="title_admin_panel">Admin panel</string> <!-- TODO Add translation -->
+    <string name="title_preferences">環境設定</string>
+    <string name="title_change_password">パスワードの変更</string>
+    <string name="title_admin_panel">管理パネル</string>
     <string name="title_password">パスワードの変更</string>
     <string name="title_update_profile">プロフィールの更新</string>
     <string name="title_about">About</string>
-    <string name="title_create_channel">新しいチャネルを作成します</string>
-    <string name="title_confirmation">Are You Sure you want to logout?</string> <!-- TODO Add translation -->
+    <string name="title_create_channel">新しいチャネルを作成</string>
+    <string name="title_confirmation">ログアウトしますか?</string>
 
 
     <!-- Actions -->
@@ -37,7 +37,7 @@
     <string name="action_create_channel">チャンネル作成</string>
     <string name="action_create">作ります</string>
     <string name="action_logout">ログアウト</string>
-    <string name="action_stay">Stay</string> <!-- TODO Add translation -->
+    <string name="action_stay">いいえ</string>
     <string name="action_files">ファイル</string>
     <string name="action_confirm_password">変更したパスワードの確認</string>
     <string name="action_join_chat">チャットに参加</string>
@@ -48,20 +48,20 @@
     <string name="action_invisible">状態を隠す</string>
     <string name="action_drawing">絵を描く</string>
     <string name="action_save_to_gallery">ギャラリーに保存</string>
-    <string name="action_select_photo_from_gallery">Select photo from gallery</string> <!-- TODO Add translation -->
-    <string name="action_take_photo">Take photo</string> <!-- TODO Add translation -->
-    <string name="action_reset_avatar">Reset avatar</string> <!-- TODO Add translation -->
-    <string name="action_connect_server">Connect with a server</string> <!-- TODO Add translation -->
-    <string name="action_join_community">Join in the community</string> <!-- TODO Add translation -->
-    <string name="action_create_server">Create a new server</string> <!-- TODO Add translation -->
-    <string name="action_register">Register</string> <!-- TODO Add translation -->
-    <string name="action_confirm">Confirm</string> <!-- TODO Add translation -->
+    <string name="action_select_photo_from_gallery">ギャラリーの写真を選択</string>
+    <string name="action_take_photo">写真を撮る</string>
+    <string name="action_reset_avatar">アバターをリセット</string>
+    <string name="action_connect_server">サーバーに接続</string>
+    <string name="action_join_community">コミュニティに参加</string>
+    <string name="action_create_server">新規サーバーを作成</string>
+    <string name="action_register">登録</string>
+    <string name="action_confirm">確認</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
-        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
-        <item name="item_password">Change Password</item> <!-- TODO Add translation -->
-        <item name="item_password">About</item> <!-- TODO Add translation -->
+        <item name="item_preferences">環境設定</item>
+        <item name="item_password">パスワードの変更</item>
+        <item name="item_password">アプリ情報</item>
         <item name="item_share_app">アプリを共有する</item>
     </string-array>
 
@@ -79,28 +79,28 @@
     <string name="msg_avatar_url">アバター URL</string>
     <string name="msg_or_continue_using_social_accounts">またはソーシャルアカウントを使用する</string>
     <string name="msg_new_user">新規ユーザー? %1$s</string>
-    <string name="msg_forgot__your_password">パスワードをお忘れですか? %1$s</string>
+    <string name="msg_forgot__your_password">パスワードをお忘れですか?</string>
     <string name="msg_reset">リセット</string>
     <string name="msg_check_your_email_to_reset_your_password">メールが送信されました! パスワードを変更するためには、受信ボックスを確認してください。</string>
     <string name="msg_invalid_email">有効なメールアドレスを入力してください</string>
     <string name="msg_new_user_agreement">サインアップすることで、\n%1$s と %2$s に同意したとみなします。</string>
-    <string name="msg_today">Today</string> <!-- TODO Add translation -->
+    <string name="msg_today">今日</string>
     <string name="msg_yesterday">昨日</string>
     <string name="msg_message">メッセージ</string>
     <string name="msg_this_room_is_read_only">この部屋は読み取り専用です</string>
     <string name="msg_invalid_2fa_code">無効な 2FA コード</string>
     <string name="msg_invalid_file">無効なファイル</string>
     <string name="msg_invalid_server_url">無効なサーバー URL</string>
-    <string name="msg_content_description_log_in_using_facebook">Login using Facebook</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_log_in_using_github">Login using Github</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_log_in_using_google">Login using Google</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_log_in_using_linkedin">Login using Linkedin</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_log_in_using_meteor">Login using Meteor</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_log_in_using_twitter">Login using Twitter</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_log_in_using_gitlab">Login using Gitlab</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_log_in_using_wordpress">Login using WordPress</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_send_message">メッセージを送信</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_show_more_login_options">Show more login options</string> <!-- TODO Translate-->
+    <string name="msg_content_description_log_in_using_facebook">Facebookでログイン</string>
+    <string name="msg_content_description_log_in_using_github">Githubでログイン</string>
+    <string name="msg_content_description_log_in_using_google">Googleでログイン</string>
+    <string name="msg_content_description_log_in_using_linkedin">Linkedinでログイン</string>
+    <string name="msg_content_description_log_in_using_meteor">Meteorでログイン</string>
+    <string name="msg_content_description_log_in_using_twitter">Twitterでログイン</string>
+    <string name="msg_content_description_log_in_using_gitlab">Gitlabでログイン</string>
+    <string name="msg_content_description_log_in_using_wordpress">WordPressでログイン</string>
+    <string name="msg_content_description_send_message">メッセージを送信</string>
+    <string name="msg_content_description_show_more_login_options">その他ログインオプション</string>
     <string name="msg_content_description_show_attachment_options">添付ファイルオプションを表示する</string>
     <string name="msg_you">あなた</string>
     <string name="msg_unknown">不明</string>
@@ -142,22 +142,22 @@
     <string name="msg_file_description">ファイルの説明</string>
     <string name="msg_send">送信</string>
     <string name="msg_sent_attachment">添付ファイルを送信しました</string>
-    <string name="msg_welcome_to_rocket_chat">Welcome to Rocket.Chat</string> <!-- TODO Add translation -->
-    <string name="msg_team_communication">Team Communication</string> <!-- TODO Add translation -->
-    <string name="msg_login_with_email">Login with <b>e-mail</b></string> <!-- TODO Add translation -->
-    <string name="msg_create_account">Create an account</string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_facebook">Continue with <b>Facebook</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_github">Continue with <b>Github</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_google">Continue with <b>Google</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_linkedin">Continue with <b>Linkedin</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_gitlab">Continue with <b>GitLab</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_wordpress">Continue with <b>WordPress</b></string> <!-- TODO Add translation -->
-    <string name="msg_two_factor_authentication">Two-factor Authentication</string> <!-- TODO Add translation -->
-    <string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
-    <!-- TODO - Add proper translation -->
-    <string name="msg_view_more">view more</string>
-    <!-- TODO - Add proper translation -->
-    <string name="msg_view_less">view less</string>
+    <string name="msg_welcome_to_rocket_chat">Rocket.Chatへようこそ</string>
+    <string name="msg_team_communication">チームコミュニケーション</string>
+    <string name="msg_login_with_email"><b>e-mail</b>でログイン</string>
+    <string name="msg_create_account">アカウントを作成</string>
+    <string name="msg_continue_with_facebook"><b>Facebook</b>でログイン</string>
+    <string name="msg_continue_with_github"><b>Github</b>でログイン</string>
+    <string name="msg_continue_with_google"><b>Google</b>でログイン</string>
+    <string name="msg_continue_with_linkedin"><b>Linkedin</b>でログイン</string>
+    <string name="msg_continue_with_gitlab"><b>GitLab</b>でログイン</string>
+    <string name="msg_continue_with_wordpress"><b>WordPress</b>でログイン</string>
+    <string name="msg_two_factor_authentication">二要素認証</string>
+    <string name="msg__your_2fa_code">あなたの 2FA コードは何ですか?</string>
+
+    <string name="msg_view_more">更に表示</string>
+
+    <string name="msg_view_less">隠す</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">プライベート</string>
@@ -173,14 +173,14 @@
     <string name="msg_message_copied">メッセージをコピー</string>
     <string name="msg_delete_message">メッセージを削除</string>
     <string name="msg_delete_description">このメッセージを削除してもよろしいですか?</string>
-    <!-- TODO - Add proper translation -->
-    <string name="msg_permalink_copied">Permalink copied</string>
+
+    <string name="msg_permalink_copied">パーマリンクのコピー</string>
 
     <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">Analytics tracking</string> <!-- TODO Add translation -->
-    <string name="msg_send_analytics_tracking">Send anonymous statics to help improving this app</string> <!-- TODO Add translation -->
-    <string name="msg_do_not_send_analytics_tracking">Do not send anonymous statics to help improving this app</string> <!-- TODO Add translation -->
-    <string name="msg_not_applicable_since_it_is_a_foss_version">Not applicable since it is a FOSS version</string> <!-- TODO Add translation -->
+    <string name="msg_analytics_tracking">トラッキングの分析</string>
+    <string name="msg_send_analytics_tracking">アプリ改善のための匿名統計情報を送信する</string>
+    <string name="msg_do_not_send_analytics_tracking">アプリ改善のための匿名統計情報を送信しない</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">FOSSバージョンのため、適用できません</string>
 
     <!-- System messages -->
     <string name="message_room_name_changed">ルーム名を %1$s から %2$s へ変更しました。</string>
@@ -212,7 +212,7 @@
     <string name="action_title_editing">メッセージの編集</string>
     <string name="action_msg_add_reaction">リアクションする</string>
     <!-- TODO - Add proper translation -->
-    <string name="action_msg_copy_permalink">Copy permalink</string>
+    <string name="action_msg_copy_permalink">パーマリンクのコピー</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">編集は許可されていません</string>
@@ -297,7 +297,7 @@
     <string name="menu_chatroom_sort">ソート</string>
     <string name="dialog_sort_title">ソート</string>
     <string name="dialog_sort_by_alphabet">アルファベット順</string>
-    <string name="dialog_sort_by_activity">アクティビティで並べ替える</string>
+    <string name="dialog_sort_by_activity">アクティビティ順</string>
     <string name="dialog_group_by_type">グループ別</string>
     <string name="dialog_group_favourites">お気に入りのグループ</string>
     <string name="chatroom_header">ヘッダ</string>
@@ -312,12 +312,13 @@
     <string name="header_unknown">不明</string>
 
     <!--Notifications-->
-    <string name="share_label">Edit shared message</string> <!-- TODO Add translation -->
+    <string name="share_label">共有メッセージの編集</string>
     <string name="notif_action_reply_hint">返信</string>
     <string name="notif_error_sending">送信に失敗しました。もう一度お試しください。</string>
     <string name="notif_success_sending">メッセージは %1$s に送信されました!</string>
     <string name="read_by">読者</string>
     <string name="message_information_title">メッセージ情報</string>
-    <!--TODO - Add proper translation-->
-    <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
+
+    <string name="message_room_changed_privacy">ルームタイプを %2$s から %1$s に変更しました</string>
+
 </resources>
\ No newline at end of file
diff --git a/gradlew b/gradlew
old mode 100755
new mode 100644

From 01f2a14d00699b591107ae9c867fb8f554e3f379 Mon Sep 17 00:00:00 2001
From: Leonardo Aramaki <leoaramaki@gmail.com>
Date: Mon, 5 Nov 2018 21:12:44 -0200
Subject: [PATCH 020/149] Add support for (un)muted states

---
 .../presentation/ChatRoomPresenter.kt         |  8 +-
 .../android/chatroom/ui/ChatRoomFragment.kt   | 10 +-
 .../chatrooms/adapter/model/RoomUiModel.kt    |  5 +-
 .../presentation/ChatRoomsPresenter.kt        |  3 +-
 .../chatrooms/viewmodel/ChatRoomsViewModel.kt |  4 +-
 .../chat/rocket/android/db/DatabaseManager.kt | 97 ++++++++++---------
 .../java/chat/rocket/android/db/RCDatabase.kt |  7 +-
 .../rocket/android/db/model/ChatRoomEntity.kt |  8 +-
 app/src/main/res/values-de/strings.xml        |  2 +
 app/src/main/res/values-es/strings.xml        |  2 +
 app/src/main/res/values-fr/strings.xml        |  2 +
 app/src/main/res/values-hi-rIN/strings.xml    |  2 +
 app/src/main/res/values-ja/strings.xml        |  2 +
 app/src/main/res/values-pt-rBR/strings.xml    |  5 +-
 app/src/main/res/values-ru-rRU/strings.xml    |  2 +
 app/src/main/res/values-tr/strings.xml        |  2 +
 app/src/main/res/values-uk/strings.xml        |  2 +
 app/src/main/res/values/strings.xml           |  1 +
 18 files changed, 104 insertions(+), 60 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
index be1bea6af1..2e08f4fd0e 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
@@ -38,6 +38,7 @@ import chat.rocket.android.util.extension.compressImageAndGetByteArray
 import chat.rocket.android.util.extension.getByteArray
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
+import chat.rocket.android.util.extensions.exhaustive
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.RoomType
@@ -137,9 +138,12 @@ class ChatRoomPresenter @Inject constructor(
             } finally {
                 // User has at least an 'owner' or 'moderator' role.
                 val userCanMod = isOwnerOrMod()
+                val chatRoom = dbManager.getRoom(roomId)
+                val muted = chatRoom?.chatRoom?.muted ?: emptyList()
                 // Can post anyway if has the 'post-readonly' permission on server.
-                val userCanPost = userCanMod || permissions.canPostToReadOnlyChannels()
-                chatIsBroadcast = dbManager.getRoom(roomId)?.chatRoom?.run {
+                val userCanPost = userCanMod || permissions.canPostToReadOnlyChannels() ||
+                    !muted.contains(currentLoggedUsername)
+                chatIsBroadcast = chatRoom?.chatRoom?.run {
                     broadcast
                 } ?: false
                 view.onRoomUpdated(userCanPost, chatIsBroadcast, userCanMod)
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index 6e8b9db154..0f8e210233 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -763,9 +763,17 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     }
 
     private fun setupMessageComposer(canPost: Boolean) {
-        if (isReadOnly && !canPost) {
+        if (!canPost) {
             text_room_is_read_only.isVisible = true
             input_container.isVisible = false
+            text_room_is_read_only.setText(
+                if (isReadOnly) {
+                    R.string.msg_this_room_is_read_only
+                } else {
+                    // Not a read-only channel but user has been muted.
+                    R.string.msg_muted_on_this_channel
+                }
+            )
         } else if (!isSubscribed && roomTypeOf(chatRoomType) !is RoomType.DirectMessage) {
             input_container.isVisible = false
             button_join_chat.isVisible = true
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/adapter/model/RoomUiModel.kt b/app/src/main/java/chat/rocket/android/chatrooms/adapter/model/RoomUiModel.kt
index 164c31d56c..56786461fe 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/adapter/model/RoomUiModel.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/adapter/model/RoomUiModel.kt
@@ -14,5 +14,6 @@ data class RoomUiModel(
     val alert: Boolean = false,
     val lastMessage: CharSequence? = null,
     val status: UserStatus? = null,
-    val username: String? = null
-)
\ No newline at end of file
+    val username: String? = null,
+    val muted: List<String> = emptyList()
+)
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt b/app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt
index 67d278a3fe..e119b94634 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt
@@ -56,7 +56,8 @@ class ChatRoomsPresenter @Inject constructor(
                             type = type.toString(),
                             name = username ?: name.toString(),
                             fullname = name.toString(),
-                            open = open
+                            open = open,
+                            muted = muted
                         )
                         loadChatRoom(entity, false)
                     }
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/viewmodel/ChatRoomsViewModel.kt b/app/src/main/java/chat/rocket/android/chatrooms/viewmodel/ChatRoomsViewModel.kt
index bbf7e2bf4d..90d097eaa0 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/viewmodel/ChatRoomsViewModel.kt
+++ b/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")
     }
 }
diff --git a/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt b/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
index 215cb33aa5..eefa1e7cd3 100644
--- a/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
+++ b/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
@@ -41,13 +41,12 @@ import timber.log.Timber
 import java.util.HashSet
 import kotlin.system.measureTimeMillis
 
-class DatabaseManager(val context: Application,
-                      val serverUrl: String) {
+class DatabaseManager(val context: Application, val serverUrl: String) {
 
     private val database: RCDatabase = androidx.room.Room.databaseBuilder(context,
-            RCDatabase::class.java, serverUrl.databaseName())
-            .fallbackToDestructiveMigration()
-            .build()
+        RCDatabase::class.java, serverUrl.databaseName())
+        .fallbackToDestructiveMigration()
+        .build()
     private val dbContext = newSingleThreadContext("$serverUrl-db-context")
     private val dbManagerContext = newSingleThreadContext("$serverUrl-db-manager-context")
 
@@ -124,11 +123,11 @@ class DatabaseManager(val context: Application,
             val toInsert = ArrayList<ChatRoomEntity>(batch.size / 2)
             val toUpdate = ArrayList<ChatRoomEntity>(batch.size)
             batch.forEach {
-                when(it.type) {
+                when (it.type) {
                     is Type.Removed -> toRemove.add(removeChatRoom(it.data))
                     is Type.Inserted -> insertChatRoom(it.data)?.let { toInsert.add(it) }
                     is Type.Updated -> {
-                        when(it.data) {
+                        when (it.data) {
                             is Subscription -> updateSubs[(it.data as Subscription).roomId] = it.data as Subscription
                             is Room -> updateRooms[(it.data as Room).id] = it.data as Room
                         }
@@ -154,10 +153,10 @@ class DatabaseManager(val context: Application,
         launch(dbManagerContext) {
             val user = userDao().getUser(myself.id)
             val entity = user?.copy(
-                    name = myself.name ?: user.name,
-                    username = myself.username ?: user.username,
-                    utcOffset = myself.utcOffset ?: user.utcOffset,
-                    status = myself.status?.toString() ?: user.status
+                name = myself.name ?: user.name,
+                username = myself.username ?: user.username,
+                utcOffset = myself.utcOffset ?: user.utcOffset,
+                status = myself.status?.toString() ?: user.status
             ) ?: myself.asUser().toEntity()
 
             Timber.d("UPDATING SELF: $entity")
@@ -187,7 +186,7 @@ class DatabaseManager(val context: Application,
     private suspend fun createMessageEntities(message: Message): Pair<MessageEntity, List<BaseMessageEntity>> {
         val messageEntity = message.toEntity()
         val list = mutableListOf<BaseMessageEntity>()
-        createAttachments(message)?.let { list.addAll(it)  }
+        createAttachments(message)?.let { list.addAll(it) }
         createFavoriteRelations(message)?.let { list.addAll(it) }
         createMentionRelations(message)?.let { list.addAll(it) }
         createChannelRelations(message)?.let { list.addAll(it) }
@@ -225,7 +224,7 @@ class DatabaseManager(val context: Application,
         val list = mutableListOf<UrlEntity>()
         message.urls!!.forEach { url ->
             list.add(UrlEntity(message.id, url.url, url.parsedUrl?.host, url.meta?.title,
-                    url.meta?.description, url.meta?.imageUrl))
+                url.meta?.description, url.meta?.imageUrl))
         }
 
         return list
@@ -329,7 +328,7 @@ class DatabaseManager(val context: Application,
     }
 
     private fun removeChatRoom(data: BaseRoom): String {
-        return when(data) {
+        return when (data) {
             is Subscription -> data.roomId
             else -> data.id
         }
@@ -344,14 +343,15 @@ class DatabaseManager(val context: Application,
                 insertUserIfMissing(user)
 
                 chatRoom.copy(
-                        name = name ?: chatRoom.name,
-                        fullname = fullName ?: chatRoom.fullname,
-                        ownerId = user?.id ?: chatRoom.ownerId,
-                        readonly = readonly,
-                        updatedAt = updatedAt ?: chatRoom.updatedAt,
-                        lastMessageText = mapLastMessageText(lastMessage),
-                        lastMessageUserId = lastMessage?.sender?.id,
-                        lastMessageTimestamp = lastMessage?.timestamp
+                    name = name ?: chatRoom.name,
+                    fullname = fullName ?: chatRoom.fullname,
+                    ownerId = user?.id ?: chatRoom.ownerId,
+                    readonly = readonly,
+                    updatedAt = updatedAt ?: chatRoom.updatedAt,
+                    lastMessageText = mapLastMessageText(lastMessage),
+                    lastMessageUserId = lastMessage?.sender?.id,
+                    lastMessageTimestamp = lastMessage?.timestamp,
+                    muted = muted
                 )
             }
         }
@@ -386,30 +386,32 @@ class DatabaseManager(val context: Application,
 
                 val chatRoom = current.chatRoom
                 chatRoom.copy(
-                        id = roomId,
-                        subscriptionId = id,
-                        type = type.toString(),
-                        name = name ?: throw NullPointerException(), // this should be filtered on the SDK
-                        fullname = fullName ?: chatRoom.fullname,
-                        userId = userId ?: chatRoom.userId,
-                        readonly = readonly ?: chatRoom.readonly,
-                        isDefault = isDefault,
-                        favorite = isFavorite,
-                        open = open,
-                        alert = alert,
-                        unread = unread,
-                        userMentions = userMentions ?: chatRoom.userMentions,
-                        groupMentions = groupMentions ?: chatRoom.groupMentions,
-                        updatedAt = updatedAt ?: chatRoom.updatedAt,
-                        timestamp = timestamp ?: chatRoom.timestamp,
-                        lastSeen = lastSeen ?: chatRoom.lastSeen
+                    id = roomId,
+                    subscriptionId = id,
+                    type = type.toString(),
+                    name = name
+                        ?: throw NullPointerException(), // this should be filtered on the SDK
+                    fullname = fullName ?: chatRoom.fullname,
+                    userId = userId ?: chatRoom.userId,
+                    readonly = readonly ?: chatRoom.readonly,
+                    isDefault = isDefault,
+                    favorite = isFavorite,
+                    open = open,
+                    alert = alert,
+                    unread = unread,
+                    userMentions = userMentions ?: chatRoom.userMentions,
+                    groupMentions = groupMentions ?: chatRoom.groupMentions,
+                    updatedAt = updatedAt ?: chatRoom.updatedAt,
+                    timestamp = timestamp ?: chatRoom.timestamp,
+                    lastSeen = lastSeen ?: chatRoom.lastSeen,
+                    muted = chatRoom.muted
                 )
             }
         }
     }
 
     private suspend fun insertChatRoom(data: BaseRoom): ChatRoomEntity? {
-        return when(data) {
+        return when (data) {
             is Room -> insertRoom(data)
             is Subscription -> insertSubscription(data)
             else -> null
@@ -451,7 +453,8 @@ class DatabaseManager(val context: Application,
             id = room.id,
             subscriptionId = subscription.id,
             type = room.type.toString(),
-            name = room.name ?: subscription.name ?: throw NullPointerException(), // this should be filtered on the SDK
+            name = room.name ?: subscription.name
+            ?: throw NullPointerException(), // this should be filtered on the SDK
             fullname = subscription.fullName ?: room.fullName,
             userId = userId,
             ownerId = room.user?.id,
@@ -506,7 +509,8 @@ class DatabaseManager(val context: Application,
                 lastMessageText = mapLastMessageText(lastMessage),
                 lastMessageUserId = lastMessage?.sender?.id,
                 lastMessageTimestamp = lastMessage?.timestamp,
-                broadcast = broadcast
+                broadcast = broadcast,
+                muted = room.muted
             )
         }
     }
@@ -579,6 +583,7 @@ sealed class Operation {
         val toUpdate: List<ChatRoomEntity>,
         val toRemove: List<String>
     ) : Operation()
+
     data class InsertRooms(val chatRooms: List<ChatRoomEntity>) : Operation()
     data class CleanInsertRooms(val chatRooms: List<ChatRoomEntity>) : Operation()
 
@@ -607,10 +612,10 @@ private fun Myself.asUser(): User {
 
 private fun String.databaseName(): String {
     val tmp = this.removePrefix("https://")
-            .removePrefix("http://")
-            .removeTrailingSlash()
-            .replace("/","-")
-            .replace(".", "_")
+        .removePrefix("http://")
+        .removeTrailingSlash()
+        .replace("/", "-")
+        .replace(".", "_")
 
     return "$tmp.db"
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/db/RCDatabase.kt b/app/src/main/java/chat/rocket/android/db/RCDatabase.kt
index ba451780e3..55fa447c0e 100644
--- a/app/src/main/java/chat/rocket/android/db/RCDatabase.kt
+++ b/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 = 12,
     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
+}
diff --git a/app/src/main/java/chat/rocket/android/db/model/ChatRoomEntity.kt b/app/src/main/java/chat/rocket/android/db/model/ChatRoomEntity.kt
index 3f8ae3d5fd..92403de4f8 100644
--- a/app/src/main/java/chat/rocket/android/db/model/ChatRoomEntity.kt
+++ b/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,
@@ -42,7 +45,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 +56,4 @@ data class ChatRoom(
     var status: String?,
     var lastMessageUserName: String?,
     var lastMessageUserFullName: String?
-)
\ No newline at end of file
+)
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5ff7c7f495..46ad43abdf 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -144,6 +144,8 @@
     <string name="msg_continue_with_wordpress">Continue with <b>WordPress</b></string> <!-- TODO Add translation -->
     <string name="msg_two_factor_authentication">Two-factor Authentication</string> <!-- TODO Add translation -->
     <string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
+    <!-- TODO - Add proper translation -->
+    <string name="msg_muted_on_this_channel">You are muted on this channel</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Privat</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 3269ccd08e..bd8bed67ff 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -161,6 +161,8 @@
     <string name="msg_view_less">view less</string>
     <!-- TODO - Add proper translation -->
     <string name="msg_permalink_copied">Permalink copied</string>
+    <!-- TODO - Add proper translation -->
+    <string name="msg_muted_on_this_channel">You are muted on this channel</string>
 
     <!-- Preferences messages -->
     <string name="msg_analytics_tracking">Analytics tracking</string> <!-- TODO Add translation -->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 26a74b7104..b9ea24ecb9 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -156,6 +156,8 @@
     <string name="msg_view_less">view less</string>
     <!-- TODO - Add proper translation -->
     <string name="msg_permalink_copied">Permalink copied</string>
+    <!-- TODO - Add proper translation -->
+    <string name="msg_muted_on_this_channel">You are muted on this channel</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Privé</string>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index a2145c7340..2ebf6a36e3 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -167,6 +167,8 @@
     <string name="msg_view_less">कम देखें</string>
     <!-- TODO - Add proper translation -->
     <string name="msg_permalink_copied">Permalink copied</string>
+    <!-- TODO - Add proper translation -->
+    <string name="msg_muted_on_this_channel">You are muted on this channel</string>
 
     <!-- Preferences messages -->
     <string name="msg_analytics_tracking">एनालिटिक्स ट्रैकिंग</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 0b4f6eed2e..4eb1427f7d 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -154,6 +154,8 @@
     <string name="msg_view_more">view more</string>
     <!-- TODO - Add proper translation -->
     <string name="msg_view_less">view less</string>
+    <!-- TODO - Add proper translation -->
+    <string name="msg_muted_on_this_channel">You are muted on this channel</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">プライベート</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 8faee241e6..b8cf776cda 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -154,6 +154,7 @@
     <string name="msg_view_less">visualizar menos</string>
     <!-- TODO - Add proper translation -->
     <string name="msg_permalink_copied">Permalink copiado</string>
+    <string name="msg_muted_on_this_channel">Você está silenciado neste canal</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Privado</string>
@@ -182,8 +183,8 @@
     <string name="message_welcome">Bem-vindo, %s</string>
     <string name="message_removed">Mensagem removida</string>
     <string name="message_pinned">Pinou uma mensagem:</string>
-    <string name="message_muted">Usuário %1$s entrou no modo mudo por %2$s</string>
-    <string name="message_unmuted">Usuário %1$s saiu do modo mudo por %2$s</string>
+    <string name="message_muted">Usuário %1$s foi silenciado por %2$s</string>
+    <string name="message_unmuted">Usuário %1$s saiu do modo silenciado por %2$s</string>
     <string name="message_role_add">%1$s foi definido %2$s por %3$s</string>
     <string name="message_role_removed">%1$s não é mais %2$s por %3$s</string>
     // TODO:Add proper translation.
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index fb7541bc5d..7c285d43be 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -151,6 +151,8 @@
     <string name="msg_view_more">больше</string>
     <string name="msg_view_less">меньше</string>
     <string name="msg_permalink_copied">Ссылка скопирована</string>
+    <!-- TODO - Add proper translation -->
+    <string name="msg_muted_on_this_channel">You are muted on this channel</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Приватный</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index cee409697a..5c582dc744 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -168,6 +168,8 @@
     <string name="msg_view_less">Daha az göster</string>
     <!-- TODO - Add proper translation -->
     <string name="msg_permalink_copied">Permalink copied</string>
+    <!-- TODO - Add proper translation -->
+    <string name="msg_muted_on_this_channel">You are muted on this channel</string>
     
     <!-- Preferences messages -->
     <string name="msg_analytics_tracking">İstatistik takibi</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index b3fd14faa2..2bfed877c2 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -153,6 +153,8 @@
     <string name="msg_view_less">view less</string>
     <!-- TODO - Add proper translation -->
     <string name="msg_permalink_copied">Permalink copied</string>
+    <!-- TODO - Add proper translation -->
+    <string name="msg_muted_on_this_channel">You are muted on this channel</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Приватний</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c4a98a25eb..101ddeb4d8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -179,6 +179,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="msg_delete_description">Are you sure you want to delete this message</string>
     <string name="msg_view_more">view more</string>
     <string name="msg_view_less">view less</string>
+    <string name="msg_muted_on_this_channel">You are muted on this channel</string>
     
     <!-- Preferences messages -->
     <string name="msg_analytics_tracking">Analytics tracking</string>

From b0d383b17d9c9e1c7b5892164512fb55d9b56bfa Mon Sep 17 00:00:00 2001
From: Leonardo Aramaki <leoaramaki@gmail.com>
Date: Mon, 12 Nov 2018 16:47:46 -0200
Subject: [PATCH 021/149] Observe channel changes through socket

---
 app/build-sdk.sh                              |  0
 .../chatroom/di/ChatRoomFragmentModule.kt     | 31 +++++++++++
 .../presentation/ChatRoomPresenter.kt         | 53 +++++++++++++++----
 .../chatroom/presentation/ChatRoomView.kt     | 13 ++---
 .../android/chatroom/ui/ChatRoomFragment.kt   | 21 ++++----
 .../chatrooms/adapter/RoomUiModelMapper.kt    |  3 +-
 .../chatrooms/adapter/model/RoomUiModel.kt    |  7 ++-
 .../infraestructure/ConnectionManager.kt      | 22 ++++++++
 gradlew                                       |  0
 9 files changed, 114 insertions(+), 36 deletions(-)
 mode change 100644 => 100755 app/build-sdk.sh
 mode change 100644 => 100755 gradlew

diff --git a/app/build-sdk.sh b/app/build-sdk.sh
old mode 100644
new mode 100755
diff --git a/app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt b/app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt
index caadc5e7ab..0bd6f38994 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt
@@ -1,14 +1,20 @@
 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.db.UserDao
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
+import chat.rocket.android.server.domain.GetCurrentUserInteractor
+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 +48,29 @@ 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
+    ): RoomUiModelMapper {
+        return RoomUiModelMapper(context, repository.get(serverUrl), userInteractor, serverUrl)
+    }
 }
diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
index a66560afb2..1b51be1eae 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
@@ -15,6 +15,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.RoomUiModelMapper
 import chat.rocket.android.core.behaviours.showMessage
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManager
@@ -34,7 +35,6 @@ import chat.rocket.android.server.domain.uploadMimeTypeFilter
 import chat.rocket.android.server.domain.useRealName
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
 import chat.rocket.android.server.infraestructure.state
-import chat.rocket.android.util.extension.compressImageAndGetByteArray
 import chat.rocket.android.util.extension.getByteArray
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
@@ -73,6 +73,7 @@ import chat.rocket.core.model.ChatRoom
 import chat.rocket.core.model.ChatRoomRole
 import chat.rocket.core.model.Command
 import chat.rocket.core.model.Message
+import chat.rocket.core.model.Room
 import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.DefaultDispatcher
 import kotlinx.coroutines.experimental.android.UI
@@ -81,7 +82,6 @@ import kotlinx.coroutines.experimental.launch
 import kotlinx.coroutines.experimental.withContext
 import org.threeten.bp.Instant
 import timber.log.Timber
-import java.io.InputStream
 import java.util.*
 import javax.inject.Inject
 
@@ -97,6 +97,7 @@ class ChatRoomPresenter @Inject constructor(
     private val analyticsManager: AnalyticsManager,
     private val userHelper: UserHelper,
     private val mapper: UiModelMapper,
+    private val roomMapper: RoomUiModelMapper,
     private val jobSchedulerInteractor: JobSchedulerInteractor,
     private val messageHelper: MessageHelper,
     private val dbManager: DatabaseManager,
@@ -119,6 +120,7 @@ class ChatRoomPresenter @Inject constructor(
     private var typingStatusSubscriptionId: String? = null
     private var lastState = manager.state
     private var typingStatusList = arrayListOf<String>()
+    private val roomChangesChannel = Channel<Room>(Channel.CONFLATED)
 
     fun setupChatRoom(
         roomId: String,
@@ -126,7 +128,7 @@ class ChatRoomPresenter @Inject constructor(
         roomType: String,
         chatRoomMessage: String? = null
     ) {
-        launchUI(strategy) {
+        launch(CommonPool + strategy.jobs) {
             try {
                 chatRoles = if (roomTypeOf(roomType) !is RoomType.DirectMessage) {
                     client.chatRoomRoles(roomType = roomTypeOf(roomType), roomName = roomName)
@@ -136,13 +138,22 @@ class ChatRoomPresenter @Inject constructor(
                 chatRoles = emptyList()
             } finally {
                 // User has at least an 'owner' or 'moderator' role.
-                val userCanMod = isOwnerOrMod()
+                val canModerate = isOwnerOrMod()
                 // Can post anyway if has the 'post-readonly' permission on server.
-                val userCanPost = userCanMod || permissions.canPostToReadOnlyChannels()
-                chatIsBroadcast = dbManager.getRoom(roomId)?.chatRoom?.run {
-                    broadcast
-                } ?: false
-                view.onRoomUpdated(userCanPost, chatIsBroadcast, userCanMod)
+                val room = dbManager.getRoom(roomId)
+                val canPost = canModerate || permissions.canPostToReadOnlyChannels()
+                room?.let {
+                    chatIsBroadcast = it.chatRoom.broadcast ?: false
+                    val roomUiModel = roomMapper.map(it, true)
+                    launchUI(strategy) {
+                        view.onRoomUpdated(roomUiModel = roomUiModel.copy(
+                            broadcast = chatIsBroadcast,
+                            canModerate = canModerate,
+                            canPost = canPost
+                        ))
+                    }
+                }
+
                 loadMessages(roomId, roomType, clearDataSet = true)
                 chatRoomMessage?.let { messageHelper.messageIdFromPermalink(it) }
                     ?.let { messageId ->
@@ -154,10 +165,26 @@ class ChatRoomPresenter @Inject constructor(
                             true
                         )
                     }
+                subscribeRoomChanges()
+            }
+        }
+    }
+
+    private suspend fun subscribeRoomChanges() {
+        chatRoomId?.let {
+            manager.addRoomChannel(it, roomChangesChannel)
+            for (room in roomChangesChannel) {
+                dbManager.getRoom(room.id)?.let {
+                    view.onRoomUpdated(roomMapper.map(chatRoom = it, showLastMessage = true))
+                }
             }
         }
     }
 
+    private fun unsubscribeRoomChanges() {
+        chatRoomId?.let { manager.removeRoomChannel(it)  }
+    }
+
     private fun isOwnerOrMod(): Boolean {
         return chatRoles.firstOrNull { it.user.username == currentLoggedUsername }?.roles?.any {
             it == "owner" || it == "moderator"
@@ -980,7 +1007,12 @@ class ChatRoomPresenter @Inject constructor(
             try {
                 retryIO("joinChat($chatRoomId)") { client.joinChat(chatRoomId) }
                 val canPost = permissions.canPostToReadOnlyChannels()
-                view.onJoined(canPost)
+                dbManager.getRoom(chatRoomId)?.let {
+                    val roomUiModel = roomMapper.map(it, true).copy(
+                        canPost = canPost)
+                    view.onJoined(roomUiModel = roomUiModel)
+                    view.onRoomUpdated(roomUiModel = roomUiModel)
+                }
             } catch (ex: RocketChatException) {
                 Timber.e(ex)
             }
@@ -1150,6 +1182,7 @@ class ChatRoomPresenter @Inject constructor(
     }
 
     fun disconnect() {
+        unsubscribeRoomChanges()
         unsubscribeTypingStatus()
         if (chatRoomId != null) {
             unsubscribeMessages(chatRoomId.toString())
diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomView.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomView.kt
index 7b226e62cb..15f241b2cb 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomView.kt
+++ b/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)
 
 }
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index 606e627bb6..fa05081139 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -48,6 +48,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.draw.main.ui.DRAWING_BYTE_ARRAY_EXTRA_DATA
 import chat.rocket.android.draw.main.ui.DrawingActivity
 import chat.rocket.android.emoji.ComposerEditText
@@ -380,17 +381,14 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         empty_chat_view.isVisible = adapter.itemCount == 0
     }
 
-    override fun onRoomUpdated(
-        userCanPost: Boolean,
-        channelIsBroadcast: Boolean,
-        userCanMod: Boolean
-    ) {
+    override fun onRoomUpdated(roomUiModel: RoomUiModel) {
         // TODO: We should rely solely on the user being able to post, but we cannot guarantee
         // that the "(channels|groups).roles" endpoint is supported by the server in use.
         ui {
-            setupMessageComposer(userCanPost)
-            isBroadcastChannel = channelIsBroadcast
-            if (isBroadcastChannel && !userCanMod) {
+            setupToolbar(roomUiModel.name.toString())
+            setupMessageComposer(roomUiModel)
+            isBroadcastChannel = roomUiModel.broadcast
+            if (isBroadcastChannel && !roomUiModel.canModerate) {
                 disableMenu = true
                 activity?.invalidateOptionsMenu()
             }
@@ -731,12 +729,11 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         }
     }
 
-    override fun onJoined(userCanPost: Boolean) {
+    override fun onJoined(roomUiModel: RoomUiModel) {
         ui {
             input_container.isVisible = true
             button_join_chat.isVisible = false
             isSubscribed = true
-            setupMessageComposer(userCanPost)
         }
     }
 
@@ -769,8 +766,8 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         }
     }
 
-    private fun setupMessageComposer(canPost: Boolean) {
-        if (isReadOnly && !canPost) {
+    private fun setupMessageComposer(roomUiModel: RoomUiModel) {
+        if (isReadOnly && !roomUiModel.canPost) {
             text_room_is_read_only.isVisible = true
             input_container.isVisible = false
         } else if (!isSubscribed && roomTypeOf(chatRoomType) !is RoomType.DirectMessage) {
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt b/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt
index a5e79b6c85..7abfcc4b5a 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt
@@ -8,8 +8,6 @@ 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.PublicSettings
 import chat.rocket.android.server.domain.showLastMessage
@@ -102,6 +100,7 @@ class RoomUiModelMapper(
         }
     }
 
+    @Synchronized
     fun map(chatRoom: ChatRoom, showLastMessage:Boolean = true): RoomUiModel {
         return with(chatRoom.chatRoom) {
             val isUnread = alert || unread > 0
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/adapter/model/RoomUiModel.kt b/app/src/main/java/chat/rocket/android/chatrooms/adapter/model/RoomUiModel.kt
index 164c31d56c..8b579e3575 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/adapter/model/RoomUiModel.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/adapter/model/RoomUiModel.kt
@@ -14,5 +14,8 @@ data class RoomUiModel(
     val alert: Boolean = false,
     val lastMessage: CharSequence? = null,
     val status: UserStatus? = null,
-    val username: String? = null
-)
\ No newline at end of file
+    val username: String? = null,
+    val broadcast: Boolean = false,
+    val canModerate: Boolean = false,
+    val canPost: Boolean = true
+)
diff --git a/app/src/main/java/chat/rocket/android/server/infraestructure/ConnectionManager.kt b/app/src/main/java/chat/rocket/android/server/infraestructure/ConnectionManager.kt
index 954ccfbe69..31fb21dd6b 100644
--- a/app/src/main/java/chat/rocket/android/server/infraestructure/ConnectionManager.kt
+++ b/app/src/main/java/chat/rocket/android/server/infraestructure/ConnectionManager.kt
@@ -22,6 +22,7 @@ import chat.rocket.core.internal.realtime.unsubscribe
 import chat.rocket.core.internal.rest.chatRooms
 import chat.rocket.core.model.Message
 import chat.rocket.core.model.Myself
+import chat.rocket.core.model.Room
 import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.Job
 import kotlinx.coroutines.experimental.channels.Channel
@@ -45,6 +46,7 @@ class ConnectionManager(
 
     private val roomMessagesChannels = LinkedHashMap<String, Channel<Message>>()
     private val userDataChannels = ArrayList<Channel<Myself>>()
+    private val roomsChannels = LinkedHashMap<String, Channel<Room>>()
     private val subscriptionIdMap = HashMap<String, String>()
 
     private var subscriptionId: String? = null
@@ -127,6 +129,18 @@ class ConnectionManager(
                 maxSize = 10) { batch ->
             Timber.d("processing Stream batch: ${batch.size} - $batch")
             dbManager.processChatRoomsBatch(batch)
+
+            batch.forEach {
+                //TODO - Do we need to handle Type.Removed and Type.Inserted here?
+                if (it.type == Type.Updated) {
+                    if (it.data is Room) {
+                        val room = it.data as Room
+                        roomsChannels[it.data.id]?.let { channel ->
+                            channel.offer(room)
+                        }
+                    }
+                }
+            }
         }
 
         val messagesActor = createBatchActor<Message>(messagesContext, parent = connectJob,
@@ -241,6 +255,14 @@ class ConnectionManager(
 
     fun removeUserDataChannel(channel: Channel<Myself>) = userDataChannels.remove(channel)
 
+    fun addRoomChannel(roomId: String, channel: Channel<Room>) {
+        roomsChannels[roomId] = channel
+    }
+
+    fun removeRoomChannel(roomId: String) {
+        roomsChannels.remove(roomId)
+    }
+
     fun subscribeRoomMessages(roomId: String, channel: Channel<Message>) {
         val oldSub = roomMessagesChannels.put(roomId, channel)
         if (oldSub != null) {
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755

From 722b8caa34ed197fd5e68f74000fc1a41bb12bf0 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Mon, 12 Nov 2018 12:54:02 -0800
Subject: [PATCH 022/149] Revert "Merge branch 'develop' of
 github.com:RocketChat/Rocket.Chat.Android into new/delete-my-account"

This reverts commit d0663f55ad4a2b7ef91c56c3a7af0f2a9aadba95, reversing
changes made to abacf9eec610a1d189ff2dad33195183832ad1ff.
---
 app/build-sdk.sh                       |   0
 app/src/main/ic_launcher-web.png       | Bin
 app/src/main/res/values-ja/strings.xml | 109 ++++++++++++-------------
 gradlew                                |   0
 4 files changed, 54 insertions(+), 55 deletions(-)
 mode change 100644 => 100755 app/build-sdk.sh
 mode change 100644 => 100755 app/src/main/ic_launcher-web.png
 mode change 100644 => 100755 gradlew

diff --git a/app/build-sdk.sh b/app/build-sdk.sh
old mode 100644
new mode 100755
diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 7e10131617..77b52b22b4 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -16,13 +16,13 @@
     <string name="title_members">メンバー</string>
     <string name="title_counted_members">メンバー (%d)</string>
     <string name="title_settings">設定</string>
-    <string name="title_preferences">環境設定</string>
-    <string name="title_change_password">パスワードの変更</string>
-    <string name="title_admin_panel">管理パネル</string>
+    <string name="title_preferences">Preferences</string> <!-- TODO Add translation -->
+    <string name="title_change_password">Change Password</string> <!-- TODO Add translation -->
+    <string name="title_admin_panel">Admin panel</string> <!-- TODO Add translation -->
     <string name="title_password">パスワードの変更</string>
     <string name="title_update_profile">プロフィールの更新</string>
     <string name="title_about">About</string>
-    <string name="title_create_channel">新しいチャネルを作成</string>
+    <string name="title_create_channel">新しいチャネルを作成します</string>
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
 
     <!-- Actions -->
@@ -46,21 +46,21 @@
     <string name="action_invisible">状態を隠す</string>
     <string name="action_drawing">絵を描く</string>
     <string name="action_save_to_gallery">ギャラリーに保存</string>
-    <string name="action_select_photo_from_gallery">ギャラリーの写真を選択</string>
-    <string name="action_take_photo">写真を撮る</string>
-    <string name="action_reset_avatar">アバターをリセット</string>
-    <string name="action_connect_server">サーバーに接続</string>
-    <string name="action_join_community">コミュニティに参加</string>
-    <string name="action_create_server">新規サーバーを作成</string>
-    <string name="action_register">登録</string>
-    <string name="action_confirm">確認</string>
+    <string name="action_select_photo_from_gallery">Select photo from gallery</string> <!-- TODO Add translation -->
+    <string name="action_take_photo">Take photo</string> <!-- TODO Add translation -->
+    <string name="action_reset_avatar">Reset avatar</string> <!-- TODO Add translation -->
+    <string name="action_connect_server">Connect with a server</string> <!-- TODO Add translation -->
+    <string name="action_join_community">Join in the community</string> <!-- TODO Add translation -->
+    <string name="action_create_server">Create a new server</string> <!-- TODO Add translation -->
+    <string name="action_register">Register</string> <!-- TODO Add translation -->
+    <string name="action_confirm">Confirm</string> <!-- TODO Add translation -->
     <string name="action_delete_account">Delete account</string> <!-- TODO Add translation -->
 
     <!-- Settings List -->
     <string-array name="settings_actions">
-        <item name="item_preferences">環境設定</item>
-        <item name="item_password">パスワードの変更</item>
-        <item name="item_password">アプリ情報</item>
+        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
+        <item name="item_password">Change Password</item> <!-- TODO Add translation -->
+        <item name="item_password">About</item> <!-- TODO Add translation -->
         <item name="item_share_app">アプリを共有する</item>
     </string-array>
 
@@ -78,28 +78,28 @@
     <string name="msg_avatar_url">アバター URL</string>
     <string name="msg_or_continue_using_social_accounts">またはソーシャルアカウントを使用する</string>
     <string name="msg_new_user">新規ユーザー? %1$s</string>
-    <string name="msg_forgot__your_password">パスワードをお忘れですか?</string>
+    <string name="msg_forgot__your_password">パスワードをお忘れですか? %1$s</string>
     <string name="msg_reset">リセット</string>
     <string name="msg_check_your_email_to_reset_your_password">メールが送信されました! パスワードを変更するためには、受信ボックスを確認してください。</string>
     <string name="msg_invalid_email">有効なメールアドレスを入力してください</string>
     <string name="msg_new_user_agreement">サインアップすることで、\n%1$s と %2$s に同意したとみなします。</string>
-    <string name="msg_today">今日</string>
+    <string name="msg_today">Today</string> <!-- TODO Add translation -->
     <string name="msg_yesterday">昨日</string>
     <string name="msg_message">メッセージ</string>
     <string name="msg_this_room_is_read_only">この部屋は読み取り専用です</string>
     <string name="msg_invalid_2fa_code">無効な 2FA コード</string>
     <string name="msg_invalid_file">無効なファイル</string>
     <string name="msg_invalid_server_url">無効なサーバー URL</string>
-    <string name="msg_content_description_log_in_using_facebook">Facebookでログイン</string>
-    <string name="msg_content_description_log_in_using_github">Githubでログイン</string>
-    <string name="msg_content_description_log_in_using_google">Googleでログイン</string>
-    <string name="msg_content_description_log_in_using_linkedin">Linkedinでログイン</string>
-    <string name="msg_content_description_log_in_using_meteor">Meteorでログイン</string>
-    <string name="msg_content_description_log_in_using_twitter">Twitterでログイン</string>
-    <string name="msg_content_description_log_in_using_gitlab">Gitlabでログイン</string>
-    <string name="msg_content_description_log_in_using_wordpress">WordPressでログイン</string>
-    <string name="msg_content_description_send_message">メッセージを送信</string>
-    <string name="msg_content_description_show_more_login_options">その他ログインオプション</string>
+    <string name="msg_content_description_log_in_using_facebook">Login using Facebook</string> <!-- TODO Add translation -->
+    <string name="msg_content_description_log_in_using_github">Login using Github</string> <!-- TODO Add translation -->
+    <string name="msg_content_description_log_in_using_google">Login using Google</string> <!-- TODO Add translation -->
+    <string name="msg_content_description_log_in_using_linkedin">Login using Linkedin</string> <!-- TODO Add translation -->
+    <string name="msg_content_description_log_in_using_meteor">Login using Meteor</string> <!-- TODO Add translation -->
+    <string name="msg_content_description_log_in_using_twitter">Login using Twitter</string> <!-- TODO Add translation -->
+    <string name="msg_content_description_log_in_using_gitlab">Login using Gitlab</string> <!-- TODO Add translation -->
+    <string name="msg_content_description_log_in_using_wordpress">Login using WordPress</string> <!-- TODO Add translation -->
+    <string name="msg_content_description_send_message">メッセージを送信</string> <!-- TODO Add translation -->
+    <string name="msg_content_description_show_more_login_options">Show more login options</string> <!-- TODO Translate-->
     <string name="msg_content_description_show_attachment_options">添付ファイルオプションを表示する</string>
     <string name="msg_you">あなた</string>
     <string name="msg_unknown">不明</string>
@@ -141,22 +141,22 @@
     <string name="msg_file_description">ファイルの説明</string>
     <string name="msg_send">送信</string>
     <string name="msg_sent_attachment">添付ファイルを送信しました</string>
-    <string name="msg_welcome_to_rocket_chat">Rocket.Chatへようこそ</string>
-    <string name="msg_team_communication">チームコミュニケーション</string>
-    <string name="msg_login_with_email"><b>e-mail</b>でログイン</string>
-    <string name="msg_create_account">アカウントを作成</string>
-    <string name="msg_continue_with_facebook"><b>Facebook</b>でログイン</string>
-    <string name="msg_continue_with_github"><b>Github</b>でログイン</string>
-    <string name="msg_continue_with_google"><b>Google</b>でログイン</string>
-    <string name="msg_continue_with_linkedin"><b>Linkedin</b>でログイン</string>
-    <string name="msg_continue_with_gitlab"><b>GitLab</b>でログイン</string>
-    <string name="msg_continue_with_wordpress"><b>WordPress</b>でログイン</string>
-    <string name="msg_two_factor_authentication">二要素認証</string>
-    <string name="msg__your_2fa_code">あなたの 2FA コードは何ですか?</string>
-
-    <string name="msg_view_more">更に表示</string>
-
-    <string name="msg_view_less">隠す</string>
+    <string name="msg_welcome_to_rocket_chat">Welcome to Rocket.Chat</string> <!-- TODO Add translation -->
+    <string name="msg_team_communication">Team Communication</string> <!-- TODO Add translation -->
+    <string name="msg_login_with_email">Login with <b>e-mail</b></string> <!-- TODO Add translation -->
+    <string name="msg_create_account">Create an account</string> <!-- TODO Add translation -->
+    <string name="msg_continue_with_facebook">Continue with <b>Facebook</b></string> <!-- TODO Add translation -->
+    <string name="msg_continue_with_github">Continue with <b>Github</b></string> <!-- TODO Add translation -->
+    <string name="msg_continue_with_google">Continue with <b>Google</b></string> <!-- TODO Add translation -->
+    <string name="msg_continue_with_linkedin">Continue with <b>Linkedin</b></string> <!-- TODO Add translation -->
+    <string name="msg_continue_with_gitlab">Continue with <b>GitLab</b></string> <!-- TODO Add translation -->
+    <string name="msg_continue_with_wordpress">Continue with <b>WordPress</b></string> <!-- TODO Add translation -->
+    <string name="msg_two_factor_authentication">Two-factor Authentication</string> <!-- TODO Add translation -->
+    <string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
+    <!-- TODO - Add proper translation -->
+    <string name="msg_view_more">view more</string>
+    <!-- TODO - Add proper translation -->
+    <string name="msg_view_less">view less</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">プライベート</string>
@@ -172,14 +172,14 @@
     <string name="msg_message_copied">メッセージをコピー</string>
     <string name="msg_delete_message">メッセージを削除</string>
     <string name="msg_delete_description">このメッセージを削除してもよろしいですか?</string>
-
-    <string name="msg_permalink_copied">パーマリンクのコピー</string>
+    <!-- TODO - Add proper translation -->
+    <string name="msg_permalink_copied">Permalink copied</string>
 
     <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">トラッキングの分析</string>
-    <string name="msg_send_analytics_tracking">アプリ改善のための匿名統計情報を送信する</string>
-    <string name="msg_do_not_send_analytics_tracking">アプリ改善のための匿名統計情報を送信しない</string>
-    <string name="msg_not_applicable_since_it_is_a_foss_version">FOSSバージョンのため、適用できません</string>
+    <string name="msg_analytics_tracking">Analytics tracking</string> <!-- TODO Add translation -->
+    <string name="msg_send_analytics_tracking">Send anonymous statics to help improving this app</string> <!-- TODO Add translation -->
+    <string name="msg_do_not_send_analytics_tracking">Do not send anonymous statics to help improving this app</string> <!-- TODO Add translation -->
+    <string name="msg_not_applicable_since_it_is_a_foss_version">Not applicable since it is a FOSS version</string> <!-- TODO Add translation -->
 
     <!-- System messages -->
     <string name="message_room_name_changed">ルーム名を %1$s から %2$s へ変更しました。</string>
@@ -211,7 +211,7 @@
     <string name="action_title_editing">メッセージの編集</string>
     <string name="action_msg_add_reaction">リアクションする</string>
     <!-- TODO - Add proper translation -->
-    <string name="action_msg_copy_permalink">パーマリンクのコピー</string>
+    <string name="action_msg_copy_permalink">Copy permalink</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">編集は許可されていません</string>
@@ -296,7 +296,7 @@
     <string name="menu_chatroom_sort">ソート</string>
     <string name="dialog_sort_title">ソート</string>
     <string name="dialog_sort_by_alphabet">アルファベット順</string>
-    <string name="dialog_sort_by_activity">アクティビティ順</string>
+    <string name="dialog_sort_by_activity">アクティビティで並べ替える</string>
     <string name="dialog_group_by_type">グループ別</string>
     <string name="dialog_group_favourites">お気に入りのグループ</string>
     <string name="chatroom_header">ヘッダ</string>
@@ -311,13 +311,12 @@
     <string name="header_unknown">不明</string>
 
     <!--Notifications-->
-    <string name="share_label">共有メッセージの編集</string>
+    <string name="share_label">Edit shared message</string> <!-- TODO Add translation -->
     <string name="notif_action_reply_hint">返信</string>
     <string name="notif_error_sending">送信に失敗しました。もう一度お試しください。</string>
     <string name="notif_success_sending">メッセージは %1$s に送信されました!</string>
     <string name="read_by">読者</string>
     <string name="message_information_title">メッセージ情報</string>
-
-    <string name="message_room_changed_privacy">ルームタイプを %2$s から %1$s に変更しました</string>
-
+    <!--TODO - Add proper translation-->
+    <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
 </resources>
\ No newline at end of file
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755

From b6496508dbd987cc321b9976419f8d38f40dab0d Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Tue, 13 Nov 2018 13:23:15 +0530
Subject: [PATCH 023/149] conflicts resolved, code improved

---
 .../android/settings/ui/SettingsFragment.kt   |  11 +-
 app/src/main/res/values-ja/strings.xml        | 113 +++++++++---------
 2 files changed, 60 insertions(+), 64 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
index 5e20df4c7b..524bb60d4d 100644
--- a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
@@ -87,21 +87,16 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
                 shareIntent.putExtra(Intent.EXTRA_TEXT, shareSub)
                 startActivity(Intent.createChooser(shareIntent, getString(R.string.msg_share_using)))
             }
-            resources.getString(R.string.title_rate_us) ->
-                startAppPlayStore()
+            resources.getString(R.string.title_rate_us) -> startAppPlayStore()
         }
     }
 
-    fun getMarketAppLink(): String {
-        return getString(R.string.market_link)
-    }
-    fun getMarketWebLink(): String {
-        return getString(R.string.play_store_link)
-    }
     private fun startAppPlayStore() {
         try {
+            fun getMarketAppLink()= getString(R.string.market_link)
             startActivity(Intent(Intent.ACTION_VIEW, getMarketAppLink().toUri()))
         } catch (error: ActivityNotFoundException) {
+            fun getMarketWebLink() = getString(R.string.play_store_link)
             startActivity(Intent(Intent.ACTION_VIEW, getMarketWebLink().toUri()))
         }
     }
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index cabf49b3ee..4a325b0e0e 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -16,15 +16,15 @@
     <string name="title_members">メンバー</string>
     <string name="title_counted_members">メンバー (%d)</string>
     <string name="title_settings">設定</string>
-    <string name="title_preferences">Preferences</string> <!-- TODO Add translation -->
-    <string name="title_change_password">Change Password</string> <!-- TODO Add translation -->
+    <string name="title_preferences">環境設定</string>
+    <string name="title_change_password">パスワードの変更</string>
     <string name="title_rate_us">私たちを評価してください</string>
-    <string name="title_admin_panel">Admin panel</string> <!-- TODO Add translation -->
+    <string name="title_admin_panel">管理パネル</string>
     <string name="title_password">パスワードの変更</string>
     <string name="title_update_profile">プロフィールの更新</string>
     <string name="title_about">About</string>
-    <string name="title_create_channel">新しいチャネルを作成します</string>
-    <string name="title_confirmation">Are You Sure you want to logout?</string> <!-- TODO Add translation -->
+    <string name="title_create_channel">新しいチャネルを作成</string>
+    <string name="title_confirmation">ログアウトしますか?</string>
 
 
     <!-- Actions -->
@@ -38,7 +38,7 @@
     <string name="action_create_channel">チャンネル作成</string>
     <string name="action_create">作ります</string>
     <string name="action_logout">ログアウト</string>
-    <string name="action_stay">Stay</string> <!-- TODO Add translation -->
+    <string name="action_stay">いいえ</string>
     <string name="action_files">ファイル</string>
     <string name="action_confirm_password">変更したパスワードの確認</string>
     <string name="action_join_chat">チャットに参加</string>
@@ -49,22 +49,22 @@
     <string name="action_invisible">状態を隠す</string>
     <string name="action_drawing">絵を描く</string>
     <string name="action_save_to_gallery">ギャラリーに保存</string>
-    <string name="action_select_photo_from_gallery">Select photo from gallery</string> <!-- TODO Add translation -->
-    <string name="action_take_photo">Take photo</string> <!-- TODO Add translation -->
-    <string name="action_reset_avatar">Reset avatar</string> <!-- TODO Add translation -->
-    <string name="action_connect_server">Connect with a server</string> <!-- TODO Add translation -->
-    <string name="action_join_community">Join in the community</string> <!-- TODO Add translation -->
-    <string name="action_create_server">Create a new server</string> <!-- TODO Add translation -->
-    <string name="action_register">Register</string> <!-- TODO Add translation -->
-    <string name="action_confirm">Confirm</string> <!-- TODO Add translation -->
+    <string name="action_select_photo_from_gallery">ギャラリーの写真を選択</string>
+    <string name="action_take_photo">写真を撮る</string>
+    <string name="action_reset_avatar">アバターをリセット</string>
+    <string name="action_connect_server">サーバーに接続</string>
+    <string name="action_join_community">コミュニティに参加</string>
+    <string name="action_create_server">新規サーバーを作成</string>
+    <string name="action_register">登録</string>
+    <string name="action_confirm">確認</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
-        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
-        <item name="item_password">Change Password</item> <!-- TODO Add translation -->
+        <item name="item_preferences">環境設定</item>
+        <item name="item_password">パスワードの変更</item>
         <item name="item_share_app">アプリを共有する</item>
         <item name="item_rate_us">私たちを評価してください</item>
-        <item name="item_password">About</item> <!-- TODO Add translation -->
+        <item name="item_password">アプリ情報</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -81,28 +81,28 @@
     <string name="msg_avatar_url">アバター URL</string>
     <string name="msg_or_continue_using_social_accounts">またはソーシャルアカウントを使用する</string>
     <string name="msg_new_user">新規ユーザー? %1$s</string>
-    <string name="msg_forgot__your_password">パスワードをお忘れですか? %1$s</string>
+    <string name="msg_forgot__your_password">パスワードをお忘れですか?</string>
     <string name="msg_reset">リセット</string>
     <string name="msg_check_your_email_to_reset_your_password">メールが送信されました! パスワードを変更するためには、受信ボックスを確認してください。</string>
     <string name="msg_invalid_email">有効なメールアドレスを入力してください</string>
     <string name="msg_new_user_agreement">サインアップすることで、\n%1$s と %2$s に同意したとみなします。</string>
-    <string name="msg_today">Today</string> <!-- TODO Add translation -->
+    <string name="msg_today">今日</string>
     <string name="msg_yesterday">昨日</string>
     <string name="msg_message">メッセージ</string>
     <string name="msg_this_room_is_read_only">この部屋は読み取り専用です</string>
     <string name="msg_invalid_2fa_code">無効な 2FA コード</string>
     <string name="msg_invalid_file">無効なファイル</string>
     <string name="msg_invalid_server_url">無効なサーバー URL</string>
-    <string name="msg_content_description_log_in_using_facebook">Login using Facebook</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_log_in_using_github">Login using Github</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_log_in_using_google">Login using Google</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_log_in_using_linkedin">Login using Linkedin</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_log_in_using_meteor">Login using Meteor</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_log_in_using_twitter">Login using Twitter</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_log_in_using_gitlab">Login using Gitlab</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_log_in_using_wordpress">Login using WordPress</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_send_message">メッセージを送信</string> <!-- TODO Add translation -->
-    <string name="msg_content_description_show_more_login_options">Show more login options</string> <!-- TODO Translate-->
+    <string name="msg_content_description_log_in_using_facebook">Facebookでログイン</string>
+    <string name="msg_content_description_log_in_using_github">Githubでログイン</string>
+    <string name="msg_content_description_log_in_using_google">Googleでログイン</string>
+    <string name="msg_content_description_log_in_using_linkedin">Linkedinでログイン</string>
+    <string name="msg_content_description_log_in_using_meteor">Meteorでログイン</string>
+    <string name="msg_content_description_log_in_using_twitter">Twitterでログイン</string>
+    <string name="msg_content_description_log_in_using_gitlab">Gitlabでログイン</string>
+    <string name="msg_content_description_log_in_using_wordpress">WordPressでログイン</string>
+    <string name="msg_content_description_send_message">メッセージを送信</string>
+    <string name="msg_content_description_show_more_login_options">その他ログインオプション</string>
     <string name="msg_content_description_show_attachment_options">添付ファイルオプションを表示する</string>
     <string name="msg_you">あなた</string>
     <string name="msg_unknown">不明</string>
@@ -144,22 +144,22 @@
     <string name="msg_file_description">ファイルの説明</string>
     <string name="msg_send">送信</string>
     <string name="msg_sent_attachment">添付ファイルを送信しました</string>
-    <string name="msg_welcome_to_rocket_chat">Welcome to Rocket.Chat</string> <!-- TODO Add translation -->
-    <string name="msg_team_communication">Team Communication</string> <!-- TODO Add translation -->
-    <string name="msg_login_with_email">Login with <b>e-mail</b></string> <!-- TODO Add translation -->
-    <string name="msg_create_account">Create an account</string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_facebook">Continue with <b>Facebook</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_github">Continue with <b>Github</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_google">Continue with <b>Google</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_linkedin">Continue with <b>Linkedin</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_gitlab">Continue with <b>GitLab</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_wordpress">Continue with <b>WordPress</b></string> <!-- TODO Add translation -->
-    <string name="msg_two_factor_authentication">Two-factor Authentication</string> <!-- TODO Add translation -->
-    <string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
-    <!-- TODO - Add proper translation -->
-    <string name="msg_view_more">view more</string>
-    <!-- TODO - Add proper translation -->
-    <string name="msg_view_less">view less</string>
+    <string name="msg_welcome_to_rocket_chat">Rocket.Chatへようこそ</string>
+    <string name="msg_team_communication">チームコミュニケーション</string>
+    <string name="msg_login_with_email"><b>e-mail</b>でログイン</string>
+    <string name="msg_create_account">アカウントを作成</string>
+    <string name="msg_continue_with_facebook"><b>Facebook</b>でログイン</string>
+    <string name="msg_continue_with_github"><b>Github</b>でログイン</string>
+    <string name="msg_continue_with_google"><b>Google</b>でログイン</string>
+    <string name="msg_continue_with_linkedin"><b>Linkedin</b>でログイン</string>
+    <string name="msg_continue_with_gitlab"><b>GitLab</b>でログイン</string>
+    <string name="msg_continue_with_wordpress"><b>WordPress</b>でログイン</string>
+    <string name="msg_two_factor_authentication">二要素認証</string>
+    <string name="msg__your_2fa_code">あなたの 2FA コードは何ですか?</string>
+
+    <string name="msg_view_more">更に表示</string>
+
+    <string name="msg_view_less">隠す</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">プライベート</string>
@@ -175,14 +175,14 @@
     <string name="msg_message_copied">メッセージをコピー</string>
     <string name="msg_delete_message">メッセージを削除</string>
     <string name="msg_delete_description">このメッセージを削除してもよろしいですか?</string>
-    <!-- TODO - Add proper translation -->
-    <string name="msg_permalink_copied">Permalink copied</string>
+
+    <string name="msg_permalink_copied">パーマリンクのコピー</string>
 
     <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">Analytics tracking</string> <!-- TODO Add translation -->
-    <string name="msg_send_analytics_tracking">Send anonymous statics to help improving this app</string> <!-- TODO Add translation -->
-    <string name="msg_do_not_send_analytics_tracking">Do not send anonymous statics to help improving this app</string> <!-- TODO Add translation -->
-    <string name="msg_not_applicable_since_it_is_a_foss_version">Not applicable since it is a FOSS version</string> <!-- TODO Add translation -->
+    <string name="msg_analytics_tracking">トラッキングの分析</string>
+    <string name="msg_send_analytics_tracking">アプリ改善のための匿名統計情報を送信する</string>
+    <string name="msg_do_not_send_analytics_tracking">アプリ改善のための匿名統計情報を送信しない</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">FOSSバージョンのため、適用できません</string>
 
     <!-- System messages -->
     <string name="message_room_name_changed">ルーム名を %1$s から %2$s へ変更しました。</string>
@@ -214,7 +214,7 @@
     <string name="action_title_editing">メッセージの編集</string>
     <string name="action_msg_add_reaction">リアクションする</string>
     <!-- TODO - Add proper translation -->
-    <string name="action_msg_copy_permalink">Copy permalink</string>
+    <string name="action_msg_copy_permalink">パーマリンクのコピー</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">編集は許可されていません</string>
@@ -299,7 +299,7 @@
     <string name="menu_chatroom_sort">ソート</string>
     <string name="dialog_sort_title">ソート</string>
     <string name="dialog_sort_by_alphabet">アルファベット順</string>
-    <string name="dialog_sort_by_activity">アクティビティで並べ替える</string>
+    <string name="dialog_sort_by_activity">アクティビティ順</string>
     <string name="dialog_group_by_type">グループ別</string>
     <string name="dialog_group_favourites">お気に入りのグループ</string>
     <string name="chatroom_header">ヘッダ</string>
@@ -314,12 +314,13 @@
     <string name="header_unknown">不明</string>
 
     <!--Notifications-->
-    <string name="share_label">Edit shared message</string> <!-- TODO Add translation -->
+    <string name="share_label">共有メッセージの編集</string>
     <string name="notif_action_reply_hint">返信</string>
     <string name="notif_error_sending">送信に失敗しました。もう一度お試しください。</string>
     <string name="notif_success_sending">メッセージは %1$s に送信されました!</string>
     <string name="read_by">読者</string>
     <string name="message_information_title">メッセージ情報</string>
-    <!--TODO - Add proper translation-->
-    <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
+
+    <string name="message_room_changed_privacy">ルームタイプを %2$s から %1$s に変更しました</string>
+
 </resources>
\ No newline at end of file

From c3037e3e957682fbea5974e7650c10e808352ee3 Mon Sep 17 00:00:00 2001
From: Lucio Maciel <luciofm@gmail.com>
Date: Tue, 13 Nov 2018 16:38:54 -0300
Subject: [PATCH 024/149] retryDB

---
 .../infrastructure/ChatRoomsRepository.kt     | 10 ++-
 .../chat/rocket/android/db/DatabaseManager.kt | 76 ++++++++++---------
 .../infraestructure/DatabaseMessageMapper.kt  | 41 ++--------
 .../DatabaseMessagesRepository.kt             | 47 +++++++-----
 .../main/java/chat/rocket/android/util/IO.kt  | 29 +++++++
 5 files changed, 114 insertions(+), 89 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatrooms/infrastructure/ChatRoomsRepository.kt b/app/src/main/java/chat/rocket/android/chatrooms/infrastructure/ChatRoomsRepository.kt
index ae36116d91..41850a4cb1 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/infrastructure/ChatRoomsRepository.kt
+++ b/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,
diff --git a/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt b/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
index eefa1e7cd3..f72f45fc27 100644
--- a/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
+++ b/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
@@ -19,6 +19,7 @@ import chat.rocket.android.util.extensions.exhaustive
 import chat.rocket.android.util.extensions.removeTrailingSlash
 import chat.rocket.android.util.extensions.toEntity
 import chat.rocket.android.util.extensions.userId
+import chat.rocket.android.util.retryDB
 import chat.rocket.common.model.BaseRoom
 import chat.rocket.common.model.RoomType
 import chat.rocket.common.model.SimpleUser
@@ -96,7 +97,9 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
     }
 
     suspend fun getRoom(id: String) = withContext(dbManagerContext) {
-        chatRoomDao().get(id)
+        retryDB("getRoom($id)") {
+            chatRoomDao().get(id)
+        }
     }
 
     fun processUsersBatch(users: List<User>) {
@@ -151,7 +154,7 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
 
     fun updateSelfUser(myself: Myself) {
         launch(dbManagerContext) {
-            val user = userDao().getUser(myself.id)
+            val user = retryDB("getUser(${myself.id})") { userDao().getUser(myself.id) }
             val entity = user?.copy(
                 name = myself.name ?: user.name,
                 username = myself.username ?: user.username,
@@ -335,7 +338,7 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
     }
 
     private suspend fun updateRoom(data: Room): ChatRoomEntity? {
-        return chatRoomDao().get(data.id)?.let { current ->
+        return retryDB("getChatRoom(${data.id})") { chatRoomDao().get(data.id) }?.let { current ->
             with(data) {
                 val chatRoom = current.chatRoom
 
@@ -373,7 +376,7 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
         context.getString(R.string.msg_sent_attachment)
 
     private suspend fun updateSubscription(data: Subscription): ChatRoomEntity? {
-        return chatRoomDao().get(data.roomId)?.let { current ->
+        return retryDB("getRoom(${data.roomId}") { chatRoomDao().get(data.roomId) }?.let { current ->
             with(data) {
 
                 val userId = if (type is RoomType.DirectMessage) {
@@ -539,39 +542,42 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
         }
     }
 
-    private fun findUser(userId: String): String? = userDao().findUser(userId)
+    private suspend fun findUser(userId: String): String? =
+        retryDB("findUser($userId)") { userDao().findUser(userId) }
 
-    private fun doOperation(operation: Operation) {
-        when (operation) {
-            is Operation.ClearStatus -> userDao().clearStatus()
-            is Operation.UpdateRooms -> {
-                Timber.d("Running ChatRooms transaction: remove: ${operation.toRemove} - insert: ${operation.toInsert} - update: ${operation.toUpdate}")
+    private suspend fun doOperation(operation: Operation) {
+        retryDB(description = "doOperation($operation)") {
+            when (operation) {
+                is Operation.ClearStatus -> userDao().clearStatus()
+                is Operation.UpdateRooms -> {
+                    Timber.d("Running ChatRooms transaction: remove: ${operation.toRemove} - insert: ${operation.toInsert} - update: ${operation.toUpdate}")
 
-                chatRoomDao().update(operation.toInsert, operation.toUpdate, operation.toRemove)
-            }
-            is Operation.InsertRooms -> {
-                chatRoomDao().insertOrReplace(operation.chatRooms)
-            }
-            is Operation.CleanInsertRooms -> {
-                chatRoomDao().cleanInsert(operation.chatRooms)
-            }
-            is Operation.InsertUsers -> {
-                val time = measureTimeMillis { userDao().upsert(operation.users) }
-                Timber.d("Upserted users batch(${operation.users.size}) in $time MS")
-            }
-            is Operation.InsertUser -> {
-                userDao().insert(operation.user)
-            }
-            is Operation.UpsertUser -> {
-                userDao().upsert(operation.user)
-            }
-            is Operation.InsertMessages -> {
-                messageDao().insert(operation.list)
-            }
-            is Operation.SaveLastSync -> {
-                messageDao().saveLastSync(operation.sync)
-            }
-        }.exhaustive
+                    chatRoomDao().update(operation.toInsert, operation.toUpdate, operation.toRemove)
+                }
+                is Operation.InsertRooms -> {
+                    chatRoomDao().insertOrReplace(operation.chatRooms)
+                }
+                is Operation.CleanInsertRooms -> {
+                    chatRoomDao().cleanInsert(operation.chatRooms)
+                }
+                is Operation.InsertUsers -> {
+                    val time = measureTimeMillis { userDao().upsert(operation.users) }
+                    Timber.d("Upserted users batch(${operation.users.size}) in $time MS")
+                }
+                is Operation.InsertUser -> {
+                    userDao().insert(operation.user)
+                }
+                is Operation.UpsertUser -> {
+                    userDao().upsert(operation.user)
+                }
+                is Operation.InsertMessages -> {
+                    messageDao().insert(operation.list)
+                }
+                is Operation.SaveLastSync -> {
+                    messageDao().saveLastSync(operation.sync)
+                }
+            }.exhaustive
+        }
     }
 }
 
diff --git a/app/src/main/java/chat/rocket/android/server/infraestructure/DatabaseMessageMapper.kt b/app/src/main/java/chat/rocket/android/server/infraestructure/DatabaseMessageMapper.kt
index 316883fec5..a66e7ce15f 100644
--- a/app/src/main/java/chat/rocket/android/server/infraestructure/DatabaseMessageMapper.kt
+++ b/app/src/main/java/chat/rocket/android/server/infraestructure/DatabaseMessageMapper.kt
@@ -7,6 +7,7 @@ import chat.rocket.android.db.model.FullMessage
 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.util.retryDB
 import chat.rocket.common.model.SimpleRoom
 import chat.rocket.common.model.SimpleUser
 import chat.rocket.core.model.Message
@@ -135,14 +136,18 @@ class DatabaseMessageMapper(private val dbManager: DatabaseManager) {
             with(attachment) {
                 val fields = if (hasFields) {
                     withContext(CommonPool) {
-                        dbManager.messageDao().getAttachmentFields(attachment._id)
+                        retryDB("getAttachmentFields(${attachment._id})") {
+                            dbManager.messageDao().getAttachmentFields(attachment._id)
+                        }
                     }.map { Field(it.title, it.value) }
                 } else {
                     null
                 }
                 val actions = if (hasActions) {
                     withContext(CommonPool) {
-                        dbManager.messageDao().getAttachmentActions(attachment._id)
+                        retryDB("getAttachmentActions(${attachment._id})") {
+                            dbManager.messageDao().getAttachmentActions(attachment._id)
+                        }
                     }.mapNotNull { mapAction(it) }
                 } else {
                     null
@@ -183,29 +188,6 @@ class DatabaseMessageMapper(private val dbManager: DatabaseManager) {
         return list
     }
 
-    /*private suspend fun mapColorAttachmentWithFields(entity: AttachmentEntity): ColorAttachment {
-        val fields = withContext(CommonPool) {
-            dbManager.messageDao().getAttachmentFields(entity._id)
-        }.map { Field(it.title, it.value) }
-        return with(entity) {
-            ColorAttachment(
-                color = Color.Custom(color ?: DEFAULT_COLOR_STR),
-                text = text ?: "",
-                fallback = fallback,
-                fields = fields)
-        }
-    }
-
-    private suspend fun mapActionAttachment(attachment: AttachmentEntity): ActionsAttachment {
-        val actions = withContext(CommonPool) {
-            dbManager.messageDao().getAttachmentActions(attachment._id)
-        }.mapNotNull { mapAction(it) }
-        return with(attachment) {
-            // TODO - remove the default "vertical" value from here...
-            ActionsAttachment(title, actions, buttonAlignment ?: "vertical")
-        }
-    }*/
-
     private fun mapAction(action: AttachmentActionEntity): Action? {
         return when (action.type) {
             "button" -> ButtonAction(action.type, action.text, action.url, action.isWebView,
@@ -214,13 +196,4 @@ class DatabaseMessageMapper(private val dbManager: DatabaseManager) {
             else -> null
         }
     }
-
-    /*private suspend fun mapAuthorAttachment(attachment: AttachmentEntity): AuthorAttachment {
-        val fields = withContext(CommonPool) {
-            dbManager.messageDao().getAttachmentFields(attachment._id)
-        }.map { Field(it.title, it.value) }
-        return with(attachment) {
-            AuthorAttachment(authorLink!!, authorIcon, authorName, fields)
-        }
-    }*/
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/server/infraestructure/DatabaseMessagesRepository.kt b/app/src/main/java/chat/rocket/android/server/infraestructure/DatabaseMessagesRepository.kt
index 8d8fbd414f..b28e6d12cd 100644
--- a/app/src/main/java/chat/rocket/android/server/infraestructure/DatabaseMessagesRepository.kt
+++ b/app/src/main/java/chat/rocket/android/server/infraestructure/DatabaseMessagesRepository.kt
@@ -4,6 +4,7 @@ import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.db.Operation
 import chat.rocket.android.db.model.MessagesSync
 import chat.rocket.android.server.domain.MessagesRepository
+import chat.rocket.android.util.retryDB
 import chat.rocket.core.model.Message
 import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.withContext
@@ -14,25 +15,31 @@ class DatabaseMessagesRepository(
 ) : MessagesRepository {
 
     override suspend fun getById(id: String): Message? = withContext(CommonPool) {
-        dbManager.messageDao().getMessageById(id)?.let { message -> mapper.map(message) }
+        retryDB("getMessageById($id)") {
+            dbManager.messageDao().getMessageById(id)?.let { message -> mapper.map(message) }
+        }
     }
 
     override suspend fun getByRoomId(roomId: String): List<Message> = withContext(CommonPool) {
         // FIXME - investigate how to avoid this distinctBy here, since DAO is returning a lot of
         // duplicate rows (something related to our JOINS and relations on Room)
-        dbManager.messageDao().getMessagesByRoomId(roomId)
-                .distinctBy { it.message.message.id }
-                .let { messages ->
-                    mapper.map(messages)
-                }
+        retryDB("getMessagesByRoomId($roomId)") {
+            dbManager.messageDao().getMessagesByRoomId(roomId)
+                    .distinctBy { it.message.message.id }
+                    .let { messages ->
+                        mapper.map(messages)
+                    }
+        }
     }
 
     override suspend fun getRecentMessages(roomId: String, count: Long): List<Message> = withContext(CommonPool) {
-        dbManager.messageDao().getRecentMessagesByRoomId(roomId, count)
-                .distinctBy { it.message.message.id }
-                .let { messages ->
-                    mapper.map(messages)
-                }
+        retryDB("getRecentMessagesByRoomId($roomId, $count)") {
+            dbManager.messageDao().getRecentMessagesByRoomId(roomId, count)
+                    .distinctBy { it.message.message.id }
+                    .let { messages ->
+                        mapper.map(messages)
+                    }
+        }
     }
 
     override suspend fun save(message: Message) {
@@ -45,20 +52,24 @@ class DatabaseMessagesRepository(
 
     override suspend fun removeById(id: String) {
         withContext(CommonPool) {
-            dbManager.messageDao().delete(id)
+            retryDB("delete($id)") { dbManager.messageDao().delete(id) }
         }
     }
 
     override suspend fun removeByRoomId(roomId: String) {
         withContext(CommonPool) {
-            dbManager.messageDao().deleteByRoomId(roomId)
+            retryDB("deleteByRoomId($roomId)") {
+                dbManager.messageDao().deleteByRoomId(roomId)
+            }
         }
     }
 
     override suspend fun getAllUnsent(): List<Message> = withContext(CommonPool) {
-        dbManager.messageDao().getUnsentMessages()
-                .distinctBy { it.message.message.id }
-                .let { mapper.map(it) }
+        retryDB("getUnsentMessages") {
+            dbManager.messageDao().getUnsentMessages()
+                    .distinctBy { it.message.message.id }
+                    .let { mapper.map(it) }
+        }
     }
 
     override suspend fun saveLastSyncDate(roomId: String, timeMillis: Long) {
@@ -66,6 +77,8 @@ class DatabaseMessagesRepository(
     }
 
     override suspend fun getLastSyncDate(roomId: String): Long? = withContext(CommonPool) {
-        dbManager.messageDao().getLastSync(roomId)?.let { it.timestamp }
+        retryDB("getLastSync($roomId)") {
+            dbManager.messageDao().getLastSync(roomId)?.let { it.timestamp }
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/util/IO.kt b/app/src/main/java/chat/rocket/android/util/IO.kt
index 9b918cf198..7818f6db67 100644
--- a/app/src/main/java/chat/rocket/android/util/IO.kt
+++ b/app/src/main/java/chat/rocket/android/util/IO.kt
@@ -1,5 +1,6 @@
 package chat.rocket.android.util
 
+import android.database.sqlite.SQLiteDatabaseLockedException
 import chat.rocket.common.RocketChatNetworkErrorException
 import kotlinx.coroutines.experimental.TimeoutCancellationException
 import kotlinx.coroutines.experimental.delay
@@ -8,6 +9,7 @@ import timber.log.Timber
 import kotlin.coroutines.experimental.coroutineContext
 
 const val DEFAULT_RETRY = 3
+private const val DEFAULT_DB_RETRY = 5
 
 suspend fun <T> retryIO(
         description: String = "<missing description>",
@@ -32,6 +34,33 @@ suspend fun <T> retryIO(
         currentDelay = (currentDelay * factor).toLong().coerceAtMost(maxDelay)
     }
 
+    if (!coroutineContext.isActive) throw TimeoutCancellationException("job canceled")
+    return block() // last attempt
+}
+
+suspend fun <T> retryDB(
+        description: String = "<missing description>",
+        times: Int = DEFAULT_DB_RETRY,
+        initialDelay: Long = 100, // 0.1 second
+        maxDelay: Long = 500,    // 0.5 second
+        factor: Double = 1.2,
+        block: suspend () -> T): T
+{
+    var currentDelay = initialDelay
+    repeat(times - 1) { currentTry ->
+        if (!coroutineContext.isActive) throw TimeoutCancellationException("job canceled")
+        try {
+            return block()
+        } catch (e: SQLiteDatabaseLockedException) {
+            Timber.d(e, "failed call($currentTry): $description")
+            e.printStackTrace()
+        }
+
+        if (!coroutineContext.isActive) throw TimeoutCancellationException("job canceled")
+        delay(currentDelay)
+        currentDelay = (currentDelay * factor).toLong().coerceAtMost(maxDelay)
+    }
+
     if (!coroutineContext.isActive) throw TimeoutCancellationException("job canceled")
     return block() // last attempt
 }
\ No newline at end of file

From a618439751d6ed7e9e246009f441a89b66f73f23 Mon Sep 17 00:00:00 2001
From: Samer Alabi <sameralabi@hotmail.com>
Date: Tue, 13 Nov 2018 20:57:33 -0500
Subject: [PATCH 025/149] Recreation of Original Chat Details

---
 .../chat.rocket.android.db.RCDatabase/10.json |   24 +-
 .../chat.rocket.android.db.RCDatabase/12.json | 1105 +++++++++++++++++
 app/src/main/AndroidManifest.xml              |    5 +
 .../di/ChatDetailsFragmentModule.kt           |   41 +
 .../di/ChatDetailsFragmentProvider.kt         |   13 +
 .../chatdetails/di/ChatDetailsModule.kt       |   14 +
 .../android/chatdetails/domain/ChatDetails.kt |   10 +
 .../presentation/ChatDetailsNavigator.kt      |   42 +
 .../presentation/ChatDetailsPresenter.kt      |   71 ++
 .../presentation/ChatDetailsView.kt           |    9 +
 .../chatdetails/ui/ChatDetailsActivity.kt     |   85 ++
 .../chatdetails/ui/ChatDetailsAdapter.kt      |   49 +
 .../chatdetails/ui/ChatDetailsFragment.kt     |  198 +++
 .../viewmodel/ChatDetailsViewModel.kt         |   28 +
 .../viewmodel/ChatDetailsViewModelFactory.kt  |   12 +
 .../presentation/ChatRoomNavigator.kt         |   44 +-
 .../presentation/ChatRoomPresenter.kt         |   24 +-
 .../android/chatroom/ui/ChatRoomFragment.kt   |   12 +-
 .../chat/rocket/android/chatroom/ui/Menu.kt   |   62 +-
 .../android/chatroom/uimodel/UiModelMapper.kt |    2 +-
 .../android/dagger/module/ActivityBuilder.kt  |   18 +-
 .../chat/rocket/android/db/ChatRoomDao.kt     |   10 +-
 .../chat/rocket/android/db/DatabaseManager.kt |   20 +-
 .../rocket/android/db/model/ChatRoomEntity.kt |    3 +
 .../ui/FavoriteMessagesFragment.kt            |    7 +-
 .../rocket/android/files/ui/FilesFragment.kt  |    8 +-
 .../members/di/MembersFragmentModule.kt       |    4 +-
 .../members/presentation/MembersNavigator.kt  |    4 +-
 .../android/members/ui/MembersFragment.kt     |   10 +-
 .../android/mentions/ui/MentionsFragment.kt   |    8 +-
 .../ui/PinnedMessagesFragment.kt              |    7 +-
 app/src/main/res/drawable/ic_files_24dp.xml   |    2 -
 .../drawable/ic_info_outline_white_24dp.xml   |    9 +
 .../drawable/ic_people_outline_black_24dp.xml |    9 +
 .../main/res/layout/activity_chat_details.xml |   15 +
 .../main/res/layout/app_bar_chat_details.xml  |   29 +
 .../main/res/layout/fragment_chat_details.xml |   74 ++
 .../main/res/layout/item_detail_option.xml    |   26 +
 app/src/main/res/values-de/strings.xml        |   10 +-
 app/src/main/res/values-es/strings.xml        |    8 +-
 app/src/main/res/values-fr/strings.xml        |    7 +
 app/src/main/res/values-hi-rIN/strings.xml    |    7 +
 app/src/main/res/values-ja/strings.xml        |    7 +
 app/src/main/res/values-pt-rBR/strings.xml    |    7 +
 app/src/main/res/values-ru-rRU/strings.xml    |    7 +
 app/src/main/res/values-tr/strings.xml        |    8 +-
 app/src/main/res/values-uk/strings.xml        |    7 +
 app/src/main/res/values/colors.xml            |    1 +
 app/src/main/res/values/strings.xml           |    8 +
 app/src/main/res/values/styles.xml            |   12 +-
 50 files changed, 2063 insertions(+), 139 deletions(-)
 create mode 100644 app/schemas/chat.rocket.android.db.RCDatabase/12.json
 create mode 100644 app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentModule.kt
 create mode 100644 app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentProvider.kt
 create mode 100644 app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsModule.kt
 create mode 100644 app/src/main/java/chat/rocket/android/chatdetails/domain/ChatDetails.kt
 create mode 100644 app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsNavigator.kt
 create mode 100644 app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsPresenter.kt
 create mode 100644 app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsView.kt
 create mode 100644 app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsActivity.kt
 create mode 100644 app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsAdapter.kt
 create mode 100644 app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt
 create mode 100644 app/src/main/java/chat/rocket/android/chatdetails/viewmodel/ChatDetailsViewModel.kt
 create mode 100644 app/src/main/java/chat/rocket/android/chatdetails/viewmodel/ChatDetailsViewModelFactory.kt
 create mode 100644 app/src/main/res/drawable/ic_info_outline_white_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_people_outline_black_24dp.xml
 create mode 100644 app/src/main/res/layout/activity_chat_details.xml
 create mode 100644 app/src/main/res/layout/app_bar_chat_details.xml
 create mode 100644 app/src/main/res/layout/fragment_chat_details.xml
 create mode 100644 app/src/main/res/layout/item_detail_option.xml

diff --git a/app/schemas/chat.rocket.android.db.RCDatabase/10.json b/app/schemas/chat.rocket.android.db.RCDatabase/10.json
index a17af93dbf..d6d34f33e3 100644
--- a/app/schemas/chat.rocket.android.db.RCDatabase/10.json
+++ b/app/schemas/chat.rocket.android.db.RCDatabase/10.json
@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 10,
-    "identityHash": "db46c12dbb8747200288f48d5dc5558b",
+    "identityHash": "4024406c23a09800c0c3e987c6b5d40b",
     "entities": [
       {
         "tableName": "users",
@@ -59,7 +59,7 @@
       },
       {
         "tableName": "chatrooms",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, `broadcast` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `topic` TEXT, `announcement` TEXT, `description` TEXT, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, `broadcast` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
         "fields": [
           {
             "fieldPath": "id",
@@ -121,6 +121,24 @@
             "affinity": "INTEGER",
             "notNull": false
           },
+          {
+            "fieldPath": "topic",
+            "columnName": "topic",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "announcement",
+            "columnName": "announcement",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
           {
             "fieldPath": "open",
             "columnName": "open",
@@ -1075,7 +1093,7 @@
     ],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"db46c12dbb8747200288f48d5dc5558b\")"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"4024406c23a09800c0c3e987c6b5d40b\")"
     ]
   }
 }
\ No newline at end of file
diff --git a/app/schemas/chat.rocket.android.db.RCDatabase/12.json b/app/schemas/chat.rocket.android.db.RCDatabase/12.json
new file mode 100644
index 0000000000..6a44649139
--- /dev/null
+++ b/app/schemas/chat.rocket.android.db.RCDatabase/12.json
@@ -0,0 +1,1105 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 12,
+    "identityHash": "fb9f1c815809b0217d326452aeb34e92",
+    "entities": [
+      {
+        "tableName": "users",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `username` TEXT, `name` TEXT, `status` TEXT NOT NULL, `utcOffset` REAL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "username",
+            "columnName": "username",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "utcOffset",
+            "columnName": "utcOffset",
+            "affinity": "REAL",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_users_username",
+            "unique": false,
+            "columnNames": [
+              "username"
+            ],
+            "createSql": "CREATE  INDEX `index_users_username` ON `${TABLE_NAME}` (`username`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "chatrooms",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `topic` TEXT, `announcement` TEXT, `description` TEXT, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, `broadcast` INTEGER, `muted` TEXT, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subscriptionId",
+            "columnName": "subscriptionId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullname",
+            "columnName": "fullname",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "ownerId",
+            "columnName": "ownerId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "readonly",
+            "columnName": "readonly",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isDefault",
+            "columnName": "isDefault",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "favorite",
+            "columnName": "favorite",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "topic",
+            "columnName": "topic",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "announcement",
+            "columnName": "announcement",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "open",
+            "columnName": "open",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "alert",
+            "columnName": "alert",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userMentions",
+            "columnName": "userMentions",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "groupMentions",
+            "columnName": "groupMentions",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "updatedAt",
+            "columnName": "updatedAt",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastSeen",
+            "columnName": "lastSeen",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastMessageText",
+            "columnName": "lastMessageText",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastMessageUserId",
+            "columnName": "lastMessageUserId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastMessageTimestamp",
+            "columnName": "lastMessageTimestamp",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "broadcast",
+            "columnName": "broadcast",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "muted",
+            "columnName": "muted",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_chatrooms_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "createSql": "CREATE  INDEX `index_chatrooms_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_chatrooms_ownerId",
+            "unique": false,
+            "columnNames": [
+              "ownerId"
+            ],
+            "createSql": "CREATE  INDEX `index_chatrooms_ownerId` ON `${TABLE_NAME}` (`ownerId`)"
+          },
+          {
+            "name": "index_chatrooms_subscriptionId",
+            "unique": true,
+            "columnNames": [
+              "subscriptionId"
+            ],
+            "createSql": "CREATE UNIQUE INDEX `index_chatrooms_subscriptionId` ON `${TABLE_NAME}` (`subscriptionId`)"
+          },
+          {
+            "name": "index_chatrooms_updatedAt",
+            "unique": false,
+            "columnNames": [
+              "updatedAt"
+            ],
+            "createSql": "CREATE  INDEX `index_chatrooms_updatedAt` ON `${TABLE_NAME}` (`updatedAt`)"
+          },
+          {
+            "name": "index_chatrooms_lastMessageUserId",
+            "unique": false,
+            "columnNames": [
+              "lastMessageUserId"
+            ],
+            "createSql": "CREATE  INDEX `index_chatrooms_lastMessageUserId` ON `${TABLE_NAME}` (`lastMessageUserId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "users",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "ownerId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          },
+          {
+            "table": "users",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          },
+          {
+            "table": "users",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "lastMessageUserId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `roomId` TEXT NOT NULL, `message` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `senderId` TEXT, `updatedAt` INTEGER, `editedAt` INTEGER, `editedBy` TEXT, `senderAlias` TEXT, `avatar` TEXT, `type` TEXT, `groupable` INTEGER NOT NULL, `parseUrls` INTEGER NOT NULL, `pinned` INTEGER NOT NULL, `role` TEXT, `synced` INTEGER NOT NULL, `unread` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`senderId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`editedBy`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roomId",
+            "columnName": "roomId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "message",
+            "columnName": "message",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderId",
+            "columnName": "senderId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "updatedAt",
+            "columnName": "updatedAt",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "editedAt",
+            "columnName": "editedAt",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "editedBy",
+            "columnName": "editedBy",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "senderAlias",
+            "columnName": "senderAlias",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "avatar",
+            "columnName": "avatar",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "groupable",
+            "columnName": "groupable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parseUrls",
+            "columnName": "parseUrls",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pinned",
+            "columnName": "pinned",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "role",
+            "columnName": "role",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "synced",
+            "columnName": "synced",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "users",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "senderId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          },
+          {
+            "table": "users",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "editedBy"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "message_favorites",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`messageId` TEXT NOT NULL, `userId` TEXT NOT NULL, PRIMARY KEY(`messageId`, `userId`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "messageId",
+            "columnName": "messageId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "messageId",
+            "userId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "messages",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "messageId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          },
+          {
+            "table": "users",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "message_mentions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`messageId` TEXT NOT NULL, `userId` TEXT NOT NULL, PRIMARY KEY(`messageId`, `userId`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "messageId",
+            "columnName": "messageId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "messageId",
+            "userId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "messages",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "messageId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          },
+          {
+            "table": "users",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "message_channels",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`messageId` TEXT NOT NULL, `roomId` TEXT NOT NULL, `roomName` TEXT, PRIMARY KEY(`messageId`, `roomId`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "messageId",
+            "columnName": "messageId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roomId",
+            "columnName": "roomId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roomName",
+            "columnName": "roomName",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "messageId",
+            "roomId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "messages",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "messageId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "attachments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` TEXT NOT NULL, `message_id` TEXT NOT NULL, `title` TEXT, `type` TEXT, `description` TEXT, `text` TEXT, `author_name` TEXT, `author_icon` TEXT, `author_link` TEXT, `thumb_url` TEXT, `color` TEXT, `fallback` TEXT, `title_link` TEXT, `title_link_download` INTEGER NOT NULL, `image_url` TEXT, `image_type` TEXT, `image_size` INTEGER, `video_url` TEXT, `video_type` TEXT, `video_size` INTEGER, `audio_url` TEXT, `audio_type` TEXT, `audio_size` INTEGER, `message_link` TEXT, `timestamp` INTEGER, `has_actions` INTEGER NOT NULL, `has_fields` INTEGER NOT NULL, `button_alignment` TEXT, PRIMARY KEY(`_id`), FOREIGN KEY(`message_id`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "_id",
+            "columnName": "_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "author_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorIcon",
+            "columnName": "author_icon",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorLink",
+            "columnName": "author_link",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "thumbUrl",
+            "columnName": "thumb_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fallback",
+            "columnName": "fallback",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "titleLink",
+            "columnName": "title_link",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "titleLinkDownload",
+            "columnName": "title_link_download",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "image_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "imageType",
+            "columnName": "image_type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "imageSize",
+            "columnName": "image_size",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "videoUrl",
+            "columnName": "video_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "videoType",
+            "columnName": "video_type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "videoSize",
+            "columnName": "video_size",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "audioUrl",
+            "columnName": "audio_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "audioType",
+            "columnName": "audio_type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "audioSize",
+            "columnName": "audio_size",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "messageLink",
+            "columnName": "message_link",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasActions",
+            "columnName": "has_actions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasFields",
+            "columnName": "has_fields",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "buttonAlignment",
+            "columnName": "button_alignment",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "messages",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "message_id"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "attachment_fields",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `attachmentId` TEXT NOT NULL, `title` TEXT NOT NULL, `value` TEXT NOT NULL, FOREIGN KEY(`attachmentId`) REFERENCES `attachments`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "attachmentId",
+            "columnName": "attachmentId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_attachment_fields_attachmentId",
+            "unique": false,
+            "columnNames": [
+              "attachmentId"
+            ],
+            "createSql": "CREATE  INDEX `index_attachment_fields_attachmentId` ON `${TABLE_NAME}` (`attachmentId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "attachments",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "attachmentId"
+            ],
+            "referencedColumns": [
+              "_id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "attachment_action",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `attachmentId` TEXT NOT NULL, `type` TEXT NOT NULL, `text` TEXT, `url` TEXT, `isWebView` INTEGER, `webViewHeightRatio` TEXT, `imageUrl` TEXT, `message` TEXT, `isMessageInChatWindow` INTEGER, FOREIGN KEY(`attachmentId`) REFERENCES `attachments`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "attachmentId",
+            "columnName": "attachmentId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isWebView",
+            "columnName": "isWebView",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "webViewHeightRatio",
+            "columnName": "webViewHeightRatio",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "message",
+            "columnName": "message",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isMessageInChatWindow",
+            "columnName": "isMessageInChatWindow",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_attachment_action_attachmentId",
+            "unique": false,
+            "columnNames": [
+              "attachmentId"
+            ],
+            "createSql": "CREATE  INDEX `index_attachment_action_attachmentId` ON `${TABLE_NAME}` (`attachmentId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "attachments",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "attachmentId"
+            ],
+            "referencedColumns": [
+              "_id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "urls",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`urlId` INTEGER PRIMARY KEY AUTOINCREMENT, `messageId` TEXT NOT NULL, `url` TEXT NOT NULL, `hostname` TEXT, `title` TEXT, `description` TEXT, `imageUrl` TEXT, FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "urlId",
+            "columnName": "urlId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "messageId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hostname",
+            "columnName": "hostname",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "urlId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_urls_messageId",
+            "unique": false,
+            "columnNames": [
+              "messageId"
+            ],
+            "createSql": "CREATE  INDEX `index_urls_messageId` ON `${TABLE_NAME}` (`messageId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "messages",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "messageId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "reactions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`reaction` TEXT NOT NULL, `messageId` TEXT NOT NULL, `count` INTEGER NOT NULL, `usernames` TEXT NOT NULL, PRIMARY KEY(`reaction`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "reaction",
+            "columnName": "reaction",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "messageId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "count",
+            "columnName": "count",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "usernames",
+            "columnName": "usernames",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "reaction"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_reactions_messageId",
+            "unique": false,
+            "columnNames": [
+              "messageId"
+            ],
+            "createSql": "CREATE  INDEX `index_reactions_messageId` ON `${TABLE_NAME}` (`messageId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "messages",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "messageId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "messages_sync",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`roomId` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, PRIMARY KEY(`roomId`))",
+        "fields": [
+          {
+            "fieldPath": "roomId",
+            "columnName": "roomId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "roomId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"fb9f1c815809b0217d326452aeb34e92\")"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a0f96bc45f..1299772a9f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/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"
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentModule.kt b/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentModule.kt
new file mode 100644
index 0000000000..791eee4797
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentModule.kt
@@ -0,0 +1,41 @@
+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
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentProvider.kt b/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentProvider.kt
new file mode 100644
index 0000000000..70ddbaaa78
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentProvider.kt
@@ -0,0 +1,13 @@
+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
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsModule.kt b/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsModule.kt
new file mode 100644
index 0000000000..5e85d8a4f0
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsModule.kt
@@ -0,0 +1,14 @@
+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
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/domain/ChatDetails.kt b/app/src/main/java/chat/rocket/android/chatdetails/domain/ChatDetails.kt
new file mode 100644
index 0000000000..3dae0059ec
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/chatdetails/domain/ChatDetails.kt
@@ -0,0 +1,10 @@
+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
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsNavigator.kt b/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsNavigator.kt
new file mode 100644
index 0000000000..143295f173
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsNavigator.kt
@@ -0,0 +1,42 @@
+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)
+        }
+    }
+}
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsPresenter.kt b/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsPresenter.kt
new file mode 100644
index 0000000000..ec96c0bcc7
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsPresenter.kt
@@ -0,0 +1,71 @@
+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.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 {
+                view.displayDetails(roomToChatDetails(client.getInfo(chatRoomId, null, roomTypeOf(chatRoomType))))
+            } 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
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsView.kt b/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsView.kt
new file mode 100644
index 0000000000..ede8290e30
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsView.kt
@@ -0,0 +1,9 @@
+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
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsActivity.kt b/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsActivity.kt
new file mode 100644
index 0000000000..f2cc66d5c2
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsActivity.kt
@@ -0,0 +1,85 @@
+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
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsAdapter.kt b/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsAdapter.kt
new file mode 100644
index 0000000000..d9b141b478
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsAdapter.kt
@@ -0,0 +1,49 @@
+package chat.rocket.android.chatdetails.ui
+
+import android.content.Context
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import chat.rocket.android.R
+import chat.rocket.android.util.extensions.inflate
+import kotlinx.android.synthetic.main.item_detail_option.view.*
+
+class ChatDetailsAdapter(private val context: Context): RecyclerView.Adapter<ChatDetailsAdapter.ViewHolder>() {
+    private val options: MutableList<Option> = ArrayList()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder = ViewHolder(parent.inflate(R.layout.item_detail_option))
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) = holder.bind(options[position])
+
+    override fun getItemCount(): Int = options.size
+
+    inner class ViewHolder(itemView: View): RecyclerView.ViewHolder(itemView) {
+        fun bind(option: Option) {
+            bindName(option, itemView.name)
+            bindIcon(option, itemView.icon)
+            itemView.setOnClickListener { option.listener() }
+        }
+    }
+
+    inner class Option(val name: String, val icon: Int, val listener: () -> Unit)
+
+    fun addOption(name: String, icon: Int, listener: () -> Unit) {
+        options.add(Option(name, icon, listener))
+        notifyDataSetChanged()
+    }
+
+    private fun bindName(option: Option, view: TextView) {
+        view.text = option.name
+    }
+
+    private fun bindIcon(option: Option, view: ImageView) {
+        val drawable = DrawableHelper.getDrawableFromId(option.icon, context)
+        drawable.let { image ->
+            val mutateDrawable = DrawableHelper.wrapDrawable(image).mutate()
+            DrawableHelper.tintDrawable(mutateDrawable, context, R.color.colorPrimaryText)
+            view.setImageDrawable(mutateDrawable)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt b/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt
new file mode 100644
index 0000000000..2003ca7195
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt
@@ -0,0 +1,198 @@
+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? = null
+    private var disableMenu: Boolean? = null
+
+    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) {
+        if (!disableMenu!!) {
+            adapter.addOption(getString(R.string.title_files), R.drawable.ic_files_24dp) {
+                presenter.toFiles(chatRoomId!!)
+            }
+        }
+
+        if (chatRoomType != RoomType.DIRECT_MESSAGE && !disableMenu!!) {
+            adapter.addOption(getString(R.string.msg_mentions), R.drawable.ic_at_black_20dp) {
+                presenter.toMentions(chatRoomId!!)
+            }
+            adapter.addOption(getString(R.string.title_members), R.drawable.ic_people_outline_black_24dp) {
+                presenter.toMembers(chatRoomId!!)
+            }
+        }
+
+        adapter.addOption(getString(R.string.title_favorite_messages), R.drawable.ic_star_border_white_24dp) {
+            presenter.toFavorites(chatRoomId!!)
+        }
+        adapter.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(context!!)
+                options.adapter = adapter
+
+                with(options) {
+                    layoutManager = LinearLayoutManager(it)
+                    addItemDecoration(
+                        DividerItemDecoration(
+                                it,
+                                resources.getDimensionPixelSize(R.dimen.divider_item_decorator_bound_start),
+                                resources.getDimensionPixelSize(R.dimen.divider_item_decorator_bound_end)
+                        )
+                    )
+                    itemAnimator = DefaultItemAnimator()
+                    isNestedScrollingEnabled = false
+                }
+            }
+            addOptions(adapter!!)
+        }
+    }
+
+    private fun setupToolbar() {
+        with(activity as ChatDetailsActivity) {
+            setNavigationIcon(R.drawable.ic_close_white_24dp)
+            setToolbarTitle(getString(R.string.title_channel_details))
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/viewmodel/ChatDetailsViewModel.kt b/app/src/main/java/chat/rocket/android/chatdetails/viewmodel/ChatDetailsViewModel.kt
new file mode 100644
index 0000000000..117525aab1
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/chatdetails/viewmodel/ChatDetailsViewModel.kt
@@ -0,0 +1,28 @@
+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
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/viewmodel/ChatDetailsViewModelFactory.kt b/app/src/main/java/chat/rocket/android/chatdetails/viewmodel/ChatDetailsViewModelFactory.kt
new file mode 100644
index 0000000000..d6e4cc7490
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/chatdetails/viewmodel/ChatDetailsViewModelFactory.kt
@@ -0,0 +1,12 @@
+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
diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomNavigator.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomNavigator.kt
index 4767662497..51e967858c 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomNavigator.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomNavigator.kt
@@ -1,6 +1,7 @@
 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() {
diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
index 799f04f54a..c3e5fb47e5 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
@@ -863,20 +863,14 @@ class ChatRoomPresenter @Inject constructor(
         }
     }
 
-    fun toMembersList(chatRoomId: String) =
-        navigator.toMembersList(chatRoomId)
-
-    fun toMentions(chatRoomId: String) =
-        navigator.toMentions(chatRoomId)
-
-    fun toPinnedMessageList(chatRoomId: String) =
-        navigator.toPinnedMessageList(chatRoomId)
-
-    fun toFavoriteMessageList(chatRoomId: String) =
-        navigator.toFavoriteMessageList(chatRoomId)
-
-    fun toFileList(chatRoomId: String) =
-        navigator.toFileList(chatRoomId)
+    fun toChatDetails(
+        chatRoomId: String,
+        chatRoomType: String,
+        isSubscribed: Boolean,
+        isMenuDisabled: Boolean
+    ) {
+        navigator.toChatDetails(chatRoomId, chatRoomType, isSubscribed, isMenuDisabled)
+    }
 
     fun loadChatRooms() {
         launchUI(strategy) {
@@ -904,7 +898,7 @@ class ChatRoomPresenter @Inject constructor(
 
     // TODO: move this to new interactor or FetchChatRoomsInteractor?
     private suspend fun getChatRoomAsync(roomId: String): ChatRoom? = withContext(CommonPool) {
-        return@withContext dbManager.chatRoomDao().get(roomId)?.let {
+        return@withContext dbManager.chatRoomDao().getSync(roomId)?.let {
             with(it.chatRoom) {
                 ChatRoom(
                     id = id,
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index 1b09450ed0..c5cbc6ecdd 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -128,11 +128,7 @@ private const val BUNDLE_CHAT_ROOM_IS_FAVORITE = "chat_room_is_favorite"
 private const val BUNDLE_CHAT_ROOM_MESSAGE = "chat_room_message"
 
 internal const val MENU_ACTION_FAVORITE_UNFAVORITE_CHAT = 1
-internal const val MENU_ACTION_MEMBER = 2
-internal const val MENU_ACTION_MENTIONS = 3
-internal const val MENU_ACTION_PINNED_MESSAGES = 4
-internal const val MENU_ACTION_FAVORITE_MESSAGES = 5
-internal const val MENU_ACTION_FILES = 6
+internal const val MENU_ACTION_SHOW_DETAILS = 2
 
 class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiReactionListener,
     ChatRoomAdapter.OnActionSelected, Drawable.Callback {
@@ -149,7 +145,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     internal lateinit var chatRoomType: String
     private var newMessageCount: Int = 0
     private var chatRoomMessage: String? = null
-    private var isSubscribed: Boolean = true
+    internal var isSubscribed: Boolean = true
     private var isReadOnly: Boolean = false
     private var isCreator: Boolean = false
     internal var isFavorite: Boolean = false
@@ -296,8 +292,8 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         super.onPrepareOptionsMenu(menu)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        setOnMenuItemClickListener(item)
+    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+        setOnMenuItemClickListener(item!!)
         return true
     }
 
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/Menu.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/Menu.kt
index 9504c4de28..2e1f14263c 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/Menu.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/Menu.kt
@@ -8,50 +8,11 @@ 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) {
@@ -60,11 +21,12 @@ internal fun ChatRoomFragment.setOnMenuItemClickListener(item: MenuItem) {
             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
+        )
     }
 }
 
@@ -139,4 +101,14 @@ private fun ChatRoomFragment.setupFavoriteMenuItem(menu: Menu) {
         ).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
diff --git a/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt b/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt
index 3e05005919..2e49fcaa36 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt
@@ -162,7 +162,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,
diff --git a/app/src/main/java/chat/rocket/android/dagger/module/ActivityBuilder.kt b/app/src/main/java/chat/rocket/android/dagger/module/ActivityBuilder.kt
index 6d7e12a896..c79ad30c6d 100644
--- a/app/src/main/java/chat/rocket/android/dagger/module/ActivityBuilder.kt
+++ b/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
@@ -41,7 +44,6 @@ import dagger.android.ContributesAndroidInjector
 
 @Module
 abstract class ActivityBuilder {
-
     @PerActivity
     @ContributesAndroidInjector(
             modules = [AuthenticationModule::class,
@@ -75,7 +77,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 +94,7 @@ abstract class ActivityBuilder {
             FilesFragmentProvider::class
         ]
     )
-    abstract fun bindChatRoomActivity(): ChatRoomActivity
+    abstract fun bindChatDetailsActivity(): ChatDetailsActivity
 
     @PerActivity
     @ContributesAndroidInjector(modules = [PasswordFragmentProvider::class])
@@ -96,6 +107,7 @@ abstract class ActivityBuilder {
     @PerActivity
     @ContributesAndroidInjector(modules = [MessageInfoFragmentProvider::class])
     abstract fun bindMessageInfoActiviy(): MessageInfoActivity
+
     @ContributesAndroidInjector(modules = [DrawModule::class])
     abstract fun bindDrawingActivity(): DrawingActivity
 }
diff --git a/app/src/main/java/chat/rocket/android/db/ChatRoomDao.kt b/app/src/main/java/chat/rocket/android/db/ChatRoomDao.kt
index 2651e3f4df..11bc281296 100644
--- a/app/src/main/java/chat/rocket/android/db/ChatRoomDao.kt
+++ b/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")
diff --git a/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt b/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
index eefa1e7cd3..82a613f6fd 100644
--- a/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
+++ b/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
@@ -96,7 +96,7 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
     }
 
     suspend fun getRoom(id: String) = withContext(dbManagerContext) {
-        chatRoomDao().get(id)
+        chatRoomDao().getSync(id)
     }
 
     fun processUsersBatch(users: List<User>) {
@@ -335,7 +335,7 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
     }
 
     private suspend fun updateRoom(data: Room): ChatRoomEntity? {
-        return chatRoomDao().get(data.id)?.let { current ->
+        return chatRoomDao().getSync(data.id)?.let { current ->
             with(data) {
                 val chatRoom = current.chatRoom
 
@@ -348,10 +348,13 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
                     ownerId = user?.id ?: chatRoom.ownerId,
                     readonly = readonly,
                     updatedAt = updatedAt ?: chatRoom.updatedAt,
+                    topic = topic,
+                    announcement = announcement,
+                    description = description,
                     lastMessageText = mapLastMessageText(lastMessage),
                     lastMessageUserId = lastMessage?.sender?.id,
                     lastMessageTimestamp = lastMessage?.timestamp,
-                    muted = muted
+                    muted = chatRoom.muted
                 )
             }
         }
@@ -373,7 +376,7 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
         context.getString(R.string.msg_sent_attachment)
 
     private suspend fun updateSubscription(data: Subscription): ChatRoomEntity? {
-        return chatRoomDao().get(data.roomId)?.let { current ->
+        return chatRoomDao().getSync(data.roomId)?.let { current ->
             with(data) {
 
                 val userId = if (type is RoomType.DirectMessage) {
@@ -396,6 +399,9 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
                     readonly = readonly ?: chatRoom.readonly,
                     isDefault = isDefault,
                     favorite = isFavorite,
+                    topic = chatRoom.topic,
+                    announcement = chatRoom.announcement,
+                    description = chatRoom.description,
                     open = open,
                     alert = alert,
                     unread = unread,
@@ -461,6 +467,9 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
             readonly = subscription.readonly,
             isDefault = subscription.isDefault,
             favorite = subscription.isFavorite,
+            topic = room.topic,
+            announcement = room.announcement,
+            description = room.description,
             open = subscription.open,
             alert = subscription.alert,
             unread = subscription.unread,
@@ -498,6 +507,9 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
                 readonly = readonly,
                 isDefault = default,
                 favorite = favorite,
+                topic = topic,
+                announcement = announcement,
+                description = description,
                 open = open,
                 alert = alert,
                 unread = unread,
diff --git a/app/src/main/java/chat/rocket/android/db/model/ChatRoomEntity.kt b/app/src/main/java/chat/rocket/android/db/model/ChatRoomEntity.kt
index 92403de4f8..f3d0aed820 100644
--- a/app/src/main/java/chat/rocket/android/db/model/ChatRoomEntity.kt
+++ b/app/src/main/java/chat/rocket/android/db/model/ChatRoomEntity.kt
@@ -34,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,
diff --git a/app/src/main/java/chat/rocket/android/favoritemessages/ui/FavoriteMessagesFragment.kt b/app/src/main/java/chat/rocket/android/favoritemessages/ui/FavoriteMessagesFragment.kt
index 34465f4747..23fda62a3a 100644
--- a/app/src/main/java/chat/rocket/android/favoritemessages/ui/FavoriteMessagesFragment.kt
+++ b/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()
+        with(activity as ChatDetailsActivity) {
+            setToolbarTitle(getString(R.string.title_favorite_messages))
+            setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/files/ui/FilesFragment.kt b/app/src/main/java/chat/rocket/android/files/ui/FilesFragment.kt
index ce7e384896..33d64ddc3b 100644
--- a/app/src/main/java/chat/rocket/android/files/ui/FilesFragment.kt
+++ b/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()
+        with(activity as ChatDetailsActivity) {
+            setToolbarTitle(getString(R.string.title_files_total, totalFiles))
+            setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/members/di/MembersFragmentModule.kt b/app/src/main/java/chat/rocket/android/members/di/MembersFragmentModule.kt
index e983a90eba..a9a5a556df 100644
--- a/app/src/main/java/chat/rocket/android/members/di/MembersFragmentModule.kt
+++ b/app/src/main/java/chat/rocket/android/members/di/MembersFragmentModule.kt
@@ -1,7 +1,7 @@
 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
diff --git a/app/src/main/java/chat/rocket/android/members/presentation/MembersNavigator.kt b/app/src/main/java/chat/rocket/android/members/presentation/MembersNavigator.kt
index 87f7556be0..212f7ca6fe 100644
--- a/app/src/main/java/chat/rocket/android/members/presentation/MembersNavigator.kt
+++ b/app/src/main/java/chat/rocket/android/members/presentation/MembersNavigator.kt
@@ -1,10 +1,10 @@
 package chat.rocket.android.members.presentation
 
-import chat.rocket.android.chatroom.ui.ChatRoomActivity
+import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
 import chat.rocket.android.members.ui.TAG_MEMBER_BOTTOM_SHEET_FRAGMENT
 import chat.rocket.android.members.ui.newInstance
 
-class MembersNavigator(internal val activity: ChatRoomActivity) {
+class MembersNavigator(internal val activity: ChatDetailsActivity) {
 
     fun toMemberDetails(avatarUri: String, realName: String, username: String, email: String, utcOffset: String) {
         activity.apply {
diff --git a/app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt b/app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt
index a46485d0d5..36201ccfa6 100644
--- a/app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt
+++ b/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 {
+        with (activity as ChatDetailsActivity) {
             if (totalMembers != null) {
-                it.showToolbarTitle(getString(R.string.title_counted_members, totalMembers))
+                setToolbarTitle(getString(R.string.title_counted_members, totalMembers))
             } else {
-                it.showToolbarTitle(getString(R.string.title_members))
+                setToolbarTitle(getString(R.string.title_members))
             }
-            it.hideToolbarChatRoomIcon()
+            setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/mentions/ui/MentionsFragment.kt b/app/src/main/java/chat/rocket/android/mentions/ui/MentionsFragment.kt
index a9e98bdf81..6fbe4581e5 100644
--- a/app/src/main/java/chat/rocket/android/mentions/ui/MentionsFragment.kt
+++ b/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()
+        with(activity as ChatDetailsActivity) {
+            setToolbarTitle(getString(R.string.msg_mentions))
+            setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/pinnedmessages/ui/PinnedMessagesFragment.kt b/app/src/main/java/chat/rocket/android/pinnedmessages/ui/PinnedMessagesFragment.kt
index 2d761328ca..6090a42d6d 100644
--- a/app/src/main/java/chat/rocket/android/pinnedmessages/ui/PinnedMessagesFragment.kt
+++ b/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()
+        with(activity as ChatDetailsActivity) {
+            setToolbarTitle(getString(R.string.title_pinned_messages))
+            setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_files_24dp.xml b/app/src/main/res/drawable/ic_files_24dp.xml
index d851c0a09e..8b8a88fe31 100644
--- a/app/src/main/res/drawable/ic_files_24dp.xml
+++ b/app/src/main/res/drawable/ic_files_24dp.xml
@@ -3,10 +3,8 @@
     android:height="24dp"
     android:viewportHeight="17.0"
     android:viewportWidth="18.0">
-
     <path
         android:fillColor="#FF1D74F5"
         android:fillType="nonZero"
         android:pathData="M4.221,11.799L10.444,5.576C10.97,5.05 11.833,5.067 12.383,5.617C12.928,6.163 12.946,7.034 12.423,7.557L6.195,13.785C5.226,14.754 3.613,14.717 2.599,13.704C1.582,12.687 1.546,11.08 2.52,10.106L9.295,3.331C10.713,1.913 13.07,1.966 14.552,3.448C16.035,4.931 16.087,7.287 14.668,8.706L7.898,15.476L8.747,16.324L15.516,9.555C17.383,7.688 17.316,4.588 15.364,2.636C13.414,0.686 10.313,0.616 8.446,2.483L1.671,9.258C0.248,10.681 0.302,13.03 1.788,14.515C3.27,15.997 5.626,16.051 7.044,14.633L13.272,8.405C14.242,7.435 14.209,5.82 13.195,4.805C12.175,3.786 10.569,3.754 9.595,4.728L3.373,10.95L4.221,11.799Z" />
-
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_info_outline_white_24dp.xml b/app/src/main/res/drawable/ic_info_outline_white_24dp.xml
new file mode 100644
index 0000000000..9567ecd775
--- /dev/null
+++ b/app/src/main/res/drawable/ic_info_outline_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_people_outline_black_24dp.xml b/app/src/main/res/drawable/ic_people_outline_black_24dp.xml
new file mode 100644
index 0000000000..15d27f9b86
--- /dev/null
+++ b/app/src/main/res/drawable/ic_people_outline_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16.5,13c-1.2,0 -3.07,0.34 -4.5,1 -1.43,-0.67 -3.3,-1 -4.5,-1C5.33,13 1,14.08 1,16.25L1,19h22v-2.75c0,-2.17 -4.33,-3.25 -6.5,-3.25zM12.5,17.5h-10v-1.25c0,-0.54 2.56,-1.75 5,-1.75s5,1.21 5,1.75v1.25zM21.5,17.5L14,17.5v-1.25c0,-0.46 -0.2,-0.86 -0.52,-1.22 0.88,-0.3 1.96,-0.53 3.02,-0.53 2.44,0 5,1.21 5,1.75v1.25zM7.5,12c1.93,0 3.5,-1.57 3.5,-3.5S9.43,5 7.5,5 4,6.57 4,8.5 5.57,12 7.5,12zM7.5,6.5c1.1,0 2,0.9 2,2s-0.9,2 -2,2 -2,-0.9 -2,-2 0.9,-2 2,-2zM16.5,12c1.93,0 3.5,-1.57 3.5,-3.5S18.43,5 16.5,5 13,6.57 13,8.5s1.57,3.5 3.5,3.5zM16.5,6.5c1.1,0 2,0.9 2,2s-0.9,2 -2,2 -2,-0.9 -2,-2 0.9,-2 2,-2z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_chat_details.xml b/app/src/main/res/layout/activity_chat_details.xml
new file mode 100644
index 0000000000..89f372c5f0
--- /dev/null
+++ b/app/src/main/res/layout/activity_chat_details.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".chatdetails.ui.ChatDetailsActivity">
+    <include
+        android:id="@+id/layout_app_bar"
+        layout="@layout/app_bar_chat_details" />
+    <FrameLayout
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_bar_chat_details.xml b/app/src/main/res/layout/app_bar_chat_details.xml
new file mode 100644
index 0000000000..3af8a2af96
--- /dev/null
+++ b/app/src/main/res/layout/app_bar_chat_details.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/colorPrimary"
+    android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        app:layout_scrollFlags="scroll|enterAlways"
+        app:navigationIcon="@drawable/ic_close_white_24dp"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+        <TextView
+            android:id="@+id/toolbar_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawablePadding="@dimen/text_view_drawable_padding"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="@color/colorWhite"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            tools:text="@string/title_channel_details" />
+    </androidx.appcompat.widget.Toolbar>
+</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_chat_details.xml b/app/src/main/res/layout/fragment_chat_details.xml
new file mode 100644
index 0000000000..2585a5aa72
--- /dev/null
+++ b/app/src/main/res/layout/fragment_chat_details.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@color/whitesmoke"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+        <RelativeLayout
+            android:background="@color/colorWhite"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:padding="15dp">
+            <TextView
+                android:id="@+id/name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/ChatDetails.Title.TextView"
+                tools:text="#important"/>
+            <TextView
+                android:id="@+id/title_topic"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/name"
+                android:layout_marginTop="20dp"
+                style="@style/ChatDetails.Title.TextView"
+                android:text="@string/title_topic" />
+            <TextView
+                android:id="@+id/content_topic"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/title_topic"
+                style="@style/ChatDetails.Content.TextView"
+                android:text="@string/msg_no_topic" />
+            <TextView
+                android:id="@+id/title_announcement"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/content_topic"
+                android:layout_marginTop="15dp"
+                style="@style/ChatDetails.Title.TextView"
+                android:text="@string/title_announcement" />
+            <TextView
+                android:id="@+id/content_announcement"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/title_announcement"
+                style="@style/ChatDetails.Content.TextView"
+                android:text="@string/msg_no_announcement" />
+            <TextView
+                android:id="@+id/title_description"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/content_announcement"
+                android:layout_marginTop="15dp"
+                style="@style/ChatDetails.Title.TextView"
+                android:text="@string/title_description" />
+            <TextView
+                android:id="@+id/content_description"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/title_description"
+                android:layout_marginBottom="10dp"
+                style="@style/ChatDetails.Content.TextView"
+                android:text="@string/msg_no_description" />
+        </RelativeLayout>
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/options"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_detail_option.xml b/app/src/main/res/layout/item_detail_option.xml
new file mode 100644
index 0000000000..f549344859
--- /dev/null
+++ b/app/src/main/res/layout/item_detail_option.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?android:attr/selectableItemBackground"
+    android:padding="20dp">
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        tools:ignore="ContentDescription"
+        android:src="@drawable/ic_add_24dp"/>
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/icon"
+        android:layout_alignBottom="@id/icon"
+        android:gravity="center_vertical"
+        android:layout_marginStart="57dp"
+        style="@style/ChatDetails.Title.TextView"
+        tools:text="Files"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2465cd428d..06f9165e6b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -22,6 +22,10 @@
     <string name="title_about">Über</string>
     <string name="title_create_channel">Erstelle Raum</string>
     <string name="title_are_you_sure">Are you sure?</string><!-- TODO Add translation -->
+    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_topic">Thema</string>
+    <string name="title_announcement">Ankündigung</string>
+    <string name="title_description">Beschreibung</string>
 
     <!-- Actions -->
     <string name="action_connect">Verbinde</string>
@@ -171,6 +175,9 @@
     <string name="msg_view_less">view less</string>
     <!-- TODO - Add proper translation -->
     <string name="msg_permalink_copied">Permalink copied</string>
+    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
+    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
+    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
 
     <!-- Preferences messages -->
     <string name="msg_analytics_tracking">Analytics tracking</string> <!-- TODO Add translation -->
@@ -313,5 +320,6 @@
     <string name="notif_success_sending">Nachricht gesendet nach %1$s!</string>
     <string name="read_by">Gelesen von</string>
     <string name="message_information_title">Nachricht Information</string>
-    <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>     <!--TODO - Add proper translation-->
+    <!--TODO - Add proper translation-->
+    <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 9641a163f5..543fb194de 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -21,6 +21,10 @@
     <string name="title_about">Acerca de</string>
     <string name="title_create_channel">Crear canal</string>
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
+    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_topic">Tema</string>
+    <string name="title_announcement">Anuncio</string>
+    <string name="title_description">Descripción</string>
 
     <!-- Actions -->
     <string name="action_connect">Conectar</string>
@@ -168,6 +172,9 @@
     <string name="msg_permalink_copied">Permalink copied</string>
     <!-- TODO - Add proper translation -->
     <string name="msg_muted_on_this_channel">You are muted on this channel</string>
+    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
+    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
+    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
 
     <!-- Preferences messages -->
     <string name="msg_analytics_tracking">Analytics tracking</string> <!-- TODO Add translation -->
@@ -317,5 +324,4 @@
     <string name="msg_sent_attachment">Envió un archivo</string>
     <!--TODO - Add proper translation-->
     <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
-
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 048caf6b9a..b35cc576ba 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -22,6 +22,10 @@
     <string name="title_about">À propos</string>
     <string name="title_create_channel">Créer salon</string>
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
+    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_topic">Sujet</string>
+    <string name="title_announcement">Annonce</string>
+    <string name="title_description">La description</string>
 
     <!-- Actions -->
     <string name="action_connect">Se connecter</string>
@@ -160,6 +164,9 @@
     <string name="msg_permalink_copied">Permalink copied</string>
     <!-- TODO - Add proper translation -->
     <string name="msg_muted_on_this_channel">You are muted on this channel</string>
+    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
+    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
+    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Privé</string>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index c6b80cd726..ae1080e208 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -22,6 +22,10 @@
     <string name="title_about">परिचय</string>
     <string name="title_create_channel">चैनल बनाएं</string>
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
+    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_topic">विषय</string>
+    <string name="title_announcement">घोषणा</string>
+    <string name="title_description">विवरण</string>
 
     <!-- Actions -->
     <string name="action_connect">जुडिये</string>
@@ -172,6 +176,9 @@
     <string name="msg_permalink_copied">Permalink copied</string>
     <!-- TODO - Add proper translation -->
     <string name="msg_muted_on_this_channel">You are muted on this channel</string>
+    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
+    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
+    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
 
     <!-- Preferences messages -->
     <string name="msg_analytics_tracking">एनालिटिक्स ट्रैकिंग</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index ff2aad2126..a594c51135 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -24,6 +24,10 @@
     <string name="title_about">About</string>
     <string name="title_create_channel">新しいチャネルを作成します</string>
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
+    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_topic">トピック</string>
+    <string name="title_announcement">発表</string>
+    <string name="title_description">説明</string>
 
     <!-- Actions -->
     <string name="action_connect">接続</string>
@@ -177,6 +181,9 @@
     <string name="msg_delete_description">このメッセージを削除してもよろしいですか?</string>
     <!-- TODO - Add proper translation -->
     <string name="msg_permalink_copied">Permalink copied</string>
+    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
+    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
+    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
 
     <!-- Preferences messages -->
     <string name="msg_analytics_tracking">Analytics tracking</string> <!-- TODO Add translation -->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index b03833c72a..b82b3d7e69 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -22,6 +22,10 @@
     <string name="title_about">Sobre</string>
     <string name="title_create_channel">Criar chat</string>
     <string name="title_are_you_sure">Você tem certeza?</string>
+    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_topic">Tópico</string>
+    <string name="title_announcement">Anúncio</string>
+    <string name="title_description">Descrição</string>
 
     <!-- Actions -->
     <string name="action_connect">Conectar</string>
@@ -158,6 +162,9 @@
     <!-- TODO - Add proper translation -->
     <string name="msg_permalink_copied">Permalink copiado</string>
     <string name="msg_muted_on_this_channel">Você está silenciado neste canal</string>
+    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
+    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
+    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Privado</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 3bb4d5eb2d..6fc74ffc15 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -22,6 +22,10 @@
     <string name="title_about">О программе</string>
     <string name="title_create_channel">Создать новый канал</string>
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
+    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_topic">Тема</string>
+    <string name="title_announcement">Объявление</string>
+    <string name="title_description">Описание</string>
 
     <!-- Actions -->
     <string name="action_connect">Подключиться</string>
@@ -156,6 +160,9 @@
     <string name="msg_permalink_copied">Ссылка скопирована</string>
     <!-- TODO - Add proper translation -->
     <string name="msg_muted_on_this_channel">You are muted on this channel</string>
+    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
+    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
+    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Приватный</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 70b0e3275b..d387b84a03 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -22,6 +22,10 @@
     <string name="title_about">Hakkında</string>
     <string name="title_create_channel">Yeni Kanal Oluştur</string>
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
+    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_topic">konu</string>
+    <string name="title_announcement">duyuru</string>
+    <string name="title_description">Açıklama</string>
 
     <!-- Actions -->
     <string name="action_connect">Bağlan</string>
@@ -173,6 +177,9 @@
     <string name="msg_permalink_copied">Permalink copied</string>
     <!-- TODO - Add proper translation -->
     <string name="msg_muted_on_this_channel">You are muted on this channel</string>
+    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
+    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
+    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
     
     <!-- Preferences messages -->
     <string name="msg_analytics_tracking">İstatistik takibi</string>
@@ -317,5 +324,4 @@
     <string name="message_information_title">Mesaj bilgisi</string>
     <!--TODO - Add proper translation-->
     <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
-
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index c2a0a239d6..12b0173513 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -22,6 +22,10 @@
     <string name="title_about">"Про програму"</string>
     <string name="title_create_channel">Створити новий канал</string>
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
+    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_topic">Тема</string>
+    <string name="title_announcement">Оголошення</string>
+    <string name="title_description">Опис</string>
 
     <!-- Actions -->
     <string name="action_connect">Підключитися</string>
@@ -158,6 +162,9 @@
     <string name="msg_permalink_copied">Permalink copied</string>
     <!-- TODO - Add proper translation -->
     <string name="msg_muted_on_this_channel">You are muted on this channel</string>
+    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
+    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
+    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Приватний</string>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5cd939eca2..7dd147063f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,6 +9,7 @@
     <!-- Text colors -->
     <color name="colorPrimaryText">#DE000000</color>
     <color name="colorSecondaryText">#FF787878</color>
+    <color name="colorLightGrey">#F4F5F7</color>
     <color name="colorSecondaryTextLight">#FFC1C1C1</color>
 
     <!-- User status colors -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 57aeeb31ee..2b56b7bcc8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,6 +34,11 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="title_about">About</string>
     <string name="title_create_channel">Create Channel</string>
     <string name="title_are_you_sure">Are you sure?</string>
+    <string name="title_confirmation">Are You Sure you want to logout?</string>
+    <string name="title_channel_details">Channel Details</string>
+    <string name="title_topic">Topic</string>
+    <string name="title_announcement">Announcement</string>
+    <string name="title_description">Description</string>
 
     <!-- Actions -->
     <string name="action_connect">Connect</string>
@@ -166,6 +171,9 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="msg_two_factor_authentication">Two-factor Authentication</string>
     <string name="msg__your_2fa_code">What’s your 2FA code?</string>
     <string name="msg_permalink_copied">Permalink copied</string>
+    <string name="msg_no_topic">No topic added</string>
+    <string name="msg_no_announcement">No announcement added</string>
+    <string name="msg_no_description">No description added</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Private</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6c0b3a2d11..1d25dc1c7d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -142,10 +142,20 @@
         <item name="android:textSize">16sp</item>
     </style>
 
+    <style name="ChatDetails.Title.TextView" parent="TextAppearance.AppCompat.Title">
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">@color/colorPrimary</item>
+    </style>
+
+    <style name="ChatDetails.Content.TextView" parent="TextAppearance.AppCompat.Title">
+        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">@color/colorSecondaryTextLight</item>
+    </style>
+
     <style name="Sender.Name.TextView" parent="TextAppearance.AppCompat.Title">
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">1</item>
-        <item name="android:textSize">16sp</item>
+        <item name="android:textSize">20sp</item>
     </style>
 
     <style name="Message.TextView" parent="android:TextAppearance">

From 6d9868a4277f9c2efb6c0a57e4de4764e194e61e Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Wed, 14 Nov 2018 22:02:30 +0530
Subject: [PATCH 026/149] minor changes

---
 .../chat/rocket/android/settings/ui/SettingsFragment.kt     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
index 524bb60d4d..b7451a577f 100644
--- a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
@@ -93,11 +93,9 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
 
     private fun startAppPlayStore() {
         try {
-            fun getMarketAppLink()= getString(R.string.market_link)
-            startActivity(Intent(Intent.ACTION_VIEW, getMarketAppLink().toUri()))
+            startActivity(Intent(Intent.ACTION_VIEW, getString(R.string.market_link).toUri()))
         } catch (error: ActivityNotFoundException) {
-            fun getMarketWebLink() = getString(R.string.play_store_link)
-            startActivity(Intent(Intent.ACTION_VIEW, getMarketWebLink().toUri()))
+            startActivity(Intent(Intent.ACTION_VIEW, getString(R.string.play_store_link).toUri()))
         }
     }
 

From 54381015137887a3b4a66bbbc81df5ed000026d7 Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Wed, 14 Nov 2018 22:58:26 +0530
Subject: [PATCH 027/149] minor changes

---
 app/src/main/res/values-ja/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 6d05174173..ba36bdf64a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -24,7 +24,7 @@
     <string name="title_update_profile">プロフィールの更新</string>
     <string name="title_about">About</string>
     <string name="title_create_channel">新しいチャネルを作成</string>
-    <string name="title_confirmation">ログアウトしますか?</string>
+    <string name="title_confirmation">Do you want to log out?</string><!-- TODO Add translation -->
 
 
 
@@ -39,7 +39,7 @@
     <string name="action_create_channel">チャンネル作成</string>
     <string name="action_create">作ります</string>
     <string name="action_logout">ログアウト</string>
-    <string name="action_stay">いいえ</string>
+    <string name="action_stay">No</string> <!-- TODO Add translation -->
     <string name="action_files">ファイル</string>
     <string name="action_confirm_password">変更したパスワードの確認</string>
     <string name="action_join_chat">チャットに参加</string>

From 363090f1268775964754b9f9549a64979e544c4d Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Wed, 14 Nov 2018 23:05:18 +0530
Subject: [PATCH 028/149] minor changes

---
 app/src/main/res/values-ja/strings.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index ba36bdf64a..11a581dc5c 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -24,7 +24,6 @@
     <string name="title_update_profile">プロフィールの更新</string>
     <string name="title_about">About</string>
     <string name="title_create_channel">新しいチャネルを作成</string>
-    <string name="title_confirmation">Do you want to log out?</string><!-- TODO Add translation -->
 
 
 
@@ -39,7 +38,6 @@
     <string name="action_create_channel">チャンネル作成</string>
     <string name="action_create">作ります</string>
     <string name="action_logout">ログアウト</string>
-    <string name="action_stay">No</string> <!-- TODO Add translation -->
     <string name="action_files">ファイル</string>
     <string name="action_confirm_password">変更したパスワードの確認</string>
     <string name="action_join_chat">チャットに参加</string>

From 0b0853f324762f73b1f8b688b39d1ba5739e9296 Mon Sep 17 00:00:00 2001
From: Samer Alabi <sameralabi@hotmail.com>
Date: Wed, 14 Nov 2018 12:40:40 -0500
Subject: [PATCH 029/149] Bug Fixes

---
 app/src/main/res/values/strings.xml | 1 -
 app/src/main/res/values/styles.xml  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2b56b7bcc8..bc7859a3dd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,7 +34,6 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="title_about">About</string>
     <string name="title_create_channel">Create Channel</string>
     <string name="title_are_you_sure">Are you sure?</string>
-    <string name="title_confirmation">Are You Sure you want to logout?</string>
     <string name="title_channel_details">Channel Details</string>
     <string name="title_topic">Topic</string>
     <string name="title_announcement">Announcement</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1d25dc1c7d..51f2ff5607 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -155,7 +155,7 @@
     <style name="Sender.Name.TextView" parent="TextAppearance.AppCompat.Title">
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">1</item>
-        <item name="android:textSize">20sp</item>
+        <item name="android:textSize">16sp</item>
     </style>
 
     <style name="Message.TextView" parent="android:TextAppearance">

From 748a23c6fa6c502844dc7621b519d1a6f9c114ce Mon Sep 17 00:00:00 2001
From: Samer Alabi <sameralabi@hotmail.com>
Date: Wed, 14 Nov 2018 12:49:18 -0500
Subject: [PATCH 030/149] More Bug Fixes

---
 app/src/main/java/chat/rocket/android/db/DatabaseManager.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt b/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
index 82a613f6fd..e2fcecfbb7 100644
--- a/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
+++ b/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
@@ -354,7 +354,7 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
                     lastMessageText = mapLastMessageText(lastMessage),
                     lastMessageUserId = lastMessage?.sender?.id,
                     lastMessageTimestamp = lastMessage?.timestamp,
-                    muted = chatRoom.muted
+                    muted = muted ?: chatRoom.muted
                 )
             }
         }

From 19569217815ac8b67ba6f449202c9b4f70413d33 Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Wed, 14 Nov 2018 23:23:59 +0530
Subject: [PATCH 031/149] minor changes

---
 app/src/main/res/values-ja/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 11a581dc5c..109242de36 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -24,6 +24,8 @@
     <string name="title_update_profile">プロフィールの更新</string>
     <string name="title_about">About</string>
     <string name="title_create_channel">新しいチャネルを作成</string>
+    <string name="title_are_you_sure">本気ですか？</string>
+
 
 
 

From 689cffce7f0c9d7d077ca53c0c57166dc037f5aa Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Wed, 14 Nov 2018 12:04:08 -0800
Subject: [PATCH 032/149] Adds the rocket.chat domain for avoid typing it

---
 .../server/ui/ServerFragment.kt               | 45 +++++++++++++++----
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/authentication/server/ui/ServerFragment.kt b/app/src/main/java/chat/rocket/android/authentication/server/ui/ServerFragment.kt
index 97107154de..adeebc8d20 100644
--- a/app/src/main/java/chat/rocket/android/authentication/server/ui/ServerFragment.kt
+++ b/app/src/main/java/chat/rocket/android/authentication/server/ui/ServerFragment.kt
@@ -1,6 +1,7 @@
 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

From a4be9a73efd94a94bbeeadb61b75e0c10b6c2bc9 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Wed, 14 Nov 2018 13:49:48 -0800
Subject: [PATCH 033/149] Updates Analytics.kt

---
 .../chat.rocket.android.db.RCDatabase/12.json | 1087 +++++++++++++++++
 .../rocket/android/analytics/Analytics.kt     |   18 +-
 2 files changed, 1096 insertions(+), 9 deletions(-)
 create mode 100644 app/schemas/chat.rocket.android.db.RCDatabase/12.json

diff --git a/app/schemas/chat.rocket.android.db.RCDatabase/12.json b/app/schemas/chat.rocket.android.db.RCDatabase/12.json
new file mode 100644
index 0000000000..ce04c063bd
--- /dev/null
+++ b/app/schemas/chat.rocket.android.db.RCDatabase/12.json
@@ -0,0 +1,1087 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 12,
+    "identityHash": "c533a4d17707cba4f91d35a310b8439d",
+    "entities": [
+      {
+        "tableName": "users",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `username` TEXT, `name` TEXT, `status` TEXT NOT NULL, `utcOffset` REAL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "username",
+            "columnName": "username",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "utcOffset",
+            "columnName": "utcOffset",
+            "affinity": "REAL",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_users_username",
+            "unique": false,
+            "columnNames": [
+              "username"
+            ],
+            "createSql": "CREATE  INDEX `index_users_username` ON `${TABLE_NAME}` (`username`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "chatrooms",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, `broadcast` INTEGER, `muted` TEXT, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subscriptionId",
+            "columnName": "subscriptionId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullname",
+            "columnName": "fullname",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "ownerId",
+            "columnName": "ownerId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "readonly",
+            "columnName": "readonly",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isDefault",
+            "columnName": "isDefault",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "favorite",
+            "columnName": "favorite",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "open",
+            "columnName": "open",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "alert",
+            "columnName": "alert",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userMentions",
+            "columnName": "userMentions",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "groupMentions",
+            "columnName": "groupMentions",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "updatedAt",
+            "columnName": "updatedAt",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastSeen",
+            "columnName": "lastSeen",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastMessageText",
+            "columnName": "lastMessageText",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastMessageUserId",
+            "columnName": "lastMessageUserId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastMessageTimestamp",
+            "columnName": "lastMessageTimestamp",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "broadcast",
+            "columnName": "broadcast",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "muted",
+            "columnName": "muted",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_chatrooms_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "createSql": "CREATE  INDEX `index_chatrooms_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_chatrooms_ownerId",
+            "unique": false,
+            "columnNames": [
+              "ownerId"
+            ],
+            "createSql": "CREATE  INDEX `index_chatrooms_ownerId` ON `${TABLE_NAME}` (`ownerId`)"
+          },
+          {
+            "name": "index_chatrooms_subscriptionId",
+            "unique": true,
+            "columnNames": [
+              "subscriptionId"
+            ],
+            "createSql": "CREATE UNIQUE INDEX `index_chatrooms_subscriptionId` ON `${TABLE_NAME}` (`subscriptionId`)"
+          },
+          {
+            "name": "index_chatrooms_updatedAt",
+            "unique": false,
+            "columnNames": [
+              "updatedAt"
+            ],
+            "createSql": "CREATE  INDEX `index_chatrooms_updatedAt` ON `${TABLE_NAME}` (`updatedAt`)"
+          },
+          {
+            "name": "index_chatrooms_lastMessageUserId",
+            "unique": false,
+            "columnNames": [
+              "lastMessageUserId"
+            ],
+            "createSql": "CREATE  INDEX `index_chatrooms_lastMessageUserId` ON `${TABLE_NAME}` (`lastMessageUserId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "users",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "ownerId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          },
+          {
+            "table": "users",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          },
+          {
+            "table": "users",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "lastMessageUserId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `roomId` TEXT NOT NULL, `message` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `senderId` TEXT, `updatedAt` INTEGER, `editedAt` INTEGER, `editedBy` TEXT, `senderAlias` TEXT, `avatar` TEXT, `type` TEXT, `groupable` INTEGER NOT NULL, `parseUrls` INTEGER NOT NULL, `pinned` INTEGER NOT NULL, `role` TEXT, `synced` INTEGER NOT NULL, `unread` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`senderId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`editedBy`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roomId",
+            "columnName": "roomId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "message",
+            "columnName": "message",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderId",
+            "columnName": "senderId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "updatedAt",
+            "columnName": "updatedAt",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "editedAt",
+            "columnName": "editedAt",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "editedBy",
+            "columnName": "editedBy",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "senderAlias",
+            "columnName": "senderAlias",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "avatar",
+            "columnName": "avatar",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "groupable",
+            "columnName": "groupable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parseUrls",
+            "columnName": "parseUrls",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pinned",
+            "columnName": "pinned",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "role",
+            "columnName": "role",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "synced",
+            "columnName": "synced",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "users",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "senderId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          },
+          {
+            "table": "users",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "editedBy"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "message_favorites",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`messageId` TEXT NOT NULL, `userId` TEXT NOT NULL, PRIMARY KEY(`messageId`, `userId`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "messageId",
+            "columnName": "messageId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "messageId",
+            "userId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "messages",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "messageId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          },
+          {
+            "table": "users",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "message_mentions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`messageId` TEXT NOT NULL, `userId` TEXT NOT NULL, PRIMARY KEY(`messageId`, `userId`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "messageId",
+            "columnName": "messageId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "messageId",
+            "userId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "messages",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "messageId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          },
+          {
+            "table": "users",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "message_channels",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`messageId` TEXT NOT NULL, `roomId` TEXT NOT NULL, `roomName` TEXT, PRIMARY KEY(`messageId`, `roomId`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "messageId",
+            "columnName": "messageId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roomId",
+            "columnName": "roomId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roomName",
+            "columnName": "roomName",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "messageId",
+            "roomId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "messages",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "messageId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "attachments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` TEXT NOT NULL, `message_id` TEXT NOT NULL, `title` TEXT, `type` TEXT, `description` TEXT, `text` TEXT, `author_name` TEXT, `author_icon` TEXT, `author_link` TEXT, `thumb_url` TEXT, `color` TEXT, `fallback` TEXT, `title_link` TEXT, `title_link_download` INTEGER NOT NULL, `image_url` TEXT, `image_type` TEXT, `image_size` INTEGER, `video_url` TEXT, `video_type` TEXT, `video_size` INTEGER, `audio_url` TEXT, `audio_type` TEXT, `audio_size` INTEGER, `message_link` TEXT, `timestamp` INTEGER, `has_actions` INTEGER NOT NULL, `has_fields` INTEGER NOT NULL, `button_alignment` TEXT, PRIMARY KEY(`_id`), FOREIGN KEY(`message_id`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "_id",
+            "columnName": "_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "author_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorIcon",
+            "columnName": "author_icon",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorLink",
+            "columnName": "author_link",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "thumbUrl",
+            "columnName": "thumb_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fallback",
+            "columnName": "fallback",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "titleLink",
+            "columnName": "title_link",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "titleLinkDownload",
+            "columnName": "title_link_download",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "image_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "imageType",
+            "columnName": "image_type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "imageSize",
+            "columnName": "image_size",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "videoUrl",
+            "columnName": "video_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "videoType",
+            "columnName": "video_type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "videoSize",
+            "columnName": "video_size",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "audioUrl",
+            "columnName": "audio_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "audioType",
+            "columnName": "audio_type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "audioSize",
+            "columnName": "audio_size",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "messageLink",
+            "columnName": "message_link",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasActions",
+            "columnName": "has_actions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasFields",
+            "columnName": "has_fields",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "buttonAlignment",
+            "columnName": "button_alignment",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "messages",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "message_id"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "attachment_fields",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `attachmentId` TEXT NOT NULL, `title` TEXT NOT NULL, `value` TEXT NOT NULL, FOREIGN KEY(`attachmentId`) REFERENCES `attachments`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "attachmentId",
+            "columnName": "attachmentId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_attachment_fields_attachmentId",
+            "unique": false,
+            "columnNames": [
+              "attachmentId"
+            ],
+            "createSql": "CREATE  INDEX `index_attachment_fields_attachmentId` ON `${TABLE_NAME}` (`attachmentId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "attachments",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "attachmentId"
+            ],
+            "referencedColumns": [
+              "_id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "attachment_action",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `attachmentId` TEXT NOT NULL, `type` TEXT NOT NULL, `text` TEXT, `url` TEXT, `isWebView` INTEGER, `webViewHeightRatio` TEXT, `imageUrl` TEXT, `message` TEXT, `isMessageInChatWindow` INTEGER, FOREIGN KEY(`attachmentId`) REFERENCES `attachments`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "attachmentId",
+            "columnName": "attachmentId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isWebView",
+            "columnName": "isWebView",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "webViewHeightRatio",
+            "columnName": "webViewHeightRatio",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "message",
+            "columnName": "message",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isMessageInChatWindow",
+            "columnName": "isMessageInChatWindow",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_attachment_action_attachmentId",
+            "unique": false,
+            "columnNames": [
+              "attachmentId"
+            ],
+            "createSql": "CREATE  INDEX `index_attachment_action_attachmentId` ON `${TABLE_NAME}` (`attachmentId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "attachments",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "attachmentId"
+            ],
+            "referencedColumns": [
+              "_id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "urls",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`urlId` INTEGER PRIMARY KEY AUTOINCREMENT, `messageId` TEXT NOT NULL, `url` TEXT NOT NULL, `hostname` TEXT, `title` TEXT, `description` TEXT, `imageUrl` TEXT, FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "urlId",
+            "columnName": "urlId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "messageId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hostname",
+            "columnName": "hostname",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "urlId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_urls_messageId",
+            "unique": false,
+            "columnNames": [
+              "messageId"
+            ],
+            "createSql": "CREATE  INDEX `index_urls_messageId` ON `${TABLE_NAME}` (`messageId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "messages",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "messageId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "reactions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`reaction` TEXT NOT NULL, `messageId` TEXT NOT NULL, `count` INTEGER NOT NULL, `usernames` TEXT NOT NULL, PRIMARY KEY(`reaction`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "reaction",
+            "columnName": "reaction",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "messageId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "count",
+            "columnName": "count",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "usernames",
+            "columnName": "usernames",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "reaction"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_reactions_messageId",
+            "unique": false,
+            "columnNames": [
+              "messageId"
+            ],
+            "createSql": "CREATE  INDEX `index_reactions_messageId` ON `${TABLE_NAME}` (`messageId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "messages",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "messageId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "messages_sync",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`roomId` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, PRIMARY KEY(`roomId`))",
+        "fields": [
+          {
+            "fieldPath": "roomId",
+            "columnName": "roomId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "roomId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"c533a4d17707cba4f91d35a310b8439d\")"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/analytics/Analytics.kt b/app/src/main/java/chat/rocket/android/analytics/Analytics.kt
index 9e21db338e..dfbbd17679 100644
--- a/app/src/main/java/chat/rocket/android/analytics/Analytics.kt
+++ b/app/src/main/java/chat/rocket/android/analytics/Analytics.kt
@@ -12,7 +12,7 @@ interface Analytics {
      * @param event The [AuthenticationEvent] used to log in.
      * @param loginSucceeded True if successful logged in, false otherwise.
      */
-    fun logLogin(event: AuthenticationEvent, loginSucceeded: Boolean)
+    fun logLogin(event: AuthenticationEvent, loginSucceeded: Boolean) {}
 
     /**
      * Logs the sign up event.
@@ -20,14 +20,14 @@ interface Analytics {
      * @param event The [AuthenticationEvent] used to sign up.
      * @param signUpSucceeded True if successful signed up, false otherwise.
      */
-    fun logSignUp(event: AuthenticationEvent, signUpSucceeded: Boolean)
+    fun logSignUp(event: AuthenticationEvent, signUpSucceeded: Boolean) {}
 
     /**
      * Logs the screen view event.
      *
      * @param event The [ScreenViewEvent] to log.
      */
-    fun logScreenView(event: ScreenViewEvent)
+    fun logScreenView(event: ScreenViewEvent) {}
 
     /**
      * Logs the message sent event.
@@ -35,7 +35,7 @@ interface Analytics {
      * @param event The [SubscriptionTypeEvent] to log.
      * @param serverUrl The server URL to log.
      */
-    fun logMessageSent(event: SubscriptionTypeEvent, serverUrl: String)
+    fun logMessageSent(event: SubscriptionTypeEvent, serverUrl: String) {}
 
     /**
      * Logs the media upload event.
@@ -43,14 +43,14 @@ interface Analytics {
      * @param event The [SubscriptionTypeEvent] to log.
      * @param mimeType The mime type of the media uploaded to log.
      */
-    fun logMediaUploaded(event: SubscriptionTypeEvent, mimeType: String)
+    fun logMediaUploaded(event: SubscriptionTypeEvent, mimeType: String) {}
 
     /**
      * Logs the reaction event.
      *
      * @param event The [SubscriptionTypeEvent] to log.
      */
-    fun logReaction(event: SubscriptionTypeEvent)
+    fun logReaction(event: SubscriptionTypeEvent) {}
 
     /**
      * Logs the server switch event.
@@ -58,17 +58,17 @@ interface Analytics {
      * @param serverUrl The server URL to log.
      * @param serverCount The number of server(s) the use own.
      */
-    fun logServerSwitch(serverUrl: String, serverCount: Int)
+    fun logServerSwitch(serverUrl: String, serverCount: Int) {}
 
     /**
      * Logs the admin opening event.
      */
-    fun logOpenAdmin()
+    fun logOpenAdmin() {}
 
     /**
      * Logs the reset password event.
      *
      * @param resetPasswordSucceeded True if successful reset password, false otherwise.
      */
-    fun logResetPassword(resetPasswordSucceeded: Boolean)
+    fun logResetPassword(resetPasswordSucceeded: Boolean) {}
 }

From 540cc085aa1a07186ca6e4821bbcb24e2f583b41 Mon Sep 17 00:00:00 2001
From: Lucio Maciel <luciofm@gmail.com>
Date: Mon, 19 Nov 2018 09:55:55 -0300
Subject: [PATCH 034/149] More retryDB

---
 .../presentation/ChatRoomPresenter.kt         | 137 +++++++++---------
 .../presentation/ChatRoomsPresenter.kt        |   3 +-
 .../chat/rocket/android/db/DatabaseManager.kt |   4 +-
 .../presentation/FavoriteMessagesPresenter.kt |  19 ++-
 .../files/presentation/FilesPresenter.kt      |  17 ++-
 .../members/presentation/MembersPresenter.kt  |  19 ++-
 .../presentation/PinnedMessagesPresenter.kt   |  19 ++-
 7 files changed, 118 insertions(+), 100 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
index 799f04f54a..08562a53fc 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
@@ -39,6 +39,7 @@ import chat.rocket.android.util.extension.getByteArray
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.exhaustive
+import chat.rocket.android.util.retryDB
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.RoomType
@@ -138,7 +139,7 @@ class ChatRoomPresenter @Inject constructor(
             } finally {
                 // User has at least an 'owner' or 'moderator' role.
                 val userCanMod = isOwnerOrMod()
-                val chatRoom = dbManager.getRoom(roomId)
+                val chatRoom = retryDB("getRoom($roomId)") { dbManager.getRoom(roomId) }
                 val muted = chatRoom?.chatRoom?.muted ?: emptyList()
                 // Can post anyway if has the 'post-readonly' permission on server.
                 val userCanPost = userCanMod || permissions.canPostToReadOnlyChannels() ||
@@ -904,77 +905,81 @@ class ChatRoomPresenter @Inject constructor(
 
     // TODO: move this to new interactor or FetchChatRoomsInteractor?
     private suspend fun getChatRoomAsync(roomId: String): ChatRoom? = withContext(CommonPool) {
-        return@withContext dbManager.chatRoomDao().get(roomId)?.let {
-            with(it.chatRoom) {
-                ChatRoom(
-                    id = id,
-                    subscriptionId = subscriptionId,
-                    type = roomTypeOf(type),
-                    unread = unread,
-                    broadcast = broadcast ?: false,
-                    alert = alert,
-                    fullName = fullname,
-                    name = name,
-                    favorite = favorite ?: false,
-                    default = isDefault ?: false,
-                    readonly = readonly,
-                    open = open,
-                    lastMessage = null,
-                    archived = false,
-                    status = null,
-                    user = null,
-                    userMentions = userMentions,
-                    client = client,
-                    announcement = null,
-                    description = null,
-                    groupMentions = groupMentions,
-                    roles = null,
-                    topic = null,
-                    lastSeen = this.lastSeen,
-                    timestamp = timestamp,
-                    updatedAt = updatedAt
-                )
+        retryDB("getRoom($roomId)") {
+            dbManager.chatRoomDao().get(roomId)?.let {
+                with(it.chatRoom) {
+                    ChatRoom(
+                            id = id,
+                            subscriptionId = subscriptionId,
+                            type = roomTypeOf(type),
+                            unread = unread,
+                            broadcast = broadcast ?: false,
+                            alert = alert,
+                            fullName = fullname,
+                            name = name,
+                            favorite = favorite ?: false,
+                            default = isDefault ?: false,
+                            readonly = readonly,
+                            open = open,
+                            lastMessage = null,
+                            archived = false,
+                            status = null,
+                            user = null,
+                            userMentions = userMentions,
+                            client = client,
+                            announcement = null,
+                            description = null,
+                            groupMentions = groupMentions,
+                            roles = null,
+                            topic = null,
+                            lastSeen = this.lastSeen,
+                            timestamp = timestamp,
+                            updatedAt = updatedAt
+                    )
+                }
             }
         }
     }
 
     // TODO: move this to new interactor or FetchChatRoomsInteractor?
     private suspend fun getChatRoomsAsync(name: String? = null): List<ChatRoom> = withContext(CommonPool) {
-        return@withContext dbManager.chatRoomDao().getAllSync().filter {
-            if (name == null) {
-                return@filter true
-            }
-            it.chatRoom.name == name || it.chatRoom.fullname == name
-        }.map {
-            with(it.chatRoom) {
-                ChatRoom(
-                    id = id,
-                    subscriptionId = subscriptionId,
-                    type = roomTypeOf(type),
-                    unread = unread,
-                    broadcast = broadcast ?: false,
-                    alert = alert,
-                    fullName = fullname,
-                    name = name ?: "",
-                    favorite = favorite ?: false,
-                    default = isDefault ?: false,
-                    readonly = readonly,
-                    open = open,
-                    lastMessage = null,
-                    archived = false,
-                    status = null,
-                    user = null,
-                    userMentions = userMentions,
-                    client = client,
-                    announcement = null,
-                    description = null,
-                    groupMentions = groupMentions,
-                    roles = null,
-                    topic = null,
-                    lastSeen = this.lastSeen,
-                    timestamp = timestamp,
-                    updatedAt = updatedAt
-                )
+        retryDB("getAllSync()") {
+            dbManager.chatRoomDao().getAllSync().filter {
+                if (name == null) {
+                    return@filter true
+                }
+                it.chatRoom.name == name || it.chatRoom.fullname == name
+            }.map {
+                with(it.chatRoom) {
+                    ChatRoom(
+                            id = id,
+                            subscriptionId = subscriptionId,
+                            type = roomTypeOf(type),
+                            unread = unread,
+                            broadcast = broadcast ?: false,
+                            alert = alert,
+                            fullName = fullname,
+                            name = name ?: "",
+                            favorite = favorite ?: false,
+                            default = isDefault ?: false,
+                            readonly = readonly,
+                            open = open,
+                            lastMessage = null,
+                            archived = false,
+                            status = null,
+                            user = null,
+                            userMentions = userMentions,
+                            client = client,
+                            announcement = null,
+                            description = null,
+                            groupMentions = groupMentions,
+                            roles = null,
+                            topic = null,
+                            lastSeen = this.lastSeen,
+                            timestamp = timestamp,
+                            updatedAt = updatedAt
+                    )
+                }
             }
         }
     }
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt b/app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt
index e119b94634..4fbfd29609 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt
+++ b/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
@@ -45,7 +46,7 @@ class ChatRoomsPresenter @Inject constructor(
         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 {
diff --git a/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt b/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
index f72f45fc27..2b6dca2c39 100644
--- a/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
+++ b/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
@@ -92,8 +92,8 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
         }
     }
 
-    fun logout() {
-        database.clearAllTables()
+    suspend fun logout() {
+        retryDB("clearAllTables") { database.clearAllTables() }
     }
 
     suspend fun getRoom(id: String) = withContext(dbManagerContext) {
diff --git a/app/src/main/java/chat/rocket/android/favoritemessages/presentation/FavoriteMessagesPresenter.kt b/app/src/main/java/chat/rocket/android/favoritemessages/presentation/FavoriteMessagesPresenter.kt
index 777d4f881b..866da5196b 100644
--- a/app/src/main/java/chat/rocket/android/favoritemessages/presentation/FavoriteMessagesPresenter.kt
+++ b/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
@@ -34,14 +35,16 @@ class FavoriteMessagesPresenter @Inject constructor(
         launchUI(strategy) {
             try {
                 view.showLoading()
-                dbManager.getRoom(roomId)?.let {
-                    val favoriteMessages =
-                        client.getFavoriteMessages(roomId, roomTypeOf(it.chatRoom.type), offset)
-                    val messageList = mapper.map(favoriteMessages.result, asNotReversed = true)
-                    view.showFavoriteMessages(messageList)
-                    offset += 1 * 30
-                }.ifNull {
-                    Timber.e("Couldn't find a room with id: $roomId at current server.")
+                retryDB("getRoom($roomId)") {
+                    dbManager.getRoom(roomId)?.let {
+                        val favoriteMessages =
+                                client.getFavoriteMessages(roomId, roomTypeOf(it.chatRoom.type), offset)
+                        val messageList = mapper.map(favoriteMessages.result, asNotReversed = true)
+                        view.showFavoriteMessages(messageList)
+                        offset += 1 * 30
+                    }.ifNull {
+                        Timber.e("Couldn't find a room with id: $roomId at current server.")
+                    }
                 }
             } catch (exception: RocketChatException) {
                 Timber.e(exception)
diff --git a/app/src/main/java/chat/rocket/android/files/presentation/FilesPresenter.kt b/app/src/main/java/chat/rocket/android/files/presentation/FilesPresenter.kt
index 5b8517a744..8f1b08c7b6 100644
--- a/app/src/main/java/chat/rocket/android/files/presentation/FilesPresenter.kt
+++ b/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
@@ -36,13 +37,15 @@ class FilesPresenter @Inject constructor(
         launchUI(strategy) {
             try {
                 view.showLoading()
-                dbManager.getRoom(roomId)?.let {
-                    val files = client.getFiles(roomId, roomTypeOf(it.chatRoom.type), offset)
-                    val filesUiModel = mapper.mapToUiModelList(files.result)
-                    view.showFiles(filesUiModel, files.total)
-                    offset += 1 * 30
-                }.ifNull {
-                    Timber.e("Couldn't find a room with id: $roomId at current server.")
+                retryDB("getRoom($roomId)") {
+                    dbManager.getRoom(roomId)?.let {
+                        val files = client.getFiles(roomId, roomTypeOf(it.chatRoom.type), offset)
+                        val filesUiModel = mapper.mapToUiModelList(files.result)
+                        view.showFiles(filesUiModel, files.total)
+                        offset += 1 * 30
+                    }.ifNull {
+                        Timber.e("Couldn't find a room with id: $roomId at current server.")
+                    }
                 }
             } catch (exception: RocketChatException) {
                 exception.message?.let {
diff --git a/app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt b/app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt
index 25b37abedb..f7ce544a1e 100644
--- a/app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt
+++ b/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
@@ -36,14 +37,16 @@ class MembersPresenter @Inject constructor(
         launchUI(strategy) {
             try {
                 view.showLoading()
-                dbManager.getRoom(roomId)?.let {
-                    val members =
-                        client.getMembers(roomId, roomTypeOf(it.chatRoom.type), offset, 60)
-                    val memberUiModels = mapper.mapToUiModelList(members.result)
-                    view.showMembers(memberUiModels, members.total)
-                    offset += 1 * 60L
-                }.ifNull {
-                    Timber.e("Couldn't find a room with id: $roomId at current server.")
+                retryDB("getRoom($roomId)") {
+                    dbManager.getRoom(roomId)?.let {
+                        val members =
+                                client.getMembers(roomId, roomTypeOf(it.chatRoom.type), offset, 60)
+                        val memberUiModels = mapper.mapToUiModelList(members.result)
+                        view.showMembers(memberUiModels, members.total)
+                        offset += 1 * 60L
+                    }.ifNull {
+                        Timber.e("Couldn't find a room with id: $roomId at current server.")
+                    }
                 }
             } catch (exception: RocketChatException) {
                 exception.message?.let {
diff --git a/app/src/main/java/chat/rocket/android/pinnedmessages/presentation/PinnedMessagesPresenter.kt b/app/src/main/java/chat/rocket/android/pinnedmessages/presentation/PinnedMessagesPresenter.kt
index 88d0404577..ab05cdb26d 100644
--- a/app/src/main/java/chat/rocket/android/pinnedmessages/presentation/PinnedMessagesPresenter.kt
+++ b/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
@@ -34,14 +35,16 @@ class PinnedMessagesPresenter @Inject constructor(
         launchUI(strategy) {
             try {
                 view.showLoading()
-                dbManager.getRoom(roomId)?.let {
-                    val pinnedMessages =
-                        client.getPinnedMessages(roomId, roomTypeOf(it.chatRoom.type), offset)
-                    val messageList = mapper.map(pinnedMessages.result, asNotReversed = true)
-                    view.showPinnedMessages(messageList)
-                    offset += 1 * 30
-                }.ifNull {
-                    Timber.e("Couldn't find a room with id: $roomId at current server.")
+                retryDB("getRoom($roomId)") {
+                    dbManager.getRoom(roomId)?.let {
+                        val pinnedMessages =
+                                client.getPinnedMessages(roomId, roomTypeOf(it.chatRoom.type), offset)
+                        val messageList = mapper.map(pinnedMessages.result, asNotReversed = true)
+                        view.showPinnedMessages(messageList)
+                        offset += 1 * 30
+                    }.ifNull {
+                        Timber.e("Couldn't find a room with id: $roomId at current server.")
+                    }
                 }
             } catch (exception: RocketChatException) {
                 Timber.e(exception)

From 2095a5080804da0da13a6ca2bb209810770c02de Mon Sep 17 00:00:00 2001
From: Lucio Maciel <luciofm@gmail.com>
Date: Mon, 19 Nov 2018 18:22:49 -0300
Subject: [PATCH 035/149] Notification deeplink to room

---
 .../presentation/ChatRoomPresenter.kt         |  2 +-
 .../presentation/ChatRoomsPresenter.kt        | 20 +++++++++++++++++++
 .../android/chatrooms/ui/ChatRoomsFragment.kt |  3 +--
 .../presentation/FavoriteMessagesPresenter.kt | 18 ++++++++---------
 .../files/presentation/FilesPresenter.kt      | 16 +++++++--------
 .../members/presentation/MembersPresenter.kt  | 18 ++++++++---------
 .../presentation/PinnedMessagesPresenter.kt   | 18 ++++++++---------
 .../chat/rocket/android/push/PushManager.kt   |  7 ++-----
 .../android/push/FirebaseMessagingService.kt  | 10 +++++++---
 9 files changed, 62 insertions(+), 50 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
index 08562a53fc..8bf650a7d6 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
@@ -139,7 +139,7 @@ class ChatRoomPresenter @Inject constructor(
             } finally {
                 // User has at least an 'owner' or 'moderator' role.
                 val userCanMod = isOwnerOrMod()
-                val chatRoom = retryDB("getRoom($roomId)") { dbManager.getRoom(roomId) }
+                val chatRoom = dbManager.getRoom(roomId)
                 val muted = chatRoom?.chatRoom?.muted ?: emptyList()
                 // Can post anyway if has the 'post-readonly' permission on server.
                 val userCanPost = userCanMod || permissions.canPostToReadOnlyChannels() ||
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt b/app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt
index 4fbfd29609..2e7a718a06 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt
@@ -42,6 +42,26 @@ 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)
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt b/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
index 26d83a45ac..880245e151 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
+++ b/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
             }
         }
diff --git a/app/src/main/java/chat/rocket/android/favoritemessages/presentation/FavoriteMessagesPresenter.kt b/app/src/main/java/chat/rocket/android/favoritemessages/presentation/FavoriteMessagesPresenter.kt
index 866da5196b..f71d792fb9 100644
--- a/app/src/main/java/chat/rocket/android/favoritemessages/presentation/FavoriteMessagesPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/favoritemessages/presentation/FavoriteMessagesPresenter.kt
@@ -35,16 +35,14 @@ class FavoriteMessagesPresenter @Inject constructor(
         launchUI(strategy) {
             try {
                 view.showLoading()
-                retryDB("getRoom($roomId)") {
-                    dbManager.getRoom(roomId)?.let {
-                        val favoriteMessages =
-                                client.getFavoriteMessages(roomId, roomTypeOf(it.chatRoom.type), offset)
-                        val messageList = mapper.map(favoriteMessages.result, asNotReversed = true)
-                        view.showFavoriteMessages(messageList)
-                        offset += 1 * 30
-                    }.ifNull {
-                        Timber.e("Couldn't find a room with id: $roomId at current server.")
-                    }
+                dbManager.getRoom(roomId)?.let {
+                    val favoriteMessages =
+                            client.getFavoriteMessages(roomId, roomTypeOf(it.chatRoom.type), offset)
+                    val messageList = mapper.map(favoriteMessages.result, asNotReversed = true)
+                    view.showFavoriteMessages(messageList)
+                    offset += 1 * 30
+                }.ifNull {
+                    Timber.e("Couldn't find a room with id: $roomId at current server.")
                 }
             } catch (exception: RocketChatException) {
                 Timber.e(exception)
diff --git a/app/src/main/java/chat/rocket/android/files/presentation/FilesPresenter.kt b/app/src/main/java/chat/rocket/android/files/presentation/FilesPresenter.kt
index 8f1b08c7b6..38275e4015 100644
--- a/app/src/main/java/chat/rocket/android/files/presentation/FilesPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/files/presentation/FilesPresenter.kt
@@ -37,15 +37,13 @@ class FilesPresenter @Inject constructor(
         launchUI(strategy) {
             try {
                 view.showLoading()
-                retryDB("getRoom($roomId)") {
-                    dbManager.getRoom(roomId)?.let {
-                        val files = client.getFiles(roomId, roomTypeOf(it.chatRoom.type), offset)
-                        val filesUiModel = mapper.mapToUiModelList(files.result)
-                        view.showFiles(filesUiModel, files.total)
-                        offset += 1 * 30
-                    }.ifNull {
-                        Timber.e("Couldn't find a room with id: $roomId at current server.")
-                    }
+                dbManager.getRoom(roomId)?.let {
+                    val files = client.getFiles(roomId, roomTypeOf(it.chatRoom.type), offset)
+                    val filesUiModel = mapper.mapToUiModelList(files.result)
+                    view.showFiles(filesUiModel, files.total)
+                    offset += 1 * 30
+                }.ifNull {
+                    Timber.e("Couldn't find a room with id: $roomId at current server.")
                 }
             } catch (exception: RocketChatException) {
                 exception.message?.let {
diff --git a/app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt b/app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt
index f7ce544a1e..92948640f7 100644
--- a/app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt
@@ -37,16 +37,14 @@ class MembersPresenter @Inject constructor(
         launchUI(strategy) {
             try {
                 view.showLoading()
-                retryDB("getRoom($roomId)") {
-                    dbManager.getRoom(roomId)?.let {
-                        val members =
-                                client.getMembers(roomId, roomTypeOf(it.chatRoom.type), offset, 60)
-                        val memberUiModels = mapper.mapToUiModelList(members.result)
-                        view.showMembers(memberUiModels, members.total)
-                        offset += 1 * 60L
-                    }.ifNull {
-                        Timber.e("Couldn't find a room with id: $roomId at current server.")
-                    }
+                dbManager.getRoom(roomId)?.let {
+                    val members =
+                            client.getMembers(roomId, roomTypeOf(it.chatRoom.type), offset, 60)
+                    val memberUiModels = mapper.mapToUiModelList(members.result)
+                    view.showMembers(memberUiModels, members.total)
+                    offset += 1 * 60L
+                }.ifNull {
+                    Timber.e("Couldn't find a room with id: $roomId at current server.")
                 }
             } catch (exception: RocketChatException) {
                 exception.message?.let {
diff --git a/app/src/main/java/chat/rocket/android/pinnedmessages/presentation/PinnedMessagesPresenter.kt b/app/src/main/java/chat/rocket/android/pinnedmessages/presentation/PinnedMessagesPresenter.kt
index ab05cdb26d..fa9f4020ee 100644
--- a/app/src/main/java/chat/rocket/android/pinnedmessages/presentation/PinnedMessagesPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/pinnedmessages/presentation/PinnedMessagesPresenter.kt
@@ -35,16 +35,14 @@ class PinnedMessagesPresenter @Inject constructor(
         launchUI(strategy) {
             try {
                 view.showLoading()
-                retryDB("getRoom($roomId)") {
-                    dbManager.getRoom(roomId)?.let {
-                        val pinnedMessages =
-                                client.getPinnedMessages(roomId, roomTypeOf(it.chatRoom.type), offset)
-                        val messageList = mapper.map(pinnedMessages.result, asNotReversed = true)
-                        view.showPinnedMessages(messageList)
-                        offset += 1 * 30
-                    }.ifNull {
-                        Timber.e("Couldn't find a room with id: $roomId at current server.")
-                    }
+                dbManager.getRoom(roomId)?.let {
+                    val pinnedMessages =
+                            client.getPinnedMessages(roomId, roomTypeOf(it.chatRoom.type), offset)
+                    val messageList = mapper.map(pinnedMessages.result, asNotReversed = true)
+                    view.showPinnedMessages(messageList)
+                    offset += 1 * 30
+                }.ifNull {
+                    Timber.e("Couldn't find a room with id: $roomId at current server.")
                 }
             } catch (exception: RocketChatException) {
                 Timber.e(exception)
diff --git a/app/src/main/java/chat/rocket/android/push/PushManager.kt b/app/src/main/java/chat/rocket/android/push/PushManager.kt
index 693352ecd7..6771b040f0 100644
--- a/app/src/main/java/chat/rocket/android/push/PushManager.kt
+++ b/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)
     }
 
diff --git a/app/src/play/java/chat/rocket/android/push/FirebaseMessagingService.kt b/app/src/play/java/chat/rocket/android/push/FirebaseMessagingService.kt
index 14d1f7c41f..abac90faf2 100644
--- a/app/src/play/java/chat/rocket/android/push/FirebaseMessagingService.kt
+++ b/app/src/play/java/chat/rocket/android/push/FirebaseMessagingService.kt
@@ -1,5 +1,6 @@
 package chat.rocket.android.push
 
+import android.os.Bundle
 import androidx.core.os.bundleOf
 import androidx.work.Constraints
 import androidx.work.NetworkType
@@ -23,9 +24,12 @@ class FirebaseMessagingService : FirebaseMessagingService() {
     }
 
     override fun onMessageReceived(message: RemoteMessage) {
-        // XXX - for now this is ok, if we start to do network calls, use a Worker instead
-        message.data?.let {
-            pushManager.handle(bundleOf(*(it.map { Pair(it.key, it.value) }).toTypedArray()))
+        message.data?.let { data ->
+            val bundle = Bundle()
+            data.entries.forEach { entry ->
+                bundle.putString(entry.key, entry.value)
+            }
+            pushManager.handle(bundle)
         }
     }
 

From 18e83a4b87714fe25a98cce3184a6392f5b5de8f Mon Sep 17 00:00:00 2001
From: Leonardo Aramaki <leoaramaki@gmail.com>
Date: Mon, 19 Nov 2018 20:28:34 -0200
Subject: [PATCH 036/149] Observe room changes to the current channel

---
 .../chatroom/di/ChatRoomFragmentModule.kt     |  6 ++++--
 .../presentation/ChatRoomPresenter.kt         |  6 ++----
 .../android/chatroom/ui/ChatRoomFragment.kt   |  4 +++-
 .../chatrooms/adapter/RoomUiModelMapper.kt    | 20 ++++++++++++++-----
 .../chatrooms/adapter/model/RoomUiModel.kt    |  2 +-
 .../chatrooms/di/ChatRoomsFragmentModule.kt   |  6 ++++--
 6 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt b/app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt
index 0bd6f38994..72bc966e19 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt
@@ -13,6 +13,7 @@ import chat.rocket.android.db.DatabaseManagerFactory
 import chat.rocket.android.db.UserDao
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 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
@@ -69,8 +70,9 @@ class ChatRoomFragmentModule {
         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)
     }
 }
diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
index b8f2dee6fa..9687f08dc1 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
@@ -38,7 +38,6 @@ import chat.rocket.android.server.infraestructure.state
 import chat.rocket.android.util.extension.getByteArray
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
-import chat.rocket.android.util.extensions.exhaustive
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.RoomType
@@ -142,7 +141,6 @@ class ChatRoomPresenter @Inject constructor(
                 val canModerate = isOwnerOrMod()
                 // Can post anyway if has the 'post-readonly' permission on server.
                 val room = dbManager.getRoom(roomId)
-                val canPost = canModerate || permissions.canPostToReadOnlyChannels()
                 room?.let {
                     chatIsBroadcast = it.chatRoom.broadcast ?: false
                     val roomUiModel = roomMapper.map(it, true)
@@ -150,7 +148,7 @@ class ChatRoomPresenter @Inject constructor(
                         view.onRoomUpdated(roomUiModel = roomUiModel.copy(
                             broadcast = chatIsBroadcast,
                             canModerate = canModerate,
-                            canPost = canPost
+                            writable = roomUiModel.writable || canModerate
                         ))
                     }
                 }
@@ -1010,7 +1008,7 @@ class ChatRoomPresenter @Inject constructor(
                 val canPost = permissions.canPostToReadOnlyChannels()
                 dbManager.getRoom(chatRoomId)?.let {
                     val roomUiModel = roomMapper.map(it, true).copy(
-                        canPost = canPost)
+                        writable = canPost)
                     view.onJoined(roomUiModel = roomUiModel)
                     view.onRoomUpdated(roomUiModel = roomUiModel)
                 }
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index 50ef877a5f..5347621ece 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -767,7 +767,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     }
 
     private fun setupMessageComposer(roomUiModel: RoomUiModel) {
-        if (isReadOnly && !roomUiModel.canPost) {
+        if (isReadOnly || !roomUiModel.writable) {
             text_room_is_read_only.isVisible = true
             input_container.isVisible = false
             text_room_is_read_only.setText(
@@ -783,6 +783,8 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             button_join_chat.isVisible = true
             button_join_chat.setOnClickListener { presenter.joinChat(chatRoomId) }
         } else {
+            input_container.isVisible = true
+            text_room_is_read_only.isVisible = false
             button_send.isVisible = false
             button_show_attachment_options.alpha = 1f
             button_show_attachment_options.isVisible = true
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt b/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt
index 7abfcc4b5a..686db9920d 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt
@@ -9,6 +9,7 @@ import chat.rocket.android.R
 import chat.rocket.android.chatrooms.adapter.model.RoomUiModel
 import chat.rocket.android.db.model.ChatRoom
 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
@@ -28,7 +29,8 @@ 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)
@@ -95,12 +97,13 @@ class RoomUiModelMapper(
                 avatar = serverUrl.avatarUrl(name!!, isGroupOrChannel = true),
                 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)
             )
         }
     }
 
-    @Synchronized
     fun map(chatRoom: ChatRoom, showLastMessage:Boolean = true): RoomUiModel {
         return with(chatRoom.chatRoom) {
             val isUnread = alert || unread > 0
@@ -132,11 +135,18 @@ class RoomUiModelMapper(
                 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) {
@@ -204,4 +214,4 @@ class RoomUiModelMapper(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/adapter/model/RoomUiModel.kt b/app/src/main/java/chat/rocket/android/chatrooms/adapter/model/RoomUiModel.kt
index 778e4ea26b..dcca0406de 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/adapter/model/RoomUiModel.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/adapter/model/RoomUiModel.kt
@@ -17,6 +17,6 @@ data class RoomUiModel(
     val username: String? = null,
     val broadcast: Boolean = false,
     val canModerate: Boolean = false,
-    val canPost: Boolean = true,
+    val writable: Boolean = true,
     val muted: List<String> = emptyList()
 )
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/di/ChatRoomsFragmentModule.kt b/app/src/main/java/chat/rocket/android/chatrooms/di/ChatRoomsFragmentModule.kt
index 6e2dc0edf7..f231837cd1 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/di/ChatRoomsFragmentModule.kt
+++ b/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

From 0fb8fd22c67ff558abc5a3e6a8f238c6d63fc25b Mon Sep 17 00:00:00 2001
From: Leonardo Aramaki <leoaramaki@gmail.com>
Date: Mon, 19 Nov 2018 21:00:17 -0200
Subject: [PATCH 037/149] Replace skin tone TextViews for ImageViews with
 circle background

---
 .../android/emoji/EmojiKeyboardPopup.kt       |  67 +++++------
 ...lor_change_circle.xml => bg_skin_tone.xml} |   4 +-
 .../main/res/layout/color_select_popup.xml    | 107 ------------------
 .../res/layout/dialog_skin_tone_chooser.xml   |  85 ++++++++++++++
 emoji/src/main/res/layout/emoji_keyboard.xml  |   2 +-
 5 files changed, 118 insertions(+), 147 deletions(-)
 rename emoji/src/main/res/drawable/{color_change_circle.xml => bg_skin_tone.xml} (95%)
 delete mode 100644 emoji/src/main/res/layout/color_select_popup.xml
 create mode 100644 emoji/src/main/res/layout/dialog_skin_tone_chooser.xml

diff --git a/emoji/src/main/java/chat/rocket/android/emoji/EmojiKeyboardPopup.kt b/emoji/src/main/java/chat/rocket/android/emoji/EmojiKeyboardPopup.kt
index ca0023eb48..74dc97f8e2 100644
--- a/emoji/src/main/java/chat/rocket/android/emoji/EmojiKeyboardPopup.kt
+++ b/emoji/src/main/java/chat/rocket/android/emoji/EmojiKeyboardPopup.kt
@@ -10,7 +10,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.EditText
 import android.widget.ImageView
-import android.widget.TextView
 import androidx.annotation.ColorInt
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
@@ -22,6 +21,7 @@ import chat.rocket.android.emoji.internal.EmojiCategory
 import chat.rocket.android.emoji.internal.EmojiPagerAdapter
 import chat.rocket.android.emoji.internal.PREF_EMOJI_SKIN_TONE
 import com.google.android.material.tabs.TabLayout
+import kotlinx.android.synthetic.main.dialog_skin_tone_chooser.view.*
 import kotlinx.coroutines.experimental.android.UI
 import kotlinx.coroutines.experimental.launch
 
@@ -77,59 +77,50 @@ class EmojiKeyboardPopup(context: Context, view: View) : OverKeyboardPopupWindow
     }
 
     private fun showSkinToneChooser() {
-        val view = LayoutInflater.from(context).inflate(R.layout.color_select_popup, null)
+        val view = LayoutInflater.from(context).inflate(R.layout.dialog_skin_tone_chooser, null)
         val dialog = AlertDialog.Builder(context, R.style.Dialog)
             .setView(view)
             .setTitle(context.getString(R.string.alert_title_default_skin_tone))
             .setCancelable(true)
             .create()
 
-        view.findViewById<TextView>(R.id.default_tone_text).also {
-            it.text = EmojiParser.parse(context, it.text)
-        }.setOnClickListener {
-            dialog.dismiss()
-            changeSkinTone(Fitzpatrick.Default)
-        }
+        with (view) {
+            image_view_default_tone.setOnClickListener {
+                dialog.dismiss()
+                changeSkinTone(Fitzpatrick.Default)
+            }
 
-        view.findViewById<TextView>(R.id.light_tone_text).also {
-            it.text = EmojiParser.parse(context, it.text)
-        }.setOnClickListener {
-            dialog.dismiss()
-            changeSkinTone(Fitzpatrick.LightTone)
-        }
+            image_view_light_tone.setOnClickListener {
+                dialog.dismiss()
+                changeSkinTone(Fitzpatrick.LightTone)
+            }
 
-        view.findViewById<TextView>(R.id.medium_light_text).also {
-            it.text = EmojiParser.parse(context, it.text)
-        }.setOnClickListener {
-            dialog.dismiss()
-            changeSkinTone(Fitzpatrick.MediumLightTone)
-        }
+            image_view_medium_light.setOnClickListener {
+                dialog.dismiss()
+                changeSkinTone(Fitzpatrick.MediumLightTone)
+            }
 
-        view.findViewById<TextView>(R.id.medium_tone_text).also {
-            it.text = EmojiParser.parse(context, it.text)
-        }.setOnClickListener {
-            dialog.dismiss()
-            changeSkinTone(Fitzpatrick.MediumTone)
-        }
+            image_view_medium_tone.setOnClickListener {
+                dialog.dismiss()
+                changeSkinTone(Fitzpatrick.MediumTone)
+            }
 
-        view.findViewById<TextView>(R.id.medium_dark_tone_text).also {
-            it.text = EmojiParser.parse(context, it.text)
-        }.setOnClickListener {
-            dialog.dismiss()
-            changeSkinTone(Fitzpatrick.MediumDarkTone)
-        }
+            image_view_medium_dark_tone.setOnClickListener {
+                dialog.dismiss()
+                changeSkinTone(Fitzpatrick.MediumDarkTone)
+            }
 
-        view.findViewById<TextView>(R.id.dark_tone_text).also {
-            it.text = EmojiParser.parse(context, it.text)
-        }.setOnClickListener {
-            dialog.dismiss()
-            changeSkinTone(Fitzpatrick.DarkTone)
+            image_view_dark_tone.setOnClickListener {
+                dialog.dismiss()
+                changeSkinTone(Fitzpatrick.DarkTone)
+            }
         }
+
         dialog.show()
     }
 
     private fun changeSkinTone(tone: Fitzpatrick) {
-        val drawable = ContextCompat.getDrawable(context, R.drawable.color_change_circle)!!
+        val drawable = ContextCompat.getDrawable(context, R.drawable.bg_skin_tone)!!
         val wrappedDrawable = DrawableCompat.wrap(drawable)
         DrawableCompat.setTint(wrappedDrawable, getFitzpatrickColor(tone))
         (changeColorView as ImageView).setImageDrawable(wrappedDrawable)
diff --git a/emoji/src/main/res/drawable/color_change_circle.xml b/emoji/src/main/res/drawable/bg_skin_tone.xml
similarity index 95%
rename from emoji/src/main/res/drawable/color_change_circle.xml
rename to emoji/src/main/res/drawable/bg_skin_tone.xml
index cb01067077..78a31b00e0 100644
--- a/emoji/src/main/res/drawable/color_change_circle.xml
+++ b/emoji/src/main/res/drawable/bg_skin_tone.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
+
     <solid android:color="@color/tone_default" />
+
     <size
         android:width="24dp"
         android:height="24dp" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/emoji/src/main/res/layout/color_select_popup.xml b/emoji/src/main/res/layout/color_select_popup.xml
deleted file mode 100644
index 7f4c25abdf..0000000000
--- a/emoji/src/main/res/layout/color_select_popup.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:id="@+id/default_tone_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:text="👌"
-        android:textSize="32sp"
-        android:tint="@color/tone_default"
-        app:layout_constraintEnd_toStartOf="@+id/light_tone_text"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/color_change_circle" />
-
-    <TextView
-        android:id="@+id/light_tone_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="24dp"
-        android:text="👌🏻"
-        android:textSize="32sp"
-        android:tint="@color/tone_light"
-        app:layout_constraintEnd_toStartOf="@+id/medium_light_text"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/default_tone_text"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/color_change_circle"
-        tools:text="👌" />
-
-    <TextView
-        android:id="@+id/medium_light_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:text="👌🏼"
-        android:textSize="32sp"
-        android:tint="@color/tone_medium_light"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/light_tone_text"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/color_change_circle"
-        tools:text="👌" />
-
-    <TextView
-        android:id="@+id/medium_tone_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="16dp"
-        android:text="👌🏽"
-        android:textSize="32sp"
-        android:tint="@color/tone_medium"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/medium_dark_tone_text"
-        app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/default_tone_text"
-        app:srcCompat="@drawable/color_change_circle"
-        tools:text="👌" />
-
-    <TextView
-        android:id="@+id/medium_dark_tone_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="24dp"
-        android:layout_marginBottom="16dp"
-        android:text="👌🏾"
-        android:textSize="32sp"
-        android:tint="@color/tone_medium_dark"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/dark_tone_text"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/medium_tone_text"
-        app:layout_constraintTop_toBottomOf="@+id/light_tone_text"
-        app:srcCompat="@drawable/color_change_circle"
-        tools:text="👌" />
-
-    <TextView
-        android:id="@+id/dark_tone_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="16dp"
-        android:text="👌🏿"
-        android:textSize="32sp"
-        android:tint="@color/tone_dark"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/medium_dark_tone_text"
-        app:layout_constraintTop_toBottomOf="@+id/medium_light_text"
-        app:srcCompat="@drawable/color_change_circle"
-        tools:text="👌" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/emoji/src/main/res/layout/dialog_skin_tone_chooser.xml b/emoji/src/main/res/layout/dialog_skin_tone_chooser.xml
new file mode 100644
index 0000000000..4704ad60db
--- /dev/null
+++ b/emoji/src/main/res/layout/dialog_skin_tone_chooser.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/image_view_default_tone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        android:tint="@color/tone_default"
+        app:layout_constraintBottom_toTopOf="@+id/image_view_medium_tone"
+        app:layout_constraintEnd_toStartOf="@+id/image_view_light_tone"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintHorizontal_chainStyle="spread_inside"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/bg_skin_tone" />
+
+    <ImageView
+        android:id="@+id/image_view_light_tone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:tint="@color/tone_light"
+        app:layout_constraintEnd_toStartOf="@+id/image_view_medium_light"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/image_view_default_tone"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/bg_skin_tone" />
+
+    <ImageView
+        android:id="@+id/image_view_medium_light"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="24dp"
+        android:tint="@color/tone_medium_light"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/image_view_light_tone"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/bg_skin_tone" />
+
+    <ImageView
+        android:id="@+id/image_view_medium_tone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="16dp"
+        android:tint="@color/tone_medium"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/image_view_medium_dark_tone"
+        app:layout_constraintHorizontal_chainStyle="spread_inside"
+        app:layout_constraintStart_toStartOf="@+id/image_view_default_tone"
+        app:layout_constraintTop_toBottomOf="@+id/image_view_default_tone"
+        app:srcCompat="@drawable/bg_skin_tone" />
+
+    <ImageView
+        android:id="@+id/image_view_medium_dark_tone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:tint="@color/tone_medium_dark"
+        app:layout_constraintBottom_toBottomOf="@+id/image_view_medium_tone"
+        app:layout_constraintEnd_toStartOf="@+id/image_view_dark_tone"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/image_view_medium_tone"
+        app:layout_constraintTop_toTopOf="@+id/image_view_medium_tone"
+        app:srcCompat="@drawable/bg_skin_tone" />
+
+    <ImageView
+        android:id="@+id/image_view_dark_tone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:tint="@color/tone_dark"
+        app:layout_constraintBottom_toBottomOf="@+id/image_view_medium_dark_tone"
+        app:layout_constraintEnd_toEndOf="@+id/image_view_medium_light"
+        app:layout_constraintStart_toEndOf="@+id/image_view_medium_dark_tone"
+        app:layout_constraintTop_toTopOf="@+id/image_view_medium_dark_tone"
+        app:srcCompat="@drawable/bg_skin_tone" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/emoji/src/main/res/layout/emoji_keyboard.xml b/emoji/src/main/res/layout/emoji_keyboard.xml
index 9f15cddaef..2d7293fd94 100644
--- a/emoji/src/main/res/layout/emoji_keyboard.xml
+++ b/emoji/src/main/res/layout/emoji_keyboard.xml
@@ -43,7 +43,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/color_change_circle" />
+            app:srcCompat="@drawable/bg_skin_tone" />
 
         <ImageView
             android:id="@+id/emoji_search"

From 7ecb475c820340533e69f535799541fbe80cd15e Mon Sep 17 00:00:00 2001
From: Leonardo Aramaki <leoaramaki@gmail.com>
Date: Tue, 20 Nov 2018 23:27:11 -0200
Subject: [PATCH 038/149] Redesign reaction username summary dialog

---
 .../chatroom/adapter/BaseViewHolder.kt        |  4 +-
 .../adapter/MessageReactionsAdapter.kt        |  2 +-
 .../android/chatroom/ui/ChatRoomFragment.kt   | 49 ++++++++++++++++---
 .../chatroom/uimodel/ReactionUiModel.kt       |  5 +-
 .../android/chatroom/uimodel/UiModelMapper.kt |  7 ++-
 .../main/res/layout/emoji_image_row_item.xml  | 14 ++++++
 app/src/main/res/layout/emoji_row_item.xml    | 12 +++++
 .../res/layout/reaction_praises_list_item.xml | 35 +++++++++++++
 app/src/main/res/values-de/strings.xml        |  5 ++
 app/src/main/res/values-es/strings.xml        |  5 ++
 app/src/main/res/values-fr/strings.xml        |  5 ++
 app/src/main/res/values-hi-rIN/strings.xml    |  5 ++
 app/src/main/res/values-ja/strings.xml        |  6 ++-
 app/src/main/res/values-pt-rBR/strings.xml    |  4 ++
 app/src/main/res/values-ru-rRU/strings.xml    |  6 +++
 app/src/main/res/values-tr/strings.xml        |  5 ++
 app/src/main/res/values-uk/strings.xml        |  6 +++
 app/src/main/res/values/strings.xml           |  5 +-
 .../android/emoji/EmojiReactionListener.kt    |  8 +--
 emoji/src/main/res/values/strings.xml         |  1 +
 20 files changed, 169 insertions(+), 20 deletions(-)
 create mode 100644 app/src/main/res/layout/emoji_image_row_item.xml
 create mode 100644 app/src/main/res/layout/emoji_row_item.xml
 create mode 100644 app/src/main/res/layout/reaction_praises_list_item.xml

diff --git a/app/src/main/java/chat/rocket/android/chatroom/adapter/BaseViewHolder.kt b/app/src/main/java/chat/rocket/android/chatroom/adapter/BaseViewHolder.kt
index 9eb6209e1c..be04901f5c 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/adapter/BaseViewHolder.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/adapter/BaseViewHolder.kt
@@ -62,8 +62,8 @@ abstract class BaseViewHolder<T : BaseUiModel<*>>(
                         }
                     }
 
-                    override fun onReactionLongClicked(emojiShortname: String, usernames: List<String>) {
-                        reactionListener?.onReactionLongClicked(emojiShortname, usernames)
+                    override fun onReactionLongClicked(shortname: String, isCustom: Boolean, url: String?, usernames: List<String>) {
+                        reactionListener?.onReactionLongClicked(shortname, isCustom,url, usernames)
                     }
                 }
 
diff --git a/app/src/main/java/chat/rocket/android/chatroom/adapter/MessageReactionsAdapter.kt b/app/src/main/java/chat/rocket/android/chatroom/adapter/MessageReactionsAdapter.kt
index 395ad71c11..c42ed78624 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/adapter/MessageReactionsAdapter.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/adapter/MessageReactionsAdapter.kt
@@ -136,7 +136,7 @@ class MessageReactionsAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>()
         }
 
         override fun onLongClick(v: View?): Boolean {
-            listener?.onReactionLongClicked(reaction.shortname, reaction.usernames)
+            listener?.onReactionLongClicked(reaction.shortname, reaction.isCustom, reaction.url, reaction.usernames)
             return true
         }
     }
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index a3a78ba083..ce0ab70a5c 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -22,7 +22,6 @@ import android.widget.EditText
 import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.TextView
-import android.widget.Toast
 import androidx.annotation.DrawableRes
 import androidx.core.text.bold
 import androidx.core.view.isVisible
@@ -58,6 +57,7 @@ import chat.rocket.android.emoji.EmojiKeyboardPopup
 import chat.rocket.android.emoji.EmojiParser
 import chat.rocket.android.emoji.EmojiPickerPopup
 import chat.rocket.android.emoji.EmojiReactionListener
+import chat.rocket.android.emoji.internal.GlideApp
 import chat.rocket.android.emoji.internal.isCustom
 import chat.rocket.android.helper.EndlessRecyclerViewScrollListener
 import chat.rocket.android.helper.ImageHelper
@@ -80,10 +80,13 @@ import dagger.android.support.AndroidSupportInjection
 import io.reactivex.Observable
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
+import kotlinx.android.synthetic.main.emoji_image_row_item.*
+import kotlinx.android.synthetic.main.emoji_row_item.*
 import kotlinx.android.synthetic.main.fragment_chat_room.*
 import kotlinx.android.synthetic.main.message_attachment_options.*
 import kotlinx.android.synthetic.main.message_composer.*
 import kotlinx.android.synthetic.main.message_list.*
+import kotlinx.android.synthetic.main.reaction_praises_list_item.*
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicInteger
 import javax.inject.Inject
@@ -595,7 +598,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         }
     }
 
-    override fun showGenericErrorMessage(){
+    override fun showGenericErrorMessage() {
         ui {
             showMessage(getString(R.string.msg_generic_error))
         }
@@ -672,12 +675,42 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         presenter.react(messageId, emoji.shortname)
     }
 
-    override fun onReactionLongClicked(emojiShortname: String, usernames: List<String>) {
-        AlertDialog.Builder(requireContext())
-            .setTitle(EmojiParser.parse(requireContext(), getString(R.string.alert_title_reactions_by, emojiShortname)))
-            .setItems(usernames.toTypedArray(), null)
-            .setPositiveButton(R.string.msg_ok, null)
-            .show()
+    override fun onReactionLongClicked(shortname: String, isCustom: Boolean, url: String?, usernames: List<String>) {
+        val layout = LayoutInflater.from(requireContext()).inflate(R.layout.reaction_praises_list_item, null)
+        val dialog = AlertDialog.Builder(requireContext())
+            .setView(layout)
+            .setCancelable(true)
+
+        with(layout) {
+            view_flipper.displayedChild = if (isCustom) 1 else 0
+            if (isCustom && url != null) {
+                val glideRequest = if (url.endsWith("gif", true)) {
+                    GlideApp.with(requireContext()).asGif()
+                } else {
+                    GlideApp.with(requireContext()).asBitmap()
+                }
+
+                glideRequest.load(url).into(emoji_image_view)
+            } else {
+                emoji_view.text = EmojiParser.parse(requireContext(), shortname)
+            }
+
+            var listing = ""
+            if (usernames.size == 1) {
+                listing = usernames.first()
+            } else {
+                usernames.forEachIndexed { index, username ->
+                    listing += if (index == usernames.size - 1) "|$username" else "$username, "
+                }
+
+                listing = listing.replace(", |", " ${requireContext().getString(R.string.msg_and)} ")
+            }
+
+            text_view_usernames.text = requireContext().resources.getQuantityString(
+                R.plurals.msg_reacted_with_, usernames.size, listing, shortname)
+
+            dialog.show()
+        }
     }
 
     override fun showReactionsPopup(messageId: String) {
diff --git a/app/src/main/java/chat/rocket/android/chatroom/uimodel/ReactionUiModel.kt b/app/src/main/java/chat/rocket/android/chatroom/uimodel/ReactionUiModel.kt
index f202fd230b..2191e250c9 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/uimodel/ReactionUiModel.kt
+++ b/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
-)
\ No newline at end of file
+    var url: String? = null,
+    val isCustom: Boolean = false
+)
diff --git a/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt b/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt
index 3e05005919..67505bfc52 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt
+++ b/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
@@ -469,7 +471,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 +480,8 @@ class UiModelMapper @Inject constructor(
                         unicode = EmojiParser.parse(context, shortname),
                         count = count,
                         usernames = usernames,
-                        url = custom?.url)
+                        url = custom?.url,
+                        isCustom = custom != null)
                 )
             }
             list
diff --git a/app/src/main/res/layout/emoji_image_row_item.xml b/app/src/main/res/layout/emoji_image_row_item.xml
new file mode 100644
index 0000000000..5aca146ac1
--- /dev/null
+++ b/app/src/main/res/layout/emoji_image_row_item.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="48dp"
+    android:layout_height="48dp"
+    android:layout_gravity="center">
+
+    <ImageView
+        android:id="@+id/emoji_image_view"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_gravity="center"
+        tools:src="@tools:sample/avatars" />
+</FrameLayout>
diff --git a/app/src/main/res/layout/emoji_row_item.xml b/app/src/main/res/layout/emoji_row_item.xml
new file mode 100644
index 0000000000..83bd68fb0d
--- /dev/null
+++ b/app/src/main/res/layout/emoji_row_item.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/emoji_view"
+    android:layout_width="48dp"
+    android:layout_height="48dp"
+    android:foreground="?selectableItemBackground"
+    android:layout_gravity="center"
+    android:gravity="center"
+    android:textColor="#000000"
+    android:textSize="24sp"
+    tools:text="😀" />
diff --git a/app/src/main/res/layout/reaction_praises_list_item.xml b/app/src/main/res/layout/reaction_praises_list_item.xml
new file mode 100644
index 0000000000..bd6af8887f
--- /dev/null
+++ b/app/src/main/res/layout/reaction_praises_list_item.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/colorWhite"
+    android:padding="16dp">
+
+    <ViewFlipper
+        android:id="@+id/view_flipper"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:foregroundGravity="center"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <include layout="@layout/emoji_row_item" />
+
+        <include layout="@layout/emoji_image_row_item" />
+    </ViewFlipper>
+
+    <TextView
+        android:id="@+id/text_view_usernames"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:fontFamily="sans-serif-light"
+        android:textColor="@color/darkGray"
+        android:textSize="14sp"
+        app:layout_constraintBottom_toBottomOf="@+id/view_flipper"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/view_flipper"
+        app:layout_constraintTop_toTopOf="@+id/view_flipper"
+        tools:text="Ann reacted with :grin:" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index fc9144e2c6..fda7d61459 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -152,6 +152,11 @@
     <string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
     <!-- TODO - Add proper translation -->
     <string name="msg_muted_on_this_channel">You are muted on this channel</string>
+    <!-- TODO - Add proper translation -->
+    <plurals name="msg_reacted_with_">
+        <item quantity="one">%1$s reacted with %2$s</item>
+        <item quantity="other">%1$s reacted with %2$s</item>
+    </plurals>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Privat</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5162701abc..8385e3a735 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -170,6 +170,11 @@
     <string name="msg_permalink_copied">Permalink copied</string>
     <!-- TODO - Add proper translation -->
     <string name="msg_muted_on_this_channel">You are muted on this channel</string>
+    <!-- TODO - Add proper translation -->
+    <plurals name="msg_reacted_with_">
+        <item quantity="one">%1$s reacted with %2$s</item>
+        <item quantity="other">%1$s reacted with %2$s</item>
+    </plurals>
 
     <!-- Preferences messages -->
     <string name="msg_analytics_tracking">Analytics tracking</string> <!-- TODO Add translation -->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 65e040604a..8f005662ba 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -162,6 +162,11 @@
     <string name="msg_permalink_copied">Permalink copied</string>
     <!-- TODO - Add proper translation -->
     <string name="msg_muted_on_this_channel">You are muted on this channel</string>
+    <!-- TODO - Add proper translation -->
+    <plurals name="msg_reacted_with_">
+        <item quantity="one">%1$s reacted with %2$s</item>
+        <item quantity="other">%1$s reacted with %2$s</item>
+    </plurals>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Privé</string>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 572a86f181..a54d28fdf1 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -174,6 +174,11 @@
     <string name="msg_permalink_copied">Permalink copied</string>
     <!-- TODO - Add proper translation -->
     <string name="msg_muted_on_this_channel">You are muted on this channel</string>
+    <!-- TODO - Add proper translation -->
+    <plurals name="msg_reacted_with_">
+        <item quantity="one">%1$s reacted with %2$s</item>
+        <item quantity="other">%1$s reacted with %2$s</item>
+    </plurals>
 
     <!-- Preferences messages -->
     <string name="msg_analytics_tracking">एनालिटिक्स ट्रैकिंग</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 109242de36..2ec79f649a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -161,7 +161,11 @@
     <string name="msg_view_more">更に表示</string>
     <string name="msg_view_less">隠す</string>
     <string name="msg_muted_on_this_channel">あなたはこのチャンネルでミュートされています</string>
-
+    <!-- TODO - Add proper translation -->
+    <plurals name="msg_reacted_with_">
+        <item quantity="one">%1$s reacted with %2$s</item>
+        <item quantity="other">%1$s reacted with %2$s</item>
+    </plurals>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">プライベート</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 4aa2a06750..5e561b53b7 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -160,6 +160,10 @@
     <!-- TODO - Add proper translation -->
     <string name="msg_permalink_copied">Permalink copiado</string>
     <string name="msg_muted_on_this_channel">Você está silenciado neste canal</string>
+    <plurals name="msg_reacted_with_">
+        <item quantity="one">%1$s reagiu com %2$s</item>
+        <item quantity="other">%1$s reagiram com %2$s</item>
+    </plurals>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Privado</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index f5a4dd3280..6cc0c3a78c 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -158,6 +158,12 @@
     <string name="msg_permalink_copied">Ссылка скопирована</string>
     <!-- TODO - Add proper translation -->
     <string name="msg_muted_on_this_channel">You are muted on this channel</string>
+    <!-- TODO - Add proper translation -->
+    <plurals name="msg_reacted_with_">
+        <item quantity="one">%1$s reacted with %2$s</item>
+        <item quantity="few">%1$s reacted with %2$s</item>
+        <item quantity="many">%1$s reacted with %2$s</item>
+    </plurals>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Приватный</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 0ad338d019..e8ce4dc12f 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -175,6 +175,11 @@
     <string name="msg_permalink_copied">Permalink copied</string>
     <!-- TODO - Add proper translation -->
     <string name="msg_muted_on_this_channel">You are muted on this channel</string>
+    <!-- TODO - Add proper translation -->
+    <plurals name="msg_reacted_with_">
+        <item quantity="one">%1$s reacted with %2$s</item>
+        <item quantity="other">%1$s reacted with %2$s</item>
+    </plurals>
     
     <!-- Preferences messages -->
     <string name="msg_analytics_tracking">İstatistik takibi</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 526b40127d..38ef9765a7 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -160,6 +160,12 @@
     <string name="msg_permalink_copied">Permalink copied</string>
     <!-- TODO - Add proper translation -->
     <string name="msg_muted_on_this_channel">You are muted on this channel</string>
+    <!-- TODO - Add proper translation -->
+    <plurals name="msg_reacted_with_">
+        <item quantity="one">%1$s reacted with %2$s</item>
+        <item quantity="few">%1$s reacted with %2$s</item>
+        <item quantity="many">%1$s reacted with %2$s</item>
+    </plurals>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Приватний</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6e4bbc1e44..a2c93e841c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -168,6 +168,10 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="msg_two_factor_authentication">Two-factor Authentication</string>
     <string name="msg__your_2fa_code">What’s your 2FA code?</string>
     <string name="msg_permalink_copied">Permalink copied</string>
+    <plurals name="msg_reacted_with_">
+        <item quantity="one">%1$s reacted with %2$s</item>
+        <item quantity="other">%1$s reacted with %2$s</item>
+    </plurals>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Private</string>
@@ -302,7 +306,6 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <!-- Emoji message-->
     <string name="msg_no_recent_emoji">No recent emojis</string>
     <string name="alert_title_default_skin_tone">Default skin tone</string>
-    <string name="alert_title_reactions_by">%1$s reactions by</string>
 
     <!-- Sorting and grouping-->
     <string name="menu_chatroom_sort">Sort</string>
diff --git a/emoji/src/main/java/chat/rocket/android/emoji/EmojiReactionListener.kt b/emoji/src/main/java/chat/rocket/android/emoji/EmojiReactionListener.kt
index 309a4d5c11..1450fcf104 100644
--- a/emoji/src/main/java/chat/rocket/android/emoji/EmojiReactionListener.kt
+++ b/emoji/src/main/java/chat/rocket/android/emoji/EmojiReactionListener.kt
@@ -20,8 +20,10 @@ interface EmojiReactionListener {
     /**
      * Callback when an added reaction is long-clicked.
      *
-     * @param emojiShortname The shortname of the emoji (:grin:, :smiley:, etc).
+     * @param shortname The shortname of the emoji (:grin:, :smiley:, etc).
+     * @param isCustom Whether the reaction is custom or one of the defaults.
+     * @param url In case of a custom emoji, this is the url to find it. Can be null if not a custom.
      * @param usernames The list of usernames of users who added the reaction.
      */
-    fun onReactionLongClicked(emojiShortname: String, usernames: List<String>)
-}
\ No newline at end of file
+    fun onReactionLongClicked(shortname: String, isCustom: Boolean, url: String?, usernames: List<String>)
+}
diff --git a/emoji/src/main/res/values/strings.xml b/emoji/src/main/res/values/strings.xml
index 9442d0f663..bac507ae88 100644
--- a/emoji/src/main/res/values/strings.xml
+++ b/emoji/src/main/res/values/strings.xml
@@ -1,4 +1,5 @@
 <resources>
     <string name="msg_no_recent_emoji">No recent emoji</string>
     <string name="alert_title_default_skin_tone">Default skin tone</string>
+    <string name="msg_reactions" translatable="false">Reactions</string>
 </resources>

From 789ddbb4e77e376a0baba0b60eaf33824256ccd5 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Wed, 21 Nov 2018 07:30:13 -0800
Subject: [PATCH 039/149] Fix the username not being displayed.

---
 .../rocket/android/main/ui/MainActivity.kt    |  3 --
 .../profile/presentation/ProfilePresenter.kt  | 41 ++++++++++---------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt b/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
index 935a918825..9a8bcbb664 100644
--- a/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
+++ b/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()
diff --git a/app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt b/app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt
index 0de68ab496..a5a730111b 100644
--- a/app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt
+++ b/app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt
@@ -29,7 +29,6 @@ import chat.rocket.core.internal.rest.setAvatar
 import chat.rocket.core.internal.rest.updateProfile
 import kotlinx.coroutines.experimental.DefaultDispatcher
 import kotlinx.coroutines.experimental.withContext
-import java.lang.Exception
 import java.util.*
 import javax.inject.Inject
 
@@ -58,20 +57,17 @@ class ProfilePresenter @Inject constructor(
 ) {
     private val serverUrl = serverInteractor.get()!!
     private val client: RocketChatClient = factory.create(serverUrl)
-    private val myselfId = userHelper.user()?.id ?: ""
-    private var myselfName = userHelper.user()?.name ?: ""
-    private var myselfUsername = userHelper.username() ?: ""
-    private var myselfEmailAddress = userHelper.user()?.emails?.getOrNull(0)?.address ?: ""
+    private val user = userHelper.user()
 
     fun loadUserProfile() {
         launchUI(strategy) {
             view.showLoading()
             try {
                 view.showProfile(
-                    serverUrl.avatarUrl(myselfUsername),
-                    myselfName,
-                    myselfUsername,
-                    myselfEmailAddress
+                    serverUrl.avatarUrl(user?.username ?: ""),
+                    user?.name ?: "",
+                    user?.username ?: "",
+                    user?.emails?.getOrNull(0)?.address ?: ""
                 )
             } catch (exception: RocketChatException) {
                 view.showMessage(exception)
@@ -85,14 +81,16 @@ class ProfilePresenter @Inject constructor(
         launchUI(strategy) {
             view.showLoading()
             try {
-                retryIO { client.updateProfile(myselfId, email, name, username) }
-
-                myselfEmailAddress = email
-                myselfName = name
-                myselfUsername = username
-
+                user?.id?.let { id ->
+                    retryIO { client.updateProfile(id, email, name, username) }
+                }
                 view.showProfileUpdateSuccessfullyMessage()
-                loadUserProfile()
+                view.showProfile(
+                    serverUrl.avatarUrl(user?.username ?: ""),
+                    name,
+                    username,
+                    email
+                )
             } catch (exception: RocketChatException) {
                 exception.message?.let {
                     view.showMessage(it)
@@ -117,7 +115,7 @@ class ProfilePresenter @Inject constructor(
                         uriInteractor.getInputStream(uri)
                     }
                 }
-                view.reloadUserAvatar(serverUrl.avatarUrl(myselfUsername))
+                user?.username?.let { view.reloadUserAvatar(it) }
             } catch (exception: RocketChatException) {
                 exception.message?.let {
                     view.showMessage(it)
@@ -144,7 +142,8 @@ class ProfilePresenter @Inject constructor(
                         byteArray?.inputStream()
                     }
                 }
-                view.reloadUserAvatar(serverUrl.avatarUrl(myselfUsername))
+
+                user?.username?.let { view.reloadUserAvatar(it) }
             } catch (exception: RocketChatException) {
                 exception.message?.let {
                     view.showMessage(it)
@@ -161,8 +160,10 @@ class ProfilePresenter @Inject constructor(
         launchUI(strategy) {
             view.showLoading()
             try {
-                retryIO { client.resetAvatar(myselfId) }
-                view.reloadUserAvatar(serverUrl.avatarUrl(myselfUsername))
+                user?.id?.let { id ->
+                    retryIO { client.resetAvatar(id) }
+                }
+                user?.username?.let { view.reloadUserAvatar(it) }
             } catch (exception: RocketChatException) {
                 exception.message?.let {
                     view.showMessage(it)

From 771dadee5b386c6834a775ea308ef60e4c7b35f6 Mon Sep 17 00:00:00 2001
From: Samer Alabi <sameralabi@hotmail.com>
Date: Wed, 21 Nov 2018 14:21:55 -0500
Subject: [PATCH 040/149] Handled Null Safety Cases

---
 .../chatdetails/ui/ChatDetailsFragment.kt      | 18 +++++++++---------
 .../android/chatroom/ui/ChatRoomFragment.kt    |  4 ++--
 .../ui/FavoriteMessagesFragment.kt             |  6 +++---
 .../rocket/android/files/ui/FilesFragment.kt   |  6 +++---
 .../android/members/ui/MembersFragment.kt      |  8 ++++----
 .../android/mentions/ui/MentionsFragment.kt    |  6 +++---
 .../ui/PinnedMessagesFragment.kt               |  6 +++---
 .../main/res/layout/fragment_chat_details.xml  |  1 +
 8 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt b/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt
index 2003ca7195..d32a40233d 100644
--- a/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt
@@ -60,8 +60,8 @@ class ChatDetailsFragment: Fragment(), ChatDetailsView {
 
     private var chatRoomId: String? = null
     private var chatRoomType: String? = null
-    private var isSubscribed: Boolean? = null
-    private var disableMenu: Boolean? = null
+    private var isSubscribed: Boolean = true
+    private var disableMenu: Boolean = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -91,7 +91,7 @@ class ChatDetailsFragment: Fragment(), ChatDetailsView {
 
     override fun displayDetails(room: ChatDetails) {
         ui {
-            val text = " " + room.name
+            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
@@ -115,13 +115,13 @@ class ChatDetailsFragment: Fragment(), ChatDetailsView {
     }
 
     private fun addOptions(adapter: ChatDetailsAdapter) {
-        if (!disableMenu!!) {
+        if (!disableMenu) {
             adapter.addOption(getString(R.string.title_files), R.drawable.ic_files_24dp) {
                 presenter.toFiles(chatRoomId!!)
             }
         }
 
-        if (chatRoomType != RoomType.DIRECT_MESSAGE && !disableMenu!!) {
+        if (chatRoomType != RoomType.DIRECT_MESSAGE && !disableMenu) {
             adapter.addOption(getString(R.string.msg_mentions), R.drawable.ic_at_black_20dp) {
                 presenter.toMentions(chatRoomId!!)
             }
@@ -158,7 +158,7 @@ class ChatDetailsFragment: Fragment(), ChatDetailsView {
     }
 
     private fun getDetails() {
-        if (isSubscribed!!)
+        if (isSubscribed)
             viewModel.getDetails(chatRoomId!!).observe(viewLifecycleOwner, Observer { details ->
                 displayDetails(details)
             })
@@ -190,9 +190,9 @@ class ChatDetailsFragment: Fragment(), ChatDetailsView {
     }
 
     private fun setupToolbar() {
-        with(activity as ChatDetailsActivity) {
-            setNavigationIcon(R.drawable.ic_close_white_24dp)
-            setToolbarTitle(getString(R.string.title_channel_details))
+        (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
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index 97e374b17f..036d63e69d 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -296,8 +296,8 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         super.onPrepareOptionsMenu(menu)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        setOnMenuItemClickListener(item!!)
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        setOnMenuItemClickListener(item)
         return true
     }
 
diff --git a/app/src/main/java/chat/rocket/android/favoritemessages/ui/FavoriteMessagesFragment.kt b/app/src/main/java/chat/rocket/android/favoritemessages/ui/FavoriteMessagesFragment.kt
index 23fda62a3a..353f5fcaf9 100644
--- a/app/src/main/java/chat/rocket/android/favoritemessages/ui/FavoriteMessagesFragment.kt
+++ b/app/src/main/java/chat/rocket/android/favoritemessages/ui/FavoriteMessagesFragment.kt
@@ -116,9 +116,9 @@ class FavoriteMessagesFragment : Fragment(), FavoriteMessagesView {
     }
 
     private fun setupToolbar() {
-        with(activity as ChatDetailsActivity) {
-            setToolbarTitle(getString(R.string.title_favorite_messages))
-            setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
+        (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
diff --git a/app/src/main/java/chat/rocket/android/files/ui/FilesFragment.kt b/app/src/main/java/chat/rocket/android/files/ui/FilesFragment.kt
index 33d64ddc3b..8806ceb4e0 100644
--- a/app/src/main/java/chat/rocket/android/files/ui/FilesFragment.kt
+++ b/app/src/main/java/chat/rocket/android/files/ui/FilesFragment.kt
@@ -152,9 +152,9 @@ class FilesFragment : Fragment(), FilesView {
     }
 
     private fun setupToolbar(totalFiles: Long) {
-        with(activity as ChatDetailsActivity) {
-            setToolbarTitle(getString(R.string.title_files_total, totalFiles))
-            setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
+        (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
diff --git a/app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt b/app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt
index 36201ccfa6..27a228ebeb 100644
--- a/app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt
+++ b/app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt
@@ -127,13 +127,13 @@ class MembersFragment : Fragment(), MembersView {
     }
 
     private fun setupToolbar(totalMembers: Long? = null) {
-        with (activity as ChatDetailsActivity) {
+        (activity as ChatDetailsActivity).let {
             if (totalMembers != null) {
-                setToolbarTitle(getString(R.string.title_counted_members, totalMembers))
+                it.setToolbarTitle(getString(R.string.title_counted_members, totalMembers))
             } else {
-                setToolbarTitle(getString(R.string.title_members))
+                it.setToolbarTitle(getString(R.string.title_members))
             }
-            setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
+            it.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/mentions/ui/MentionsFragment.kt b/app/src/main/java/chat/rocket/android/mentions/ui/MentionsFragment.kt
index 6fbe4581e5..3f756128e5 100644
--- a/app/src/main/java/chat/rocket/android/mentions/ui/MentionsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/mentions/ui/MentionsFragment.kt
@@ -122,9 +122,9 @@ class MentionsFragment : Fragment(), MentionsView {
     }
 
     private fun setupToolbar() {
-        with(activity as ChatDetailsActivity) {
-            setToolbarTitle(getString(R.string.msg_mentions))
-            setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
+        (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
diff --git a/app/src/main/java/chat/rocket/android/pinnedmessages/ui/PinnedMessagesFragment.kt b/app/src/main/java/chat/rocket/android/pinnedmessages/ui/PinnedMessagesFragment.kt
index 6090a42d6d..0a2263c925 100644
--- a/app/src/main/java/chat/rocket/android/pinnedmessages/ui/PinnedMessagesFragment.kt
+++ b/app/src/main/java/chat/rocket/android/pinnedmessages/ui/PinnedMessagesFragment.kt
@@ -123,9 +123,9 @@ class PinnedMessagesFragment : Fragment(), PinnedMessagesView {
     }
 
     private fun setupToolbar() {
-        with(activity as ChatDetailsActivity) {
-            setToolbarTitle(getString(R.string.title_pinned_messages))
-            setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
+        (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
diff --git a/app/src/main/res/layout/fragment_chat_details.xml b/app/src/main/res/layout/fragment_chat_details.xml
index 2585a5aa72..4fe60a735b 100644
--- a/app/src/main/res/layout/fragment_chat_details.xml
+++ b/app/src/main/res/layout/fragment_chat_details.xml
@@ -18,6 +18,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 style="@style/ChatDetails.Title.TextView"
+                android:drawablePadding="@dimen/text_view_drawable_padding"
                 tools:text="#important"/>
             <TextView
                 android:id="@+id/title_topic"

From d00b824765e003a25707dc11d95b7eb202445cba Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Wed, 21 Nov 2018 12:36:42 -0800
Subject: [PATCH 041/149] Update ProfilePresenter.kt

---
 .../profile/presentation/ProfilePresenter.kt       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt b/app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt
index a5a730111b..dfde3bb661 100644
--- a/app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt
+++ b/app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt
@@ -83,14 +83,14 @@ class ProfilePresenter @Inject constructor(
             try {
                 user?.id?.let { id ->
                     retryIO { client.updateProfile(id, email, name, username) }
+                    view.showProfileUpdateSuccessfullyMessage()
+                    view.showProfile(
+                        serverUrl.avatarUrl(user.username ?: ""),
+                        name,
+                        username,
+                        email
+                    )
                 }
-                view.showProfileUpdateSuccessfullyMessage()
-                view.showProfile(
-                    serverUrl.avatarUrl(user?.username ?: ""),
-                    name,
-                    username,
-                    email
-                )
             } catch (exception: RocketChatException) {
                 exception.message?.let {
                     view.showMessage(it)

From 60fec9c92c29ead3cca9a86d5979966d4a0e6299 Mon Sep 17 00:00:00 2001
From: Claudio Massi <claudio.massi@sorint.it>
Date: Wed, 21 Nov 2018 23:40:50 +0100
Subject: [PATCH 042/149] [i18N] Add locale italian

---
 app/src/main/res/values-it/strings.xml | 319 +++++++++++++++++++++++++
 1 file changed, 319 insertions(+)
 create mode 100644 app/src/main/res/values-it/strings.xml

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
new file mode 100644
index 0000000000..4b3bd1e3fe
--- /dev/null
+++ b/app/src/main/res/values-it/strings.xml
@@ -0,0 +1,319 @@
+<resources>
+
+    <!-- Titles -->
+    <string name="title_sign_in_your_server">Accedi al tuo server</string>
+    <string name="title_log_in">Accesso</string>
+    <string name="title_share_the_app">Condividi la App</string>
+    <string name="title_register_username">Registra nome utente</string>
+    <string name="title_reset_password">Annullare password</string>
+    <string name="title_sign_up">Iscrizione</string>
+    <string name="title_authentication">Autenticazione</string>
+    <string name="title_legal_terms">Termini Legali</string>
+    <string name="title_chats">Stanze</string>
+    <string name="title_profile">Profilo</string>
+    <string name="title_members">Membri</string>
+    <string name="title_counted_members">(%d) Membri</string>
+    <string name="title_settings">Parametri</string>
+    <string name="title_preferences">Preferenze</string>
+    <string name="title_change_password">Cambiare Password</string>
+    <string name="title_rate_us">Valutaci</string>
+    <string name="title_admin_panel">Pannello di Amministrazione</string>
+    <string name="title_password">Password</string>
+    <string name="title_update_profile">Aggiorna Profilo</string>
+    <string name="title_about">Informazioni</string>
+    <string name="title_create_channel">Crea Canale</string>
+    <string name="title_are_you_sure">Sei sicuro che vuoi uscire ?</string>
+
+    <!-- Actions -->
+    <string name="action_connect">Collega</string>
+    <string name="action_use_this_username">Usa questo nome utente</string>
+    <string name="action_terms_of_service">Termini di Servizio</string>
+    <string name="action_privacy_policy">Politica sulla Riservatezza</string>
+    <string name="action_search">Cerca</string>
+    <string name="action_update">Aggiorna</string>
+    <string name="action_settings">Parametri</string>
+    <string name="action_create_channel">Crea canale</string>
+    <string name="action_create">Crea</string>
+    <string name="action_logout">Disconnettersi</string>
+    <string name="action_files">Documenti</string>
+    <string name="action_confirm_password">Conferma Cambio Password</string>
+    <string name="action_join_chat">Iscriviti alla stanza</string>
+    <string name="action_add_account">Aggiungi utente</string>
+    <string name="action_online">In linea</string>
+    <string name="action_away">Lontano</string>
+    <string name="action_busy">Occupato</string>
+    <string name="action_invisible">Invisibile</string>
+    <string name="action_drawing">Disegno</string>
+    <string name="action_save_to_gallery">Salva in galleria</string>
+    <string name="action_select_photo_from_gallery">Seleziona foto dalla galleria</string>
+    <string name="action_take_photo">Fare foto</string>
+    <string name="action_reset_avatar">Reimposta avatar</string>
+    <string name="action_connect_server">Collegati a un server</string>
+    <string name="action_join_community">Entra nella community</string>
+    <string name="action_create_server">Crea un nuovo server</string>
+    <string name="action_register">Registra</string>
+    <string name="action_confirm">Conferma</string>
+    <string name="action_delete_account">Elimina utente</string>
+
+    <!-- Settings List -->
+    <string-array name="settings_actions">
+        <item name="item_preferences">Preferenze</item>
+        <item name="item_password">Cambiare Password</item>
+        <item name="item_share_app">Condividi App</item>
+        <item name="item_rate_us">Valutaci</item>
+        <item name="item_password">Informazioni</item>
+    </string-array>
+
+    <!-- Regular information messages -->
+    <string name="msg_generic_error">Mi dispiace, si è verificato un errore, per favore riprova</string>
+    <string name="msg_no_data_to_display">Nessun dato da visualizzare</string>
+    <string name="msg_check_this_out">Controllalo</string>
+    <string name="msg_share_using">Condividi utilizzando</string>
+    <string name="msg_profile_update_successfully">Aggiornamento del profilo con successo</string>
+    <string name="msg_username">Nome utente</string>
+    <string name="msg_username_or_email">Nome utente o e-mail</string>
+    <string name="msg_password">Password</string>
+    <string name="msg_name">Nome</string>
+    <string name="msg_email">E-mail</string>
+    <string name="msg_avatar_url">Avatar URL</string>
+    <string name="msg_or_continue_using_social_accounts">O continuare utilizzando un account social</string>
+    <string name="msg_new_user">Nuovo utente? %1$s</string>
+    <string name="msg_forgot__your_password">Hai dimenticato la tua password?</string>
+    <string name="msg_reset">Reimposta</string>
+    <string name="msg_check_your_email_to_reset_your_password">E-mail inviata! Controlla la tua casella di posta per reimpostare la password.</string>
+    <string name="msg_invalid_email">Per favore digita una e-mail valida</string>
+    <string name="msg_new_user_agreement">Procedendo accetti i nostri\n%1$s e %2$s</string>
+    <string name="msg_yesterday">Ieri</string>
+    <string name="msg_today">Oggi</string>
+    <string name="msg_message">Messaggio</string>
+    <string name="msg_this_room_is_read_only">Questa stanza è di sola lettura</string>
+    <string name="msg_invalid_2fa_code">Invalido Codice 2FA non valido</string>
+    <string name="msg_invalid_file">Documento non valido</string>
+    <string name="msg_invalid_server_url">URL del server non valido</string>
+    <string name="msg_content_description_log_in_using_facebook">Accedi usando Facebook</string>
+    <string name="msg_content_description_log_in_using_github">Accedi usando Github</string>
+    <string name="msg_content_description_log_in_using_google">Accedi usando Google</string>
+    <string name="msg_content_description_log_in_using_linkedin">Accedi usando Linkedin</string>
+    <string name="msg_content_description_log_in_using_meteor">Accedi usando Meteor</string>
+    <string name="msg_content_description_log_in_using_twitter">Accedi usando Twitter</string>
+    <string name="msg_content_description_log_in_using_gitlab">Accedi usando Gitlab</string>
+    <string name="msg_content_description_log_in_using_wordpress">Accedi usando WordPress</string>
+    <string name="msg_content_description_send_message">Invia messaggio</string>
+    <string name="msg_content_description_show_more_login_options">Mostra ulteriori opzioni di accesso</string>
+    <string name="msg_content_description_show_attachment_options">Mostra opzioni per allegati</string>
+    <string name="msg_you">Tu</string>
+    <string name="msg_unknown">Sconosciuto</string>
+    <string name="msg_email_address">Indirizzo e-mail</string>
+    <string name="msg_utc_offset">Fuso orario UTC</string>
+    <string name="msg_new_password">Inserire Nuova Password</string>
+    <string name="msg_confirm_password">Confermare Nuova Password</string>
+    <string name="msg_channel_name">Nome Canale</string>
+    <string name="msg_search">Ricerca</string>
+    <string name="msg_unread_messages">Messaggi non letti</string>
+    <string name="msg_preview_video">Video</string>
+    <string name="msg_preview_audio">Audio</string>
+    <string name="msg_preview_photo">Foto</string>
+    <string name="msg_preview_file">Documento</string>
+    <string name="msg_no_messages_yet">Nessun nuovo messaggio</string>
+    <string name="msg_ok">OK</string>
+    <string name="msg_update_app_version_in_order_to_continue">Versione server non aggiornata. Si prega di contattare l\'amministratore del server per aggiornare la versione del server per continuare.</string>
+    <string name="msg_ver_not_recommended">Sembra che la versione del tuo server sia inferiore alla versione consigliata %1$s.\nÈ ancora possibile accedere ma è possibile che si verifichino comportamenti imprevisti.</string>
+    <string name="msg_ver_not_minimum">Sembra che la versione del tuo server sia inferiore alla versione minima richiesta %1$s.\nSi prega di aggiornare il server per accedere!</string>
+    <string name="msg_no_chat_title">Nessun messaggio chat</string>
+    <string name="msg_no_chat_description">Inizia a conversare per vedere i tuoi\nmessagggi qui.</string>
+    <string name="msg_cancel">CANCELLARE</string>
+    <string name="msg_http_insecure">Quando si utilizza HTTP, ci si connette a un server non sicuro. Non ti consigliamo di farlo.</string>
+    <string name="msg_error_checking_server_version">Si è verificato un errore durante il controllo della versione del server, riprovare</string>
+    <string name="msg_invalid_server_protocol">Il protocollo selezionato non è accettato da questo server, prova a utilizzare HTTPS</string>
+    <string name="msg_image_saved_successfully">L\'immagine è stata salvata nella galleria</string>
+    <string name="msg_image_saved_failed">Impossibile salvare l\'immagine</string>
+    <string name="msg_edited">(modificato)</string>
+    <string name="msg_and">\u0020e\u0020</string>
+    <string name="msg_is_typing">\u0020sta scrivendo…</string>
+    <string name="msg_are_typing">\u0020stanno scrivendo…</string>
+    <string name="msg_several_users_are_typing">Alcuni utenti stanno scrivendo…</string>
+    <string name="msg_no_search_found">Nessun risultato trovato</string>
+    <string name="msg_log_out">Disconnessione…</string>
+    <string name="msg_upload_file">Caricamento documento</string>
+    <string name="msg_file_description">Descrizione documento</string>
+    <string name="msg_send">Inviare</string>
+    <string name="msg_sent_attachment">Inviato allegato</string>
+    <string name="msg_welcome_to_rocket_chat">Benvenuto in Rocket.Chat </string>
+    <string name="msg_team_communication">Team Communication</string>
+    <string name="msg_login_with_email">Accedi con <b>e-mail</b></string>
+    <string name="msg_create_account">Crea un utente</string>
+    <string name="msg_continue_with_facebook">Continua con <b>Facebook</b></string>
+    <string name="msg_continue_with_github">Continua con <b>Github</b></string>
+    <string name="msg_continue_with_google">Continua con <b>Google</b></string>
+    <string name="msg_continue_with_linkedin">Continua con <b>Linkedin</b></string>
+    <string name="msg_continue_with_gitlab">Continua con <b>GitLab</b></string>
+    <string name="msg_continue_with_wordpress">Continua con <b>WordPress</b></string>
+    <string name="msg_two_factor_authentication">Autenticazione a 2 fattori (2FA)</string>
+    <string name="msg__your_2fa_code">Qual è il tuo codice 2FA ?</string>
+    <string name="msg_permalink_copied">Permalink copiato</string>
+    <plurals name="msg_reacted_with_">
+        <item quantity="one">%1$s ha reagito con %2$s</item>
+        <item quantity="other">%1$s ha reagito con %2$s</item>
+    </plurals>
+
+    <!-- Create channel messages -->
+    <string name="msg_private_channel">Privato</string>
+    <string name="msg_public_channel">Pubblico</string>
+    <string name="msg_private_channel_description">Solo tu e i membri invitati possono accedere a questo canale</string>
+    <string name="msg_public_channel_description">Tutti possono accedere a questo canale</string>
+    <string name="msg_ready_only_channel">Canale a sola lettura</string>
+    <string name="msg_ready_only_channel_description">Solo l\'amministratore può scrivere nuovi messaggi</string>
+    <string name="msg_invite_members">Invita i partecipanti per il canale</string>
+    <string name="msg_member_already_added">Hai già selezionato questo utente</string>
+    <string name="msg_member_not_found">Partecipante non trovato</string>
+    <string name="msg_channel_created_successfully">Canale creato con successo</string>
+    <string name="msg_message_copied">Messaggio copiato</string>
+    <string name="msg_delete_message">Cancellare Messaggio</string>
+    <string name="msg_delete_description">Sei sicuro di voler eliminare questo messaggio ?</string>
+    <string name="msg_view_more">vedere di più</string>
+    <string name="msg_view_less">vedere di meno</string>
+    <string name="msg_muted_on_this_channel">Sei disattivato su questo canale</string>
+
+    <!-- Preferences messages -->
+    <string name="msg_analytics_tracking">Tracciamento Analitico</string>
+    <string name="msg_send_analytics_tracking">Invia statistiche anonime per migliorare questa app</string>
+    <string name="msg_do_not_send_analytics_tracking">Non inviare statiche anonime per migliorare questa app</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">Non applicabile poiché è una versione FOSS</string>
+
+    <!-- System messages -->
+    <string name="message_room_name_changed">Nome della camera cambiato in: %1$s da %2$s</string>
+    <string name="message_user_added_by">Utente %1$s aggiunto da %2$s</string>
+    <string name="message_user_removed_by">Utente %1$s rimosso da %2$s</string>
+    <string name="message_user_left">Ha lasciato il canale.</string>
+    <string name="message_user_joined_channel">È entrato nel canale.</string>
+    <string name="message_welcome">Benvenuto %s</string>
+    <string name="message_removed">Messaggio rimosso</string>
+    <string name="message_pinned">Messaggio segnato:</string>
+    <string name="message_muted">Utente %1$s disattivato da %2$s</string>
+    <string name="message_unmuted">Utente %1$s riattivato da %2$s</string>
+    <string name="message_role_add">%1$s ha il ruolo %2$s aggiunto da %3$s</string>
+    <string name="message_role_removed">%1$s ha il ruolo %2$s rimosso da %3$s</string>
+    <string name="message_credentials_saved_successfully">Credenziali salvate con successo</string>
+
+    <!-- Message actions -->
+    <string name="action_msg_reply">Rispondi</string>
+    <string name="action_msg_info">Informazioni messaggio</string>
+    <string name="action_msg_edit">Modifica</string>
+    <string name="action_msg_copy">Copia</string>
+    <string name="action_msg_quote">Citazione</string>
+    <string name="action_msg_delete">Cancella</string>
+    <string name="action_msg_pin">Messaggio importante</string>
+    <string name="action_msg_unpin">Messaggio normale</string>
+    <string name="action_msg_star">Messaggio preferito</string>
+    <string name="action_msg_unstar">Messaggio normale</string>
+    <string name="action_msg_share">Condividi</string>
+    <string name="action_title_editing">Modifica messaggio</string>
+    <string name="action_msg_add_reaction">Aggiungi reazione</string>
+    <string name="action_msg_copy_permalink">Copia permalink</string>3
+
+    <!-- Permission messages -->
+    <string name="permission_editing_not_allowed">La modifica non è consentita</string>
+    <string name="permission_deleting_not_allowed">La cancellazione non è consentita</string>
+    <string name="permission_pinning_not_allowed">Segnare come importante non consentito</string>
+    <string name="permission_starring_not_allowed">Segnare come preferito non consentito</string>
+
+    <!-- Search message -->
+    <string name="title_search_message">Cerca messaggio</string>
+
+    <!-- Favorite/Unfavorite chat room -->
+    <string name="title_favorite_chat">Stanza preferita</string>
+    <string name="title_unfavorite_chat">Stanza normale</string>
+
+    <!-- Members List -->
+    <string name="title_members_list">Partecipanti</string>
+
+    <!-- Mentions -->
+    <string name="msg_mentions">Menziona</string>
+    <string name="msg_no_mention">Togli menzione</string>
+    <string name="msg_all_the_mentions_appear_here">Tutte le menzioni\nappaiono qui</string>
+
+    <!-- Pinned Messages -->
+    <string name="title_pinned_messages">Messaggi importanti</string>
+    <string name="no_pinned_messages">Nessun messaggio importante</string>
+    <string name="no_pinned_description">Tutti i messaggi importanti\nappaiono qui</string>
+
+    <!-- Favorite Messages -->
+    <string name="title_favorite_messages">Messaggi preferiti</string>
+    <string name="no_favorite_messages">Nessun messaggio preferito</string>
+    <string name="no_favorite_description">Tutti i messaggi preferiti\nappaiono qui</string>
+
+    <!-- Files -->
+    <string name="title_files">Documenti</string>
+    <string name="title_files_total">Totale Documenti (%d)</string>
+    <string name="msg_no_files">Nessun documento</string>
+    <string name="msg_all_files_appear_here">Tutti i documenti appaiono qui</string>
+
+    <!-- Upload Messages -->
+    <string name="max_file_size_exceeded">Il documento di dimensione %1$d bytes eccede la massima dimensione di caricamento di %2$d bytes</string>
+
+    <!-- Socket status -->
+    <string name="status_connected">Collegato</string>
+    <string name="status_disconnected">Non collegato</string>
+    <string name="status_connecting">Collegamento</string>
+    <string name="status_authenticating">Autenticazione</string>
+    <string name="status_disconnecting">Disconessione</string>
+    <string name="status_waiting">Collegamento fra %d secondi</string>
+
+    <!--Suggestions-->
+    <string name="suggest_all_description">Notifica tutti in questa stanza</string>
+    <string name="suggest_here_description">Notifica gli utenti attivi di questa stanza</string>
+
+    <!-- Slash Commands -->
+    <string name="Slash_Gimme_Description">Mostra ༼ つ ◕_◕ ༽つ prima del tuo messaggio</string>
+    <string name="Slash_LennyFace_Description">Mostra ( ͡° ͜ʖ ͡°) dopo il tuo messaggio</string>
+    <string name="Slash_Shrug_Description">Mostra ¯\_(ツ)_/¯ dopo il tuo messaggio</string>
+    <string name="Slash_Tableflip_Description">Mostra (╯°□°）╯︵ ┻━┻</string>
+    <string name="Slash_TableUnflip_Description">Mostra ┬─┬ ノ( ゜-゜ノ)</string>
+    <string name="Create_A_New_Channel">Crea un nuovo canale</string>
+    <string name="Show_the_keyboard_shortcut_list">Mostra l\'elenco delle scorciatoie da tastiera</string>
+    <string name="Invite_user_to_join_channel_all_from">Invita tutti gli utenti da [#channel] a unirsi a questo canale</string>
+    <string name="Invite_user_to_join_channel_all_to">Invita tutti gli utenti da questo canale a partecipare a [#channel]</string>
+    <string name="Archive">Archivia</string>
+    <string name="Remove_someone_from_room">Rimuovi qualcuno dalla stanza</string>
+    <string name="Leave_the_current_channel">Lascia il canale corrente</string>
+    <string name="Displays_action_text">Visualizza il testo dell\'azione</string>
+    <string name="Direct_message_someone">Invia un messaggio diretto a qualcuno</string>
+    <string name="Mute_someone_in_room">Disattiva qualcuno nella stanza</string>
+    <string name="Unmute_someone_in_room">Riattiva qualcuno nella stanza</string>
+    <string name="Invite_user_to_join_channel">Invita un utente a unirsi a questo canale</string>
+    <string name="Unarchive">Non archiviare</string>
+    <string name="Join_the_given_channel">Unisciti al canale indicato</string>
+    <string name="Guggy_Command_Description">Genera una gif in base al testo fornito</string>
+    <string name="Slash_Topic_Description">Imposta argomento</string>
+
+    <!-- Emoji message-->
+    <string name="msg_no_recent_emoji">No recent emojis</string>
+    <string name="alert_title_default_skin_tone">Default skin tone</string>
+
+    <!-- Sorting and grouping-->
+    <string name="menu_chatroom_sort">Ordinare</string>
+    <string name="dialog_sort_title">Ordinare per</string>
+    <string name="dialog_sort_by_alphabet">Alfabeto</string>
+    <string name="dialog_sort_by_activity">Attività</string>
+    <string name="dialog_group_by_type">Raggruppa per tipo</string>
+    <string name="dialog_group_favourites">Raggruppa preferiti</string>
+    <string name="dialog_button_done">Fatto</string>
+    <string name="chatroom_header">Intestazione</string>
+
+    <!--ChatRooms Headers-->
+    <string name="header_channel">Canali</string>
+    <string name="header_private_groups">Gruppi Privati</string>
+    <string name="header_direct_messages">Messaggi Diretti</string>
+    <string name="header_live_chats">Stanza in diretta</string>
+    <string name="header_unknown">Sconosciuto</string>
+
+    <!--Notifications-->
+    <string name="share_label">Modifica messaggio condiviso</string>
+    <string name="notif_action_reply_hint">Risposta</string>
+    <string name="notif_error_sending">La risposta è fallita. Per favore riprova.</string>
+    <string name="notif_success_sending">Messaggio inviato a %1$s!</string>
+    <string name="read_by">Letto da</string>
+    <string name="message_information_title">Informazioni Messaggio</string>
+    <string name="message_room_changed_privacy">Il tipo di stanza è cambiato in: %1$s da %2$s</string>
+
+</resources>

From 8706d0bc461104cac17f2826ba35c8acf6e2b36c Mon Sep 17 00:00:00 2001
From: Leonardo Aramaki <leoaramaki@gmail.com>
Date: Fri, 23 Nov 2018 14:27:13 -0200
Subject: [PATCH 043/149] Do not clear the composer when enabling the send
 message button

---
 .../java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index ce0ab70a5c..f16a726460 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -531,7 +531,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         ui {
             button_send.isEnabled = true
             text_message.isEnabled = true
-            clearMessageComposition(true)
         }
     }
 
@@ -894,7 +893,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
                 }, 400)
             }
 
-            button_add_reaction.setOnClickListener { _ ->
+            button_add_reaction.setOnClickListener {
                 openEmojiKeyboardPopup()
             }
 

From 1ba86e52dea639e30be797fd304243f4c3786284 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Fri, 23 Nov 2018 12:09:08 -0800
Subject: [PATCH 044/149] Add licence and contact us options on settings
 fragment.

---
 .../chat/rocket/android/helper/TextHelper.kt  | 18 +++++-
 .../android/server/ui/ChangeServerActivity.kt |  1 +
 .../android/settings/ui/SettingsFragment.kt   | 60 +++++++++++++------
 app/src/main/res/values-de/strings.xml        | 16 ++---
 app/src/main/res/values-es/strings.xml        | 14 +++--
 app/src/main/res/values-fr/strings.xml        | 14 +++--
 app/src/main/res/values-hi-rIN/strings.xml    |  8 ++-
 app/src/main/res/values-ja/strings.xml        |  6 +-
 app/src/main/res/values-pt-rBR/strings.xml    |  6 +-
 app/src/main/res/values-ru-rRU/strings.xml    |  5 ++
 app/src/main/res/values-tr/strings.xml        | 10 +++-
 app/src/main/res/values-uk/strings.xml        | 14 +++--
 app/src/main/res/values/defaults.xml          |  1 +
 app/src/main/res/values/strings.xml           |  5 ++
 .../rocket/android/util/extension/Text.kt     |  8 ++-
 15 files changed, 134 insertions(+), 52 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/helper/TextHelper.kt b/app/src/main/java/chat/rocket/android/helper/TextHelper.kt
index c90730e21d..47acb766de 100644
--- a/app/src/main/java/chat/rocket/android/helper/TextHelper.kt
+++ b/app/src/main/java/chat/rocket/android/helper/TextHelper.kt
@@ -1,10 +1,12 @@
 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
diff --git a/app/src/main/java/chat/rocket/android/server/ui/ChangeServerActivity.kt b/app/src/main/java/chat/rocket/android/server/ui/ChangeServerActivity.kt
index 656dc3d788..8916e65f81 100644
--- a/app/src/main/java/chat/rocket/android/server/ui/ChangeServerActivity.kt
+++ b/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
 
diff --git a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
index 7712c58467..a57a920210 100644
--- a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
@@ -1,5 +1,6 @@
 package chat.rocket.android.settings.ui
 
+import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -13,6 +14,7 @@ import chat.rocket.android.about.ui.AboutFragment
 import chat.rocket.android.about.ui.TAG_ABOUT_FRAGMENT
 import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.analytics.event.ScreenViewEvent
+import chat.rocket.android.helper.TextHelper.getDeviceAndAppInformation
 import chat.rocket.android.main.ui.MainActivity
 import chat.rocket.android.preferences.ui.PreferencesFragment
 import chat.rocket.android.preferences.ui.TAG_PREFERENCES_FRAGMENT
@@ -20,10 +22,11 @@ import chat.rocket.android.settings.password.ui.PasswordActivity
 import chat.rocket.android.settings.presentation.SettingsView
 import chat.rocket.android.util.extensions.addFragmentBackStack
 import chat.rocket.android.util.extensions.inflate
+import chat.rocket.android.webview.ui.webViewIntent
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_settings.*
+import timber.log.Timber
 import javax.inject.Inject
-import kotlin.reflect.KClass
 
 internal const val TAG_SETTINGS_FRAGMENT = "SettingsFragment"
 
@@ -31,7 +34,7 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
     @Inject
     lateinit var analyticsManager: AnalyticsManager
 
-   override fun onCreate(savedInstanceState: Bundle?) {
+    override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         AndroidSupportInjection.inject(this)
     }
@@ -57,7 +60,7 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
 
     override fun onItemClick(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
         when (parent?.getItemAtPosition(position).toString()) {
-            resources.getString(R.string.title_preferences) -> {
+            resources.getStringArray(R.array.settings_actions)[0] -> {
                 (activity as AppCompatActivity).addFragmentBackStack(
                     TAG_PREFERENCES_FRAGMENT,
                     R.id.fragment_container
@@ -65,9 +68,11 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
                     PreferencesFragment.newInstance()
                 }
             }
-            resources.getString(R.string.title_change_password) ->
-                startNewActivity(PasswordActivity::class)
-            resources.getString(R.string.title_about) -> {
+
+            resources.getStringArray(R.array.settings_actions)[1] ->
+                activity?.startActivity(Intent(activity, PasswordActivity::class.java))
+
+            resources.getStringArray(R.array.settings_actions)[2] -> {
                 (activity as AppCompatActivity).addFragmentBackStack(
                     TAG_ABOUT_FRAGMENT,
                     R.id.fragment_container
@@ -75,16 +80,17 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
                     AboutFragment.newInstance()
                 }
             }
-            resources.getString(R.string.title_share_the_app) ->{
-                val shareIntent = Intent(Intent.ACTION_SEND)
-                shareIntent.type = "text/plain"
-                val shareBody = getString(R.string.msg_check_this_out)
-                val shareSub = getString(R.string.play_store_link)
-                shareIntent.putExtra(Intent.EXTRA_SUBJECT, shareBody)
-                shareIntent.putExtra(Intent.EXTRA_TEXT, shareSub)
-                startActivity(Intent.createChooser(shareIntent, getString(R.string.msg_share_using)))
-            }
 
+            resources.getStringArray(R.array.settings_actions)[3] -> shareApp()
+
+            resources.getStringArray(R.array.settings_actions)[4] -> activity?.startActivity(
+                context?.webViewIntent(
+                    getString(R.string.license_url),
+                    getString(R.string.title_licence)
+                )
+            )
+
+            resources.getStringArray(R.array.settings_actions)[5] -> contactSupport()
         }
     }
 
@@ -97,9 +103,27 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
                 getString(R.string.title_settings)
     }
 
-    private fun startNewActivity(classType: KClass<out AppCompatActivity>) {
-        startActivity(Intent(activity, classType.java))
-        activity?.overridePendingTransition(R.anim.open_enter, R.anim.open_exit)
+    private fun shareApp() {
+        with(Intent(Intent.ACTION_SEND)) {
+            type = "text/plain"
+            putExtra(Intent.EXTRA_SUBJECT, getString(R.string.msg_check_this_out))
+            putExtra(Intent.EXTRA_TEXT, getString(R.string.play_store_link))
+            startActivity(Intent.createChooser(this, getString(R.string.msg_share_using)))
+        }
+    }
+
+    private fun contactSupport() {
+        with(Intent(Intent.ACTION_SEND)) {
+            type = "message/rfc822"
+            putExtra(Intent.EXTRA_EMAIL, arrayOf("support@rocket.chat"))
+            putExtra(Intent.EXTRA_SUBJECT, getString(R.string.msg_android_app_support))
+            putExtra(Intent.EXTRA_TEXT, getDeviceAndAppInformation())
+            try {
+                startActivity(Intent.createChooser(this, getString(R.string.msg_send_email)))
+            } catch (ex: ActivityNotFoundException) {
+                Timber.e(ex)
+            }
+        }
     }
 
     companion object {
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c9c4bda7dd..6d441845d5 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -21,7 +21,8 @@
     <string name="title_update_profile">Update Profil</string>
     <string name="title_about">Über</string>
     <string name="title_create_channel">Erstelle Raum</string>
-    <string name="title_are_you_sure">Are you sure?</string><!-- TODO Add translation -->
+    <string name="title_licence">Licence</string> <!-- TODO Add translation -->
+    <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
 
     <!-- Actions -->
     <string name="action_connect">Verbinde</string>
@@ -60,6 +61,8 @@
         <item name="item_password">Ändere Passwort</item>
         <item name="item_password">Über</item>
         <item name="item_share_app">App teilen</item>
+        <item name="item_share_app_licence">Licence</item> <!-- TODO Add translation -->
+        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
     </string-array>
 
     <!-- Regular information messages -->
@@ -163,12 +166,11 @@
     <string name="msg_message_copied">Nachricht kopiert</string>
     <string name="msg_delete_message">Lösche Nachricht</string>
     <string name="msg_delete_description">Sind Sie sicher, dass Sie diese Nachricht löschen wollen?</string>
-    <!-- TODO - Add proper translation -->
-    <string name="msg_view_more">view more</string>
-    <!-- TODO - Add proper translation -->
-    <string name="msg_view_less">view less</string>
-    <!-- TODO - Add proper translation -->
-    <string name="msg_permalink_copied">Permalink copied</string>
+    <string name="msg_view_more">view more</string> <!-- TODO - Add proper translation -->
+    <string name="msg_view_less">view less</string> <!-- TODO - Add proper translation -->
+    <string name="msg_permalink_copied">Permalink copied</string> <!-- TODO - Add proper translation -->
+    <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
+    <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
 
     <!-- Preferences messages -->
     <string name="msg_analytics_tracking">Analytics tracking</string> <!-- TODO Add translation -->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 8f06435d23..eee6ffc1c6 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -20,6 +20,7 @@
     <string name="title_update_profile">Actualización del perfil</string>
     <string name="title_about">Acerca de</string>
     <string name="title_create_channel">Crear canal</string>
+    <string name="title_licence">Licence</string> <!-- TODO Add translation -->
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
 
     <!-- Actions -->
@@ -59,6 +60,8 @@
         <item name="item_password">Cambia la contraseña</item>
         <item name="item_password">Acerca de</item>
         <item name="item_share_app">Compartir aplicación</item>
+        <item name="item_share_app_licence">Licence</item> <!-- TODO Add translation -->
+        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
     </string-array>
 
     <!-- Regular information messages -->
@@ -160,12 +163,11 @@
     <string name="msg_member_already_added">Ya has seleccionado este usuario</string>
     <string name="msg_member_not_found">Miembro no encontrado</string>
     <string name="msg_channel_created_successfully">Canal creado con éxito</string>
-    <!-- TODO - Add proper translation -->
-    <string name="msg_view_more">view more</string>
-    <!-- TODO - Add proper translation -->
-    <string name="msg_view_less">view less</string>
-    <!-- TODO - Add proper translation -->
-    <string name="msg_permalink_copied">Permalink copied</string>
+    <string name="msg_view_more">view more</string> <!-- TODO - Add proper translation -->
+    <string name="msg_view_less">view less</string> <!-- TODO - Add proper translation -->
+    <string name="msg_permalink_copied">Permalink copied</string> <!-- TODO - Add proper translation -->
+    <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
+    <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
 
     <!-- Preferences messages -->
     <string name="msg_analytics_tracking">Analytics tracking</string> <!-- TODO Add translation -->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ee5e0a4c91..cd979e0888 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -21,6 +21,7 @@
     <string name="title_update_profile">Mettre à jour le profil</string>
     <string name="title_about">À propos</string>
     <string name="title_create_channel">Créer salon</string>
+    <string name="title_licence">Licence</string> <!-- TODO Add translation -->
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
 
     <!-- Actions -->
@@ -60,6 +61,8 @@
         <item name="item_password">Changer le mot de passe</item>
         <item name="item_password">À propos</item>
         <item name="item_share_app">Partager l\'application</item>
+        <item name="item_share_app_licence">Licence</item> <!-- TODO Add translation -->
+        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
     </string-array>
 
     <!-- Regular information messages -->
@@ -152,12 +155,11 @@
     <string name="msg_continue_with_wordpress">Continue with <b>WordPress</b></string> <!-- TODO Add translation -->
     <string name="msg_two_factor_authentication">Two-factor Authentication</string> <!-- TODO Add translation -->
     <string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
-    <!-- TODO - Add proper translation -->
-    <string name="msg_view_more">view more</string>
-    <!-- TODO - Add proper translation -->
-    <string name="msg_view_less">view less</string>
-    <!-- TODO - Add proper translation -->
-    <string name="msg_permalink_copied">Permalink copied</string>
+    <string name="msg_view_more">view more</string> <!-- TODO - Add proper translation -->
+    <string name="msg_view_less">view less</string> <!-- TODO - Add proper translation -->
+    <string name="msg_permalink_copied">Permalink copied</string> <!-- TODO - Add proper translation -->
+    <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
+    <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Privé</string>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 9e4e2999bf..3d931ec61d 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -21,6 +21,7 @@
     <string name="title_update_profile">प्रोफ़ाइल अपडेट करें</string>
     <string name="title_about">परिचय</string>
     <string name="title_create_channel">चैनल बनाएं</string>
+    <string name="title_licence">Licence</string> <!-- TODO Add translation -->
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
 
     <!-- Actions -->
@@ -60,6 +61,8 @@
         <item name="item_password">पासवर्ड बदलें</item>
         <item name="item_password">परिचय</item>
         <item name="item_share_app">ऐप शेयर करें</item>
+        <item name="item_share_app_licence">Licence</item> <!-- TODO Add translation -->
+        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
     </string-array>
 
     <!-- Regular information messages -->
@@ -168,8 +171,9 @@
     <string name="msg_channel_created_successfully">चैनल सफलतापूर्वक बनाया गया</string>
     <string name="msg_view_more">और देखें</string>
     <string name="msg_view_less">कम देखें</string>
-    <!-- TODO - Add proper translation -->
-    <string name="msg_permalink_copied">Permalink copied</string>
+    <string name="msg_permalink_copied">Permalink copied</string> <!-- TODO - Add proper translation -->
+    <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
+    <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
 
     <!-- Preferences messages -->
     <string name="msg_analytics_tracking">एनालिटिक्स ट्रैकिंग</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 6d2803395f..2c97d7006d 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -22,6 +22,7 @@
     <string name="title_password">パスワードの変更</string>
     <string name="title_update_profile">プロフィールの更新</string>
     <string name="title_about">About</string>
+    <string name="title_licence">Licence</string> <!-- TODO Add translation -->
     <string name="title_create_channel">新しいチャネルを作成</string>
 
     <!-- Actions -->
@@ -61,6 +62,8 @@
         <item name="item_password">パスワードの変更</item>
         <item name="item_password">アプリ情報</item>
         <item name="item_share_app">アプリを共有する</item>
+        <item name="item_share_app_licence">Licence</item> <!-- TODO Add translation -->
+        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
     </string-array>
 
     <!-- Regular information messages -->
@@ -171,8 +174,9 @@
     <string name="msg_message_copied">メッセージをコピー</string>
     <string name="msg_delete_message">メッセージを削除</string>
     <string name="msg_delete_description">このメッセージを削除してもよろしいですか?</string>
-
     <string name="msg_permalink_copied">パーマリンクのコピー</string>
+    <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
+    <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
 
     <!-- Preferences messages -->
     <string name="msg_analytics_tracking">トラッキングの分析</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 6888dd1bf6..8efe160f93 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -21,6 +21,7 @@
     <string name="title_update_profile">Editar perfil</string>
     <string name="title_about">Sobre</string>
     <string name="title_create_channel">Criar chat</string>
+    <string name="title_licence">Licença</string> <!-- TODO Add translation -->
     <string name="title_are_you_sure">Você tem certeza?</string>
 
     <!-- Actions -->
@@ -60,6 +61,8 @@
         <item name="item_password">Alterar senha</item>
         <item name="item_password">Sobre</item>
         <item name="item_share_app">Compartilhe o aplicativo</item>
+        <item name="item_share_app_licence">Licença</item>
+        <item name="item_contact_us">Contate-nos</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -155,8 +158,9 @@
     <string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
     <string name="msg_view_more">visualizar mais</string>
     <string name="msg_view_less">visualizar menos</string>
-    <!-- TODO - Add proper translation -->
     <string name="msg_permalink_copied">Permalink copiado</string>
+    <string name="msg_send_email">Enviar e-mail</string>
+    <string name="msg_android_app_support">Suporte ao aplicativo Android</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Privado</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 090d95c48e..ae9209c777 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -21,6 +21,7 @@
     <string name="title_update_profile">Обновить профиль</string>
     <string name="title_about">О программе</string>
     <string name="title_create_channel">Создать новый канал</string>
+    <string name="title_licence">Licence</string> <!-- TODO Add translation -->
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
 
     <!-- Actions -->
@@ -60,6 +61,8 @@
         <item name="item_password">Изменить пароль</item>
         <item name="item_password">О программе</item>
         <item name="item_share_app">добавить приложение</item>
+        <item name="item_share_app_licence">Licence</item> <!-- TODO Add translation -->
+        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
     </string-array>
 
     <!-- Regular information messages -->
@@ -154,6 +157,8 @@
     <string name="msg_view_more">больше</string>
     <string name="msg_view_less">меньше</string>
     <string name="msg_permalink_copied">Ссылка скопирована</string>
+    <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
+    <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Приватный</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 8bafd697b8..b9416216f5 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -21,6 +21,7 @@
     <string name="title_update_profile">Profilinizi Düzenleyin</string>
     <string name="title_about">Hakkında</string>
     <string name="title_create_channel">Yeni Kanal Oluştur</string>
+    <string name="title_licence">Licence</string> <!-- TODO Add translation -->
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
 
     <!-- Actions -->
@@ -60,6 +61,8 @@
         <item name="item_password">Şifre Değiştir</item>
         <item name="item_password">Hakkında</item>
         <item name="item_share_app">uygulamayı Paylaş</item>
+        <item name="item_share_app_licence">Licence</item> <!-- TODO Add translation -->
+        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
     </string-array>
 
     <!-- Regular information messages -->
@@ -169,9 +172,10 @@
     <string name="msg_delete_description">Bu mesajı silmek istediğinizden emin misiniz</string>
     <string name="msg_view_more">Daha fazla göster</string>
     <string name="msg_view_less">Daha az göster</string>
-    <!-- TODO - Add proper translation -->
-    <string name="msg_permalink_copied">Permalink copied</string>
-    
+    <string name="msg_permalink_copied">Permalink copied</string> <!-- TODO - Add proper translation -->
+    <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
+    <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
+
     <!-- Preferences messages -->
     <string name="msg_analytics_tracking">İstatistik takibi</string>
     <string name="msg_send_analytics_tracking">Uygulamanın gelişmesine katkıda bulunmak için anonim istatistik bilgisi gönder</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 6259632ae9..efb7ec91c5 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -21,6 +21,7 @@
     <string name="title_update_profile">Оновити профіль</string>
     <string name="title_about">"Про програму"</string>
     <string name="title_create_channel">Створити новий канал</string>
+    <string name="title_licence">Licence</string> <!-- TODO Add translation -->
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
 
     <!-- Actions -->
@@ -60,6 +61,8 @@
         <item name="item_password">Change Password</item> <!-- TODO Add translation -->
         <item name="item_password">About</item> <!-- TODO Add translation -->
         <item name="item_share_app">поділитися прикладом</item>
+        <item name="item_share_app_licence">Licence</item> <!-- TODO Add translation -->
+        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
     </string-array>
 
     <!-- Regular information messages -->
@@ -150,12 +153,11 @@
     <string name="msg_continue_with_wordpress">Continue with <b>WordPress</b></string> <!-- TODO Add translation -->
     <string name="msg_two_factor_authentication">Two-factor Authentication</string> <!-- TODO Add translation -->
     <string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
-    <!-- TODO - Add proper translation -->
-    <string name="msg_view_more">view more</string>
-    <!-- TODO - Add proper translation -->
-    <string name="msg_view_less">view less</string>
-    <!-- TODO - Add proper translation -->
-    <string name="msg_permalink_copied">Permalink copied</string>
+    <string name="msg_view_more">view more</string> <!-- TODO - Add proper translation -->
+    <string name="msg_view_less">view less</string> <!-- TODO - Add proper translation -->
+    <string name="msg_permalink_copied">Permalink copied</string> <!-- TODO - Add proper translation -->
+    <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
+    <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Приватний</string>
diff --git a/app/src/main/res/values/defaults.xml b/app/src/main/res/values/defaults.xml
index 4df7ef4e1a..e27cbbe25f 100644
--- a/app/src/main/res/values/defaults.xml
+++ b/app/src/main/res/values/defaults.xml
@@ -5,4 +5,5 @@
     <string name="community_server_url" translatable="false">open.rocket.chat</string>
     <string name="create_server_url" translatable="false">cloud.rocket.chat/trial</string>
     <string name="play_store_link" translatable="false">https://play.google.com/store/apps/details?id=chat.rocket.android</string>
+    <string name="license_url" translatable="false">https://github.com/RocketChat/Rocket.Chat.Android/blob/develop/LICENSE</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7675de67b0..5a81da2bcc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,6 +33,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="title_update_profile">Update profile</string>
     <string name="title_about">About</string>
     <string name="title_create_channel">Create Channel</string>
+    <string name="title_licence">Licence</string>
     <string name="title_are_you_sure">Are you sure?</string>
 
     <!-- Actions -->
@@ -72,6 +73,8 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
         <item name="item_password">Change Password</item>
         <item name="item_password">About</item>
         <item name="item_share_app">Share App</item>
+        <item name="item_share_app_licence">Licence</item>
+        <item name="item_contact_us">Contact us</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -166,6 +169,8 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="msg_two_factor_authentication">Two-factor Authentication</string>
     <string name="msg__your_2fa_code">What’s your 2FA code?</string>
     <string name="msg_permalink_copied">Permalink copied</string>
+    <string name="msg_send_email">Send email</string>
+    <string name="msg_android_app_support">Android app support</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Private</string>
diff --git a/util/src/main/java/chat/rocket/android/util/extension/Text.kt b/util/src/main/java/chat/rocket/android/util/extension/Text.kt
index 8435a4472e..de47f0d7f6 100644
--- a/util/src/main/java/chat/rocket/android/util/extension/Text.kt
+++ b/util/src/main/java/chat/rocket/android/util/extension/Text.kt
@@ -4,6 +4,9 @@ import java.math.BigInteger
 import java.security.MessageDigest
 import java.security.NoSuchAlgorithmException
 
+/**
+ * Returns a SHA-256 hash for a string.
+ */
 @Throws(NoSuchAlgorithmException::class)
 fun String.gethash(): ByteArray {
     val digest = MessageDigest.getInstance("SHA-256")
@@ -11,4 +14,7 @@ fun String.gethash(): ByteArray {
     return digest.digest(this.toByteArray())
 }
 
-fun ByteArray.toHex(): String = String.format("%0" + this.size * 2 + "X", BigInteger(1, this))
+/**
+ * Return the hex of a [ByteArray].
+ */
+fun ByteArray.toHex(): String = String.format("%0" + this.size * 2 + "X", BigInteger(1, this))
\ No newline at end of file

From 239c87f0d13262597b8a3ff828de1e23ef2ce6bb Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Fri, 23 Nov 2018 13:49:08 -0800
Subject: [PATCH 045/149] Updates strings.xml

---
 app/src/main/res/values-it/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 4b3bd1e3fe..5832af1ecd 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -35,7 +35,7 @@
     <string name="action_create_channel">Crea canale</string>
     <string name="action_create">Crea</string>
     <string name="action_logout">Disconnettersi</string>
-    <string name="action_files">Documenti</string>
+    <string name="action_attach_a_files">Attach a file</string> <!-- TODO ADD translation -->
     <string name="action_confirm_password">Conferma Cambio Password</string>
     <string name="action_join_chat">Iscriviti alla stanza</string>
     <string name="action_add_account">Aggiungi utente</string>
@@ -46,7 +46,7 @@
     <string name="action_drawing">Disegno</string>
     <string name="action_save_to_gallery">Salva in galleria</string>
     <string name="action_select_photo_from_gallery">Seleziona foto dalla galleria</string>
-    <string name="action_take_photo">Fare foto</string>
+    <string name="action_take_a_photo">Take a photo</string> <!-- TODO ADD translation -->
     <string name="action_reset_avatar">Reimposta avatar</string>
     <string name="action_connect_server">Collegati a un server</string>
     <string name="action_join_community">Entra nella community</string>

From cb67c1203e599783b1a88a0847c90465ece743a1 Mon Sep 17 00:00:00 2001
From: Lucio Maciel <luciofm@gmail.com>
Date: Fri, 23 Nov 2018 19:51:54 -0300
Subject: [PATCH 046/149] Fix merge conflict

---
 .../java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt   | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index 54fc3ef508..21537bfd00 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -91,13 +91,10 @@ import kotlinx.android.synthetic.main.fragment_chat_room.*
 import kotlinx.android.synthetic.main.message_attachment_options.*
 import kotlinx.android.synthetic.main.message_composer.*
 import kotlinx.android.synthetic.main.message_list.*
-<<<<<<< HEAD
 import timber.log.Timber
 import java.io.File
 import java.io.IOException
-=======
 import kotlinx.android.synthetic.main.reaction_praises_list_item.*
->>>>>>> 6f0a22e3ee37b688b6ed6122453224754c31c167
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicInteger
 import javax.inject.Inject

From 5191d85458ef34ff98c7aa56a6878bc3873993a0 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Mon, 26 Nov 2018 12:24:01 -0800
Subject: [PATCH 047/149] Add missing translations for Italic

---
 app/src/main/res/values-it/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 92f062cda2..09c2faa556 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -22,6 +22,7 @@
     <string name="title_update_profile">Aggiorna Profilo</string>
     <string name="title_about">Informazioni</string>
     <string name="title_create_channel">Crea Canale</string>
+    <string name="title_licence">Licence</string> <!-- TODO ADD translation -->
     <string name="title_are_you_sure">Sei sicuro che vuoi uscire ?</string>
 
     <!-- Actions -->
@@ -153,6 +154,8 @@
     <string name="msg_two_factor_authentication">Autenticazione a 2 fattori (2FA)</string>
     <string name="msg__your_2fa_code">Qual è il tuo codice 2FA ?</string>
     <string name="msg_permalink_copied">Permalink copiato</string>
+    <string name="msg_send_email">Send email</string>
+    <string name="msg_android_app_support">Android app support</string>
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s ha reagito con %2$s</item>
         <item quantity="other">%1$s ha reagito con %2$s</item>

From a0b264a2fe4e6ed83db795b5edbf0afa3e774186 Mon Sep 17 00:00:00 2001
From: Samer Alabi <sameralabi@hotmail.com>
Date: Tue, 27 Nov 2018 17:00:10 -0500
Subject: [PATCH 048/149] Added missing Italian strings

---
 app/src/main/res/values-it/strings.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e484e3bdd8..43356a4380 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -24,9 +24,9 @@
     <string name="title_create_channel">Crea Canale</string>
     <string name="title_are_you_sure">Sei sicuro che vuoi uscire ?</string>
     <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
-    <string name="title_topic">Sujet</string> <!-- TODO add translation -->
-    <string name="title_announcement">Annonce</string> <!-- TODO add translation -->
-    <string name="title_description">La description</string> <!-- TODO add translation -->
+    <string name="title_topic">Argomento</string>
+    <string name="title_announcement">Annuncio</string>
+    <string name="title_description">Descrizione</string>
 
     <!-- Actions -->
     <string name="action_connect">Collega</string>
@@ -155,6 +155,9 @@
     <string name="msg_two_factor_authentication">Autenticazione a 2 fattori (2FA)</string>
     <string name="msg__your_2fa_code">Qual è il tuo codice 2FA ?</string>
     <string name="msg_permalink_copied">Permalink copiato</string>
+    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
+    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
+    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s ha reagito con %2$s</item>
         <item quantity="other">%1$s ha reagito con %2$s</item>

From fd8c19b3f58d35eadac0fbad38fc36638c8e9330 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Tue, 27 Nov 2018 19:51:02 -0800
Subject: [PATCH 049/149] Fix onbording being cut off on some resolutions.

---
 .../fragment_authentication_on_boarding.xml   | 313 +++++++++---------
 1 file changed, 159 insertions(+), 154 deletions(-)

diff --git a/app/src/main/res/layout/fragment_authentication_on_boarding.xml b/app/src/main/res/layout/fragment_authentication_on_boarding.xml
index c409d3366e..5f609450ca 100644
--- a/app/src/main/res/layout/fragment_authentication_on_boarding.xml
+++ b/app/src/main/res/layout/fragment_authentication_on_boarding.xml
@@ -1,4 +1,4 @@
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -7,165 +7,170 @@
     android:padding="@dimen/screen_edge_left_and_right_margins"
     tools:context="authentication.onboarding.ui.OnBoardingFragment">
 
-    <ImageView
-        android:id="@+id/image_on_boarding"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_onboarding"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="ContentDescription" />
-
-    <TextView
-        android:id="@+id/text_on_boarding_title"
-        style="@style/Authentication.TextView.Headline"
-        android:layout_marginTop="32dp"
-        android:text="@string/msg_welcome_to_rocket_chat"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/image_on_boarding" />
-
-    <TextView
-        android:id="@+id/text_on_boarding_description"
-        style="@style/Authentication.TextView.Description"
-        android:text="@string/msg_team_communication"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_on_boarding_title" />
-
-    <RelativeLayout
-        android:id="@+id/connect_with_a_server_container"
-        android:layout_width="0dp"
-        android:layout_height="60dp"
-        android:layout_marginTop="32dp"
-        android:background="@drawable/rounded_border"
-        android:foreground="?selectableItemBackground"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_on_boarding_description">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
         <ImageView
-            android:id="@+id/image_connect_with_a_server"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="20dp"
-            android:src="@drawable/ic_connect_with_a_server_black_30dp"
-            android:tint="@color/colorAccent"
-            tools:ignore="ContentDescription" />
-
-        <TextView
-            style="@style/Authentication.Button.Title"
+            android:id="@+id/image_on_boarding"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toStartOf="@+id/image_connect_with_a_server_chevron"
-            android:layout_toEndOf="@+id/image_connect_with_a_server"
-            android:text="@string/action_connect_server" />
-
-        <ImageView
-            android:id="@+id/image_connect_with_a_server_chevron"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:layout_marginEnd="8dp"
-            android:src="@drawable/ic_chevron_right_black_24dp"
-            android:tint="@color/colorAuthenticationChevronAndExpandIcon"
-            tools:ignore="ContentDescription" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/join_community_container"
-        android:layout_width="0dp"
-        android:layout_height="60dp"
-        android:layout_marginTop="10dp"
-        android:background="@drawable/rounded_border"
-        android:foreground="?selectableItemBackground"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/connect_with_a_server_container">
-
-        <ImageView
-            android:id="@+id/image_join_community"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="20dp"
-            android:src="@drawable/ic_rocket_chat_30dp"
+            android:src="@drawable/ic_onboarding"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
             tools:ignore="ContentDescription" />
 
         <TextView
-            android:id="@+id/text_join_community"
-            style="@style/Authentication.Button.Title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:layout_toStartOf="@+id/image_join_community_chevron"
-            android:layout_toEndOf="@+id/image_join_community"
-            android:text="@string/action_join_community" />
+            android:id="@+id/text_on_boarding_title"
+            style="@style/Authentication.TextView.Headline"
+            android:layout_marginTop="32dp"
+            android:text="@string/msg_welcome_to_rocket_chat"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/image_on_boarding" />
 
         <TextView
-            style="@style/Authentication.Button.Description"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/text_join_community"
-            android:layout_toStartOf="@+id/image_join_community_chevron"
-            android:layout_toEndOf="@+id/image_join_community"
-            android:text="@string/community_server_url" />
-
-        <ImageView
-            android:id="@+id/image_join_community_chevron"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:layout_marginEnd="8dp"
-            android:src="@drawable/ic_chevron_right_black_24dp"
-            android:tint="@color/colorAuthenticationChevronAndExpandIcon"
-            tools:ignore="ContentDescription" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/create_server_container"
-        android:layout_width="0dp"
-        android:layout_height="60dp"
-        android:layout_marginTop="10dp"
-        android:background="@drawable/rounded_color_accent"
-        android:foreground="?selectableItemBackground"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/join_community_container">
-
-        <ImageView
-            android:id="@+id/image_add"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="20dp"
-            android:src="@drawable/ic_add_24dp"
-            android:tint="@color/colorWhite"
-            tools:ignore="ContentDescription" />
-
-        <TextView
-            style="@style/Authentication.Button.Title.White"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toEndOf="@+id/image_add"
-            android:text="@string/action_create_server" />
-    </RelativeLayout>
-
-    <com.wang.avi.AVLoadingIndicatorView
-        android:id="@+id/view_loading"
-        style="@style/Authentication.AVLoadingIndicatorView"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+            android:id="@+id/text_on_boarding_description"
+            style="@style/Authentication.TextView.Description"
+            android:text="@string/msg_team_communication"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/text_on_boarding_title" />
+
+        <RelativeLayout
+            android:id="@+id/connect_with_a_server_container"
+            android:layout_width="0dp"
+            android:layout_height="60dp"
+            android:layout_marginTop="32dp"
+            android:background="@drawable/rounded_border"
+            android:foreground="?selectableItemBackground"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/text_on_boarding_description">
+
+            <ImageView
+                android:id="@+id/image_connect_with_a_server"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_centerVertical="true"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="20dp"
+                android:src="@drawable/ic_connect_with_a_server_black_30dp"
+                android:tint="@color/colorAccent"
+                tools:ignore="ContentDescription" />
+
+            <TextView
+                style="@style/Authentication.Button.Title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toStartOf="@+id/image_connect_with_a_server_chevron"
+                android:layout_toEndOf="@+id/image_connect_with_a_server"
+                android:text="@string/action_connect_server" />
+
+            <ImageView
+                android:id="@+id/image_connect_with_a_server_chevron"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="8dp"
+                android:src="@drawable/ic_chevron_right_black_24dp"
+                android:tint="@color/colorAuthenticationChevronAndExpandIcon"
+                tools:ignore="ContentDescription" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/join_community_container"
+            android:layout_width="0dp"
+            android:layout_height="60dp"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/rounded_border"
+            android:foreground="?selectableItemBackground"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/connect_with_a_server_container">
+
+            <ImageView
+                android:id="@+id/image_join_community"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_centerVertical="true"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="20dp"
+                android:src="@drawable/ic_rocket_chat_30dp"
+                tools:ignore="ContentDescription" />
+
+            <TextView
+                android:id="@+id/text_join_community"
+                style="@style/Authentication.Button.Title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_toStartOf="@+id/image_join_community_chevron"
+                android:layout_toEndOf="@+id/image_join_community"
+                android:text="@string/action_join_community" />
+
+            <TextView
+                style="@style/Authentication.Button.Description"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/text_join_community"
+                android:layout_toStartOf="@+id/image_join_community_chevron"
+                android:layout_toEndOf="@+id/image_join_community"
+                android:text="@string/community_server_url" />
+
+            <ImageView
+                android:id="@+id/image_join_community_chevron"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="8dp"
+                android:src="@drawable/ic_chevron_right_black_24dp"
+                android:tint="@color/colorAuthenticationChevronAndExpandIcon"
+                tools:ignore="ContentDescription" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/create_server_container"
+            android:layout_width="0dp"
+            android:layout_height="60dp"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/rounded_color_accent"
+            android:foreground="?selectableItemBackground"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/join_community_container">
+
+            <ImageView
+                android:id="@+id/image_add"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_centerVertical="true"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="20dp"
+                android:src="@drawable/ic_add_24dp"
+                android:tint="@color/colorWhite"
+                tools:ignore="ContentDescription" />
+
+            <TextView
+                style="@style/Authentication.Button.Title.White"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@+id/image_add"
+                android:text="@string/action_create_server" />
+        </RelativeLayout>
+
+        <com.wang.avi.AVLoadingIndicatorView
+            android:id="@+id/view_loading"
+            style="@style/Authentication.AVLoadingIndicatorView"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
\ No newline at end of file

From a0058ba9b6aefff1a7a88c6c8446b754a1d135ce Mon Sep 17 00:00:00 2001
From: Samer Alabi <sameralabi@hotmail.com>
Date: Tue, 27 Nov 2018 23:39:55 -0500
Subject: [PATCH 050/149] Added requested changes

---
 .../chatdetails/adapter/OptionItemHolder.kt   |  6 +++
 .../chatdetails/adapter/OptionViewHolder.kt   | 35 ++++++++++++++++
 .../di/ChatDetailsFragmentModule.kt           |  1 +
 .../di/ChatDetailsFragmentProvider.kt         |  1 +
 .../chatdetails/di/ChatDetailsModule.kt       |  1 +
 .../android/chatdetails/domain/Option.kt      |  7 ++++
 .../presentation/ChatDetailsNavigator.kt      |  1 +
 .../presentation/ChatDetailsPresenter.kt      |  7 +++-
 .../chatdetails/ui/ChatDetailsAdapter.kt      | 37 +++--------------
 .../chatdetails/ui/ChatDetailsFragment.kt     | 40 ++++++++++---------
 .../viewmodel/ChatDetailsViewModel.kt         |  1 +
 .../viewmodel/ChatDetailsViewModelFactory.kt  |  1 +
 12 files changed, 87 insertions(+), 51 deletions(-)
 create mode 100644 app/src/main/java/chat/rocket/android/chatdetails/adapter/OptionItemHolder.kt
 create mode 100644 app/src/main/java/chat/rocket/android/chatdetails/adapter/OptionViewHolder.kt
 create mode 100644 app/src/main/java/chat/rocket/android/chatdetails/domain/Option.kt

diff --git a/app/src/main/java/chat/rocket/android/chatdetails/adapter/OptionItemHolder.kt b/app/src/main/java/chat/rocket/android/chatdetails/adapter/OptionItemHolder.kt
new file mode 100644
index 0000000000..29a9689af9
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/chatdetails/adapter/OptionItemHolder.kt
@@ -0,0 +1,6 @@
+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
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/adapter/OptionViewHolder.kt b/app/src/main/java/chat/rocket/android/chatdetails/adapter/OptionViewHolder.kt
new file mode 100644
index 0000000000..70bd5b1919
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/chatdetails/adapter/OptionViewHolder.kt
@@ -0,0 +1,35 @@
+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
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentModule.kt b/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentModule.kt
index 791eee4797..5b2ddd0ec4 100644
--- a/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentModule.kt
+++ b/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentModule.kt
@@ -13,6 +13,7 @@ import kotlinx.coroutines.experimental.Job
 
 @Module
 class ChatDetailsFragmentModule {
+
     @Provides
     @PerFragment
     fun provideJob() = Job()
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentProvider.kt b/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentProvider.kt
index 70ddbaaa78..3cbbaa1347 100644
--- a/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentProvider.kt
+++ b/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentProvider.kt
@@ -7,6 +7,7 @@ import dagger.android.ContributesAndroidInjector
 
 @Module
 abstract class ChatDetailsFragmentProvider {
+
     @ContributesAndroidInjector(modules = [ChatDetailsFragmentModule::class])
     @PerFragment
     abstract fun providesChatDetailsFragment(): ChatDetailsFragment
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsModule.kt b/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsModule.kt
index 5e85d8a4f0..4c977a5eee 100644
--- a/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsModule.kt
+++ b/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsModule.kt
@@ -8,6 +8,7 @@ import dagger.Provides
 
 @Module
 class ChatDetailsModule {
+
     @Provides
     @PerActivity
     fun providesNavigator(activity: ChatDetailsActivity) = ChatDetailsNavigator(activity)
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/domain/Option.kt b/app/src/main/java/chat/rocket/android/chatdetails/domain/Option.kt
new file mode 100644
index 0000000000..af0b74c155
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/chatdetails/domain/Option.kt
@@ -0,0 +1,7 @@
+package chat.rocket.android.chatdetails.domain
+
+data class Option(
+    val name: String,
+    val icon: Int,
+    val listener: () -> Unit
+)
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsNavigator.kt b/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsNavigator.kt
index 143295f173..36ffb2316f 100644
--- a/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsNavigator.kt
+++ b/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsNavigator.kt
@@ -10,6 +10,7 @@ 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)
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsPresenter.kt b/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsPresenter.kt
index ec96c0bcc7..5a1518b10f 100644
--- a/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsPresenter.kt
@@ -5,6 +5,7 @@ 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
@@ -25,7 +26,11 @@ class ChatDetailsPresenter @Inject constructor(
     fun getDetails(chatRoomId: String, chatRoomType: String) {
         launchUI(strategy) {
             try {
-                view.displayDetails(roomToChatDetails(client.getInfo(chatRoomId, null, roomTypeOf(chatRoomType))))
+                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!!)
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsAdapter.kt b/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsAdapter.kt
index d9b141b478..d6bbaeb4fd 100644
--- a/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsAdapter.kt
+++ b/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsAdapter.kt
@@ -1,49 +1,24 @@
 package chat.rocket.android.chatdetails.ui
 
-import android.content.Context
-import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
 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
-import kotlinx.android.synthetic.main.item_detail_option.view.*
 
-class ChatDetailsAdapter(private val context: Context): RecyclerView.Adapter<ChatDetailsAdapter.ViewHolder>() {
+class ChatDetailsAdapter: RecyclerView.Adapter<OptionViewHolder>() {
     private val options: MutableList<Option> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder = ViewHolder(parent.inflate(R.layout.item_detail_option))
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): OptionViewHolder = OptionViewHolder(parent.inflate(R.layout.item_detail_option))
 
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) = holder.bind(options[position])
+    override fun onBindViewHolder(holder: OptionViewHolder, position: Int) = holder.bindViews(OptionItemHolder(options[position]))
 
     override fun getItemCount(): Int = options.size
 
-    inner class ViewHolder(itemView: View): RecyclerView.ViewHolder(itemView) {
-        fun bind(option: Option) {
-            bindName(option, itemView.name)
-            bindIcon(option, itemView.icon)
-            itemView.setOnClickListener { option.listener() }
-        }
-    }
-
-    inner class Option(val name: String, val icon: Int, val listener: () -> Unit)
-
     fun addOption(name: String, icon: Int, listener: () -> Unit) {
         options.add(Option(name, icon, listener))
         notifyDataSetChanged()
     }
-
-    private fun bindName(option: Option, view: TextView) {
-        view.text = option.name
-    }
-
-    private fun bindIcon(option: Option, view: ImageView) {
-        val drawable = DrawableHelper.getDrawableFromId(option.icon, context)
-        drawable.let { image ->
-            val mutateDrawable = DrawableHelper.wrapDrawable(image).mutate()
-            DrawableHelper.tintDrawable(mutateDrawable, context, R.color.colorPrimaryText)
-            view.setImageDrawable(mutateDrawable)
-        }
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt b/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt
index d32a40233d..43ffd17da9 100644
--- a/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt
@@ -114,27 +114,29 @@ class ChatDetailsFragment: Fragment(), ChatDetailsView {
         }
     }
 
-    private fun addOptions(adapter: ChatDetailsAdapter) {
-        if (!disableMenu) {
-            adapter.addOption(getString(R.string.title_files), R.drawable.ic_files_24dp) {
-                presenter.toFiles(chatRoomId!!)
+    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) {
-            adapter.addOption(getString(R.string.msg_mentions), R.drawable.ic_at_black_20dp) {
-                presenter.toMentions(chatRoomId!!)
-            }
-            adapter.addOption(getString(R.string.title_members), R.drawable.ic_people_outline_black_24dp) {
-                presenter.toMembers(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!!)
+                }
             }
-        }
 
-        adapter.addOption(getString(R.string.title_favorite_messages), R.drawable.ic_star_border_white_24dp) {
-            presenter.toFavorites(chatRoomId!!)
-        }
-        adapter.addOption(getString(R.string.title_pinned_messages), R.drawable.ic_action_message_pin_24dp) {
-            presenter.toPinned(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!!)
+            }
         }
     }
 
@@ -169,7 +171,7 @@ class ChatDetailsFragment: Fragment(), ChatDetailsView {
     private fun setupOptions() {
         ui {
             if (options.adapter == null) {
-                adapter = ChatDetailsAdapter(context!!)
+                adapter = ChatDetailsAdapter()
                 options.adapter = adapter
 
                 with(options) {
@@ -185,7 +187,7 @@ class ChatDetailsFragment: Fragment(), ChatDetailsView {
                     isNestedScrollingEnabled = false
                 }
             }
-            addOptions(adapter!!)
+            addOptions(adapter)
         }
     }
 
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/viewmodel/ChatDetailsViewModel.kt b/app/src/main/java/chat/rocket/android/chatdetails/viewmodel/ChatDetailsViewModel.kt
index 117525aab1..8fbcaad518 100644
--- a/app/src/main/java/chat/rocket/android/chatdetails/viewmodel/ChatDetailsViewModel.kt
+++ b/app/src/main/java/chat/rocket/android/chatdetails/viewmodel/ChatDetailsViewModel.kt
@@ -8,6 +8,7 @@ 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
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/viewmodel/ChatDetailsViewModelFactory.kt b/app/src/main/java/chat/rocket/android/chatdetails/viewmodel/ChatDetailsViewModelFactory.kt
index d6e4cc7490..ff389b9f65 100644
--- a/app/src/main/java/chat/rocket/android/chatdetails/viewmodel/ChatDetailsViewModelFactory.kt
+++ b/app/src/main/java/chat/rocket/android/chatdetails/viewmodel/ChatDetailsViewModelFactory.kt
@@ -6,6 +6,7 @@ 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

From aa2d49fb927a8a46e347526cf7f91485a9c15caa Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Wed, 28 Nov 2018 13:30:09 -0800
Subject: [PATCH 051/149] Fix icon for take a photo.

---
 app/src/main/res/drawable/ic_camera.xml       | 19 +++++++++++++++++++
 .../res/layout/message_attachment_options.xml |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable/ic_camera.xml

diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
new file mode 100644
index 0000000000..a37ceaf6ce
--- /dev/null
+++ b/app/src/main/res/drawable/ic_camera.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="18dp"
+    android:viewportWidth="20"
+    android:viewportHeight="18">
+
+    <path
+        android:fillColor="#1D74F5"
+        android:fillType="nonZero"
+        android:pathData="M10,10m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#1D74F5"
+        android:fillType="nonZero"
+        android:pathData="M7,0L5.17,2L2,2C0.9,2 0,2.9 0,4L0,16C0,17.1 0.9,18 2,18L18,18C19.1,18 20,17.1 20,16L20,4C20,2.9 19.1,2 18,2L14.83,2L13,0L7,0ZM10,15C7.24,15 5,12.76 5,10C5,7.24 7.24,5 10,5C12.76,5 15,7.24 15,10C15,12.76 12.76,15 10,15Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/message_attachment_options.xml b/app/src/main/res/layout/message_attachment_options.xml
index ca24806afa..de6f00471e 100644
--- a/app/src/main/res/layout/message_attachment_options.xml
+++ b/app/src/main/res/layout/message_attachment_options.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:drawablePadding="20dp"
-        android:drawableStart="@drawable/ic_photo_camera_black_24dp"
+        android:drawableStart="@drawable/ic_camera"
         android:gravity="start|center"
         android:text="@string/action_take_a_photo" />
 

From 19cc755a6069c59a709cfd1cadc3da79f29a5369 Mon Sep 17 00:00:00 2001
From: Lucio Maciel <luciofm@gmail.com>
Date: Thu, 29 Nov 2018 08:46:23 -0300
Subject: [PATCH 052/149] Use clean insert, so we don't keep old rooms locally

---
 app/src/main/java/chat/rocket/android/db/DatabaseManager.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt b/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
index 2b6dca2c39..e4026b40e4 100644
--- a/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
+++ b/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
@@ -170,7 +170,7 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
     fun processRooms(rooms: List<ChatRoom>) {
         launch(dbManagerContext) {
             val entities = rooms.map { mapChatRoom(it) }
-            sendOperation(Operation.InsertRooms(entities))
+            sendOperation(Operation.CleanInsertRooms(entities))
         }
     }
 

From 1b94d61e9cd10819b4eef61fcbe65fd65a948741 Mon Sep 17 00:00:00 2001
From: Lucio Maciel <luciofm@gmail.com>
Date: Thu, 29 Nov 2018 09:26:25 -0300
Subject: [PATCH 053/149] Show audio/video filename

---
 .../rocket/android/chatroom/adapter/AttachmentViewHolder.kt    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/chat/rocket/android/chatroom/adapter/AttachmentViewHolder.kt b/app/src/main/java/chat/rocket/android/chatroom/adapter/AttachmentViewHolder.kt
index e2476c45b9..2c5ed9fdb8 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/adapter/AttachmentViewHolder.kt
+++ b/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

From 1a5ae7d9322efd5fcf1e834e3d2a07487c0c28a9 Mon Sep 17 00:00:00 2001
From: Lucio Maciel <luciofm@gmail.com>
Date: Thu, 29 Nov 2018 09:26:38 -0300
Subject: [PATCH 054/149] Fix username overflowing over other information

---
 app/src/main/res/layout/item_message.xml | 112 +++++++++++------------
 1 file changed, 53 insertions(+), 59 deletions(-)

diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index c28415b322..848319cd60 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -52,7 +52,7 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/text_sender" />
+        app:layout_constraintTop_toTopOf="@+id/message_header" />
 
     <LinearLayout
         android:id="@+id/new_messages_notif"
@@ -88,68 +88,62 @@
             android:background="@color/colorRed" />
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/text_sender"
-        style="@style/Sender.Name.TextView"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:id="@+id/message_header"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:orientation="horizontal"
         android:layout_marginStart="16dp"
-        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintLeft_toRightOf="@+id/layout_avatar"
         app:layout_constraintStart_toEndOf="@+id/layout_avatar"
-        app:layout_constraintTop_toBottomOf="@+id/day_marker_layout"
-        tools:text="Ronald Perkins" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/day_marker_layout">
+        <TextView
+            android:id="@+id/text_sender"
+            style="@style/Sender.Name.TextView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginEnd="8dp"
+            tools:text="User Name with long name" />
 
-    <TextView
-        android:id="@+id/text_message_time"
-        style="@style/Timestamp.TextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        app:layout_constraintBaseline_toBaselineOf="@+id/text_sender"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/text_sender"
-        tools:text="11:45 PM" />
+        <TextView
+            android:id="@+id/text_message_time"
+            style="@style/Timestamp.TextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            tools:text="11:45 PM" />
 
-    <TextView
-        android:id="@+id/text_edit_indicator"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:text="@string/msg_edited"
-        android:textStyle="italic"
-        android:visibility="gone"
-        app:layout_constraintBaseline_toBaselineOf="@+id/text_sender"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/text_message_time"
-        tools:visibility="visible" />
-
-    <ImageView
-        android:id="@+id/image_star_indicator"
-        android:layout_width="14dp"
-        android:layout_height="14dp"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="4dp"
-        android:layout_marginTop="2dp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/text_sender"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/text_edit_indicator"
-        app:layout_constraintTop_toTopOf="@+id/text_sender"
-        app:srcCompat="@drawable/ic_action_message_star_24dp"
-        tools:visibility="visible" />
-
-    <ImageView
-        android:id="@+id/read_receipt_view"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/text_sender"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/image_star_indicator"
-        app:layout_constraintTop_toTopOf="@+id/text_sender"
-        app:srcCompat="@drawable/ic_check_unread_24dp"
-        tools:visibility="visible" />
+        <TextView
+            android:id="@+id/text_edit_indicator"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:text="@string/msg_edited"
+            android:textStyle="italic"
+            android:visibility="gone"
+            tools:visibility="visible" />
+
+        <ImageView
+            android:id="@+id/image_star_indicator"
+            android:layout_width="14dp"
+            android:layout_height="14dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="4dp"
+            android:layout_marginTop="2dp"
+            android:visibility="gone"
+            app:srcCompat="@drawable/ic_action_message_star_24dp"
+            tools:visibility="visible" />
+
+        <ImageView
+            android:id="@+id/read_receipt_view"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:visibility="gone"
+            app:srcCompat="@drawable/ic_check_unread_24dp"
+            tools:visibility="visible" />
+    </LinearLayout>
 
     <TextView
         android:id="@+id/text_content"
@@ -160,8 +154,8 @@
         android:layout_marginEnd="4dp"
         android:layout_marginBottom="2dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/text_sender"
-        app:layout_constraintTop_toBottomOf="@+id/text_sender"
+        app:layout_constraintStart_toStartOf="@+id/message_header"
+        app:layout_constraintTop_toBottomOf="@+id/message_header"
         tools:text="This is a multiline chat message from Bertie that will take more than just one line of text. I have sure that everything is amazing!" />
 
     <include

From dde9698ed18dc012536f12b059c6817ca82d26ac Mon Sep 17 00:00:00 2001
From: Lucio Maciel <luciofm@gmail.com>
Date: Thu, 29 Nov 2018 12:29:45 -0300
Subject: [PATCH 055/149] Don't log to console on Production builds

---
 .../java/chat/rocket/android/helper/CrashlyticsTree.kt    | 8 ++------
 .../java/chat/rocket/android/helper/CrashlyticsTree.kt    | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/src/foss/java/chat/rocket/android/helper/CrashlyticsTree.kt b/app/src/foss/java/chat/rocket/android/helper/CrashlyticsTree.kt
index a7d2a2c9a9..d79b935311 100644
--- a/app/src/foss/java/chat/rocket/android/helper/CrashlyticsTree.kt
+++ b/app/src/foss/java/chat/rocket/android/helper/CrashlyticsTree.kt
@@ -1,15 +1,11 @@
 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()
     }
 }
diff --git a/app/src/play/java/chat/rocket/android/helper/CrashlyticsTree.kt b/app/src/play/java/chat/rocket/android/helper/CrashlyticsTree.kt
index 14b40a5ad1..9314fbcd14 100644
--- a/app/src/play/java/chat/rocket/android/helper/CrashlyticsTree.kt
+++ b/app/src/play/java/chat/rocket/android/helper/CrashlyticsTree.kt
@@ -6,7 +6,7 @@ import timber.log.Timber
 class CrashlyticsTree : Timber.Tree() {
 
     override fun log(priority: Int, tag: String?, message: String, throwable: Throwable?) {
-        Crashlytics.log(priority, tag, message)
+        Crashlytics.log(message)
 
         if (throwable != null) {
             Crashlytics.logException(throwable)

From 9f5ebabfa2db1fc11e50d48fad850725bae935e9 Mon Sep 17 00:00:00 2001
From: Rafael Kellermann Streit <rafaelks@me.com>
Date: Fri, 30 Nov 2018 07:46:09 -0200
Subject: [PATCH 056/149] Add space before textview

---
 app/src/main/res/layout/item_message.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index 848319cd60..0498fc7104 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -98,6 +98,7 @@
         app:layout_constraintStart_toEndOf="@+id/layout_avatar"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/day_marker_layout">
+
         <TextView
             android:id="@+id/text_sender"
             style="@style/Sender.Name.TextView"

From e51c8da792c37e70915e875a70fbf7a0815703ab Mon Sep 17 00:00:00 2001
From: Rafael Kellermann Streit <rafaelks@me.com>
Date: Fri, 30 Nov 2018 17:41:04 -0200
Subject: [PATCH 057/149] Update build.gradle

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 090c3dc927..5b18932936 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 2050
-        versionName "3.1.1"
+        versionCode 2051
+        versionName "3.2.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 

From 24ff98f43c715a9efa570cdef33ad7da9881035c Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Fri, 30 Nov 2018 20:38:59 -0800
Subject: [PATCH 058/149] Redsign chat list

---
 .../chatrooms/adapter/RoomUiModelMapper.kt    | 100 ++++-----
 .../chatrooms/adapter/RoomViewHolder.kt       |  54 +++--
 .../android/chatrooms/adapter/RoomsAdapter.kt |   9 +-
 .../android/chatrooms/ui/ChatRoomsAdapter.kt  | 192 ------------------
 .../ui/SimpleSectionedRecyclerViewAdapter.kt  | 142 -------------
 .../res/drawable/ic_hashtag_unread_12dp.xml   |  22 --
 .../drawable/style_total_unread_messages.xml  |   3 +-
 app/src/main/res/layout/item_chat.xml         |  67 +++---
 .../main/res/layout/unread_messages_badge.xml |  11 +-
 app/src/main/res/values/colors.xml            |   2 +
 app/src/main/res/values/styles.xml            |  39 +++-
 11 files changed, 145 insertions(+), 496 deletions(-)
 delete mode 100644 app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsAdapter.kt
 delete mode 100644 app/src/main/java/chat/rocket/android/chatrooms/ui/SimpleSectionedRecyclerViewAdapter.kt
 delete mode 100644 app/src/main/res/drawable/ic_hashtag_unread_12dp.xml

diff --git a/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt b/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt
index 686db9920d..4d2dbb4160 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt
@@ -2,9 +2,6 @@ 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
@@ -32,18 +29,13 @@ class RoomUiModelMapper(
     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,41 +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 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,
@@ -158,47 +165,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)
@@ -206,12 +203,5 @@ 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 mapDate(date: Long?): CharSequence? = date?.localDateTime()?.date(context)
 }
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt b/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt
index 069f84f6b1..2275201b33 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt
+++ b/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
@@ -32,52 +30,50 @@ class RoomViewHolder(itemView: View, private val listener: (RoomUiModel) -> Unit
             text_chat_name.text = room.name
 
             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_last_message_date_time.isVisible = true
             } else {
-                text_last_message_date_time.isGone = true
+                text_last_message_date_time.isInvisible = true
             }
 
             if (room.unread != null) {
-                text_total_unread_messages.isVisible = true
                 text_total_unread_messages.text = room.unread
+                text_total_unread_messages.isVisible = true
             } else {
-                text_total_unread_messages.isGone = true
+                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))
+                image_chat_icon.setImageDrawable(getRoomDrawable(room.type))
             }
 
-            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
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomsAdapter.kt b/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomsAdapter.kt
index 9201dad3c7..5b23f4d43e 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomsAdapter.kt
+++ b/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
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsAdapter.kt b/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsAdapter.kt
deleted file mode 100644
index 87151c2ac3..0000000000
--- a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsAdapter.kt
+++ /dev/null
@@ -1,192 +0,0 @@
-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
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/ui/SimpleSectionedRecyclerViewAdapter.kt b/app/src/main/java/chat/rocket/android/chatrooms/ui/SimpleSectionedRecyclerViewAdapter.kt
deleted file mode 100644
index 4ef0659923..0000000000
--- a/app/src/main/java/chat/rocket/android/chatrooms/ui/SimpleSectionedRecyclerViewAdapter.kt
+++ /dev/null
@@ -1,142 +0,0 @@
-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
-    }
-}
diff --git a/app/src/main/res/drawable/ic_hashtag_unread_12dp.xml b/app/src/main/res/drawable/ic_hashtag_unread_12dp.xml
deleted file mode 100644
index 48546262c0..0000000000
--- a/app/src/main/res/drawable/ic_hashtag_unread_12dp.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="12dp"
-    android:height="12dp"
-    android:viewportHeight="12"
-    android:viewportWidth="12">
-    <path
-        android:fillColor="#DE000000"
-        android:fillType="evenOdd"
-        android:pathData="M2.4,0h1.2v12h-1.2z" />
-    <path
-        android:fillColor="#DE000000"
-        android:fillType="evenOdd"
-        android:pathData="M0,2.4h12v1.2h-12z" />
-    <path
-        android:fillColor="#DE000000"
-        android:fillType="evenOdd"
-        android:pathData="M0,8.4h12v1.2h-12z" />
-    <path
-        android:fillColor="#DE000000"
-        android:fillType="evenOdd"
-        android:pathData="M8.4,0h1.2v12h-1.2z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/style_total_unread_messages.xml b/app/src/main/res/drawable/style_total_unread_messages.xml
index 75866e53ba..c1d197d9b3 100644
--- a/app/src/main/res/drawable/style_total_unread_messages.xml
+++ b/app/src/main/res/drawable/style_total_unread_messages.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
+    android:shape="rectangle">
 
     <solid android:color="@color/colorAccent" />
+    <corners android:radius="4dp" />
 </shape>
diff --git a/app/src/main/res/layout/item_chat.xml b/app/src/main/res/layout/item_chat.xml
index e07d655725..03ce09efaa 100644
--- a/app/src/main/res/layout/item_chat.xml
+++ b/app/src/main/res/layout/item_chat.xml
@@ -5,19 +5,19 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:attr/selectableItemBackground"
-    android:paddingBottom="@dimen/chat_item_top_and_bottom_padding"
-    android:paddingEnd="@dimen/screen_edge_left_and_right_padding"
     android:paddingStart="@dimen/screen_edge_left_and_right_padding"
-    android:paddingTop="@dimen/chat_item_top_and_bottom_padding">
+    android:paddingTop="@dimen/chat_item_top_and_bottom_padding"
+    android:paddingEnd="@dimen/screen_edge_left_and_right_padding"
+    android:paddingBottom="@dimen/chat_item_top_and_bottom_padding">
 
     <com.facebook.drawee.view.SimpleDraweeView
         android:id="@+id/image_avatar"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
         android:layout_marginTop="5dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:roundedCornerRadius="3dp" />
+        app:roundedCornerRadius="4dp" />
 
     <ImageView
         android:id="@+id/image_chat_icon"
@@ -27,25 +27,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/text_chat_name"
         app:layout_constraintStart_toEndOf="@+id/image_avatar"
         app:layout_constraintTop_toTopOf="@+id/text_chat_name"
-        tools:src="@drawable/ic_hashtag_unread_12dp" />
-
-    <TextView
-        android:id="@+id/text_last_message"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:layout_marginTop="2dp"
-        android:layout_weight="0.8"
-        android:ellipsize="end"
-        android:maxLines="2"
-        android:textDirection="locale"
-        android:visibility="visible"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/image_chat_icon"
-        app:layout_constraintTop_toBottomOf="@+id/text_chat_name"
-        tools:text="Filipe de Lima Brito: Type something that is very big and need at least to lines, or maybe even more" />
-
+        tools:src="@drawable/ic_hashtag_12dp" />
 
     <TextView
         android:id="@+id/text_chat_name"
@@ -53,39 +35,42 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/text_view_drawable_padding"
-        android:ellipsize="end"
-        android:lines="1"
-        android:maxLines="1"
         android:textDirection="locale"
-        android:textColor="@color/colorSecondaryText"
-        app:layout_constraintBottom_toTopOf="@+id/text_last_message"
         app:layout_constraintEnd_toStartOf="@+id/text_last_message_date_time"
         app:layout_constraintStart_toEndOf="@+id/image_chat_icon"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="general" />
+        tools:text="Margaret Hanson" />
 
     <TextView
         android:id="@+id/text_last_message_date_time"
         style="@style/Timestamp.TextView"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
-        android:gravity="center"
-        android:layout_marginEnd="8dp"
-        app:layout_constraintBottom_toBottomOf="@+id/layout_unread_messages_badge"
+        android:textDirection="locale"
+        app:layout_constraintBaseline_toBaselineOf="@+id/text_chat_name"
+        app:layout_constraintEnd_toEndOf="parent"
+        tools:text="11:45 AM" />
+
+    <TextView
+        android:id="@+id/text_last_message"
+        style="@style/ChatRoom.LastMessage.TextView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
-        android:ellipsize="end"
-        android:maxLines="2"
+        android:layout_marginEnd="12dp"
         android:textDirection="locale"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/layout_unread_messages_badge"
-        app:layout_constraintTop_toTopOf="@+id/text_chat_name"
-        tools:text="11:45 AM" />
+        app:layout_constraintStart_toStartOf="@+id/image_chat_icon"
+        app:layout_constraintTop_toBottomOf="@+id/text_chat_name"
+        tools:text="Filipe de Lima Brito: Type something that is very big and need at least to lines, or maybe even more" />
 
     <include
         android:id="@+id/layout_unread_messages_badge"
         layout="@layout/unread_messages_badge"
-        android:layout_width="18dp"
-        android:layout_height="18dp"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/text_chat_name" />
+        app:layout_constraintTop_toTopOf="@+id/text_last_message" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/unread_messages_badge.xml b/app/src/main/res/layout/unread_messages_badge.xml
index a5c7e2dbce..869e7000f1 100644
--- a/app/src/main/res/layout/unread_messages_badge.xml
+++ b/app/src/main/res/layout/unread_messages_badge.xml
@@ -6,15 +6,12 @@
 
     <TextView
         android:id="@+id/text_total_unread_messages"
-        style="@style/TextAppearance.AppCompat.Caption"
-        android:layout_width="18dp"
-        android:layout_height="18dp"
+        style="@style/Badge.TextView"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
         android:background="@drawable/style_total_unread_messages"
-        android:gravity="center"
-        android:textColor="@color/colorWhite"
-        android:textSize="10sp"
         android:visibility="gone"
-        tools:text="99+"
+        tools:text="1"
         tools:visibility="visible" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5cd939eca2..b1e1bf58fa 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,6 +10,8 @@
     <color name="colorPrimaryText">#DE000000</color>
     <color name="colorSecondaryText">#FF787878</color>
     <color name="colorSecondaryTextLight">#FFC1C1C1</color>
+    <color name="colorTimestampText">#FF5699FF</color>
+    <color name="colorLastMessageText">#99000000</color>
 
     <!-- User status colors -->
     <color name="colorUserStatusOnline">#2FE1A8</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6c0b3a2d11..73d34b2f7d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -137,9 +137,25 @@
     </style>
 
     <style name="ChatRoom.Name.TextView" parent="TextAppearance.AppCompat.Title">
+        <item name="android:textSize">16sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">@color/colorPrimary</item>
+        <item name="android:letterSpacing">0.01</item>
+        <item name="android:lineSpacingExtra">8sp</item>
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">1</item>
-        <item name="android:textSize">16sp</item>
+    </style>
+
+    <style name="ChatRoom.LastMessage.TextView" parent="TextAppearance.AppCompat.Title">
+        <item name="android:textSize">14sp</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textColor">@color/colorLastMessageText</item>
+        <item name="android:letterSpacing">0.02</item>
+        <item name="android:lineSpacingExtra">6sp</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:maxLines">2</item>
     </style>
 
     <style name="Sender.Name.TextView" parent="TextAppearance.AppCompat.Title">
@@ -163,8 +179,25 @@
         <item name="android:textColor">@color/colorPrimaryText</item>
     </style>
 
-    <style name="Timestamp.TextView" parent="TextAppearance.AppCompat.Caption">
-        <item name="android:textSize">10sp</item>
+    <style name="Timestamp.TextView" parent="TextAppearance.AppCompat.Title">
+        <item name="android:textSize">12sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textColor">@color/colorTimestampText</item>
+        <item name="android:letterSpacing">0.03</item>
+        <item name="android:lineSpacingExtra">4sp</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:maxLines">1</item>
+    </style>
+
+    <style name="Badge.TextView" parent="TextAppearance.AppCompat.Title">
+        <item name="android:textSize">14sp</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textColor">@color/colorWhite</item>
+        <item name="android:letterSpacing">0.04</item>
+        <item name="android:lineSpacingExtra">2sp</item>
+        <item name="android:gravity">center</item>
     </style>
 
     // REMARK: To be removed.

From 838a73e2b0c77c95426f40d6b3a1fc234a1004c9 Mon Sep 17 00:00:00 2001
From: Pitstopper <18574776+Pitstopper@users.noreply.github.com>
Date: Sat, 1 Dec 2018 10:15:49 +0300
Subject: [PATCH 059/149] Update strings.xml

---
 app/src/main/res/values-ru-rRU/strings.xml | 34 +++++++++++-----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index ba251ca513..f04b54b349 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -22,8 +22,8 @@
     <string name="title_update_profile">Обновить профиль</string>
     <string name="title_about">О программе</string>
     <string name="title_create_channel">Создать новый канал</string>
-    <string name="title_licence">Licence</string> <!-- TODO Add translation -->
-    <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
+    <string name="title_licence">Лицензия</string>
+    <string name="title_are_you_sure">Вы уверены?</string>
 
     <!-- Actions -->
     <string name="action_connect">Подключиться</string>
@@ -36,7 +36,7 @@
     <string name="action_create_channel">Создать канал</string>
     <string name="action_create">Создать</string>
     <string name="action_logout">Выйти</string>
-    <string name="action_attach_a_files">Attach a file</string> <!-- TODO Add translation -->
+    <string name="action_attach_a_files">Прикрепить файл</string>
     <string name="action_confirm_password">Подтверждение изменения пароля</string>
     <string name="action_join_chat">Присоединиться к чату</string>
     <string name="action_add_account">Добавить аккаунт</string>
@@ -54,17 +54,17 @@
     <string name="action_create_server">Создать новый сервер</string>
     <string name="action_register">Зарегистрировать</string>
     <string name="action_confirm">Подтвердить</string>
-    <string name="action_delete_account">Delete account</string> <!-- TODO Add translation -->
+    <string name="action_delete_account">Удалить аккаунт</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
-        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
-        <item name="item_password">Change password</item> <!-- TODO Add translation -->
-        <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
-        <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
-        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
-        <item name="item_licence">Licence</item> <!-- TODO Add translation -->
-        <item name="item_about">About</item> <!-- TODO Add translation -->
+        <item name="item_preferences">Персональные</item>
+        <item name="item_password">Изменить пароль</item>
+        <item name="item_share_app">Поделиться приложением</item>
+        <item name="item_rate_us">Оцените нас</item>
+        <item name="item_contact_us">Связаться с нами</item>
+        <item name="item_licence">Лицензия</item>
+        <item name="item_about">О программе</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -159,13 +159,13 @@
     <string name="msg_view_more">больше</string>
     <string name="msg_view_less">меньше</string>
     <string name="msg_permalink_copied">Ссылка скопирована</string>
-    <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
-    <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
-    <string name="msg_muted_on_this_channel">You are muted on this channel</string> <!-- TODO - Add proper translation -->
+    <string name="msg_send_email">Отправить e-mail</string>
+    <string name="msg_android_app_support">Поддержка Android-приложения</string>
+    <string name="msg_muted_on_this_channel">Вы лишены дара речи на этом канале</string>
     <plurals name="msg_reacted_with_">
-        <item quantity="one">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
-        <item quantity="few">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
-        <item quantity="many">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
+        <item quantity="one">%1$s реагирует с %2$s</item>
+        <item quantity="few">%1$s реагируют с %2$s</item>
+        <item quantity="many">%1$s реагируют с %2$s</item>
     </plurals>
 
     <!-- Create channel messages -->

From 5bbf96e85d6d27ef1093b5659072162508ff6c18 Mon Sep 17 00:00:00 2001
From: Lucio Maciel <luciofm@gmail.com>
Date: Sun, 2 Dec 2018 19:16:29 -0300
Subject: [PATCH 060/149] Fix crash on reaction long press

---
 .../rocket/android/chatroom/ui/ChatRoomFragment.kt |  7 +++++--
 app/src/main/res/layout/emoji_image_row_item.xml   | 14 --------------
 app/src/main/res/layout/emoji_row_item.xml         | 12 ------------
 3 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 app/src/main/res/layout/emoji_image_row_item.xml
 delete mode 100644 app/src/main/res/layout/emoji_row_item.xml

diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index 13f59ef20c..dbf9f780f8 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -87,7 +87,9 @@ import io.reactivex.Observable
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
 import kotlinx.android.synthetic.main.emoji_image_row_item.*
+import kotlinx.android.synthetic.main.emoji_image_row_item.view.*
 import kotlinx.android.synthetic.main.emoji_row_item.*
+import kotlinx.android.synthetic.main.emoji_row_item.view.*
 import kotlinx.android.synthetic.main.fragment_chat_room.*
 import kotlinx.android.synthetic.main.message_attachment_options.*
 import kotlinx.android.synthetic.main.message_composer.*
@@ -96,6 +98,7 @@ import timber.log.Timber
 import java.io.File
 import java.io.IOException
 import kotlinx.android.synthetic.main.reaction_praises_list_item.*
+import kotlinx.android.synthetic.main.reaction_praises_list_item.view.*
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicInteger
 import javax.inject.Inject
@@ -704,9 +707,9 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
                     GlideApp.with(requireContext()).asBitmap()
                 }
 
-                glideRequest.load(url).into(emoji_image_view)
+                glideRequest.load(url).into(view_flipper.emoji_image_view)
             } else {
-                emoji_view.text = EmojiParser.parse(requireContext(), shortname)
+                view_flipper.emoji_view.text = EmojiParser.parse(requireContext(), shortname)
             }
 
             var listing = ""
diff --git a/app/src/main/res/layout/emoji_image_row_item.xml b/app/src/main/res/layout/emoji_image_row_item.xml
deleted file mode 100644
index 5aca146ac1..0000000000
--- a/app/src/main/res/layout/emoji_image_row_item.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="48dp"
-    android:layout_height="48dp"
-    android:layout_gravity="center">
-
-    <ImageView
-        android:id="@+id/emoji_image_view"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_gravity="center"
-        tools:src="@tools:sample/avatars" />
-</FrameLayout>
diff --git a/app/src/main/res/layout/emoji_row_item.xml b/app/src/main/res/layout/emoji_row_item.xml
deleted file mode 100644
index 83bd68fb0d..0000000000
--- a/app/src/main/res/layout/emoji_row_item.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/emoji_view"
-    android:layout_width="48dp"
-    android:layout_height="48dp"
-    android:foreground="?selectableItemBackground"
-    android:layout_gravity="center"
-    android:gravity="center"
-    android:textColor="#000000"
-    android:textSize="24sp"
-    tools:text="😀" />

From 43691b65f26755d62e0b155e5235a765cbcb08c3 Mon Sep 17 00:00:00 2001
From: Lucio Maciel <luciofm@gmail.com>
Date: Mon, 3 Dec 2018 14:08:07 -0300
Subject: [PATCH 061/149] Move layouts to main module

---
 app/src/main/res/layout/emoji_image_row_item.xml | 14 ++++++++++++++
 app/src/main/res/layout/emoji_row_item.xml       | 12 ++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 app/src/main/res/layout/emoji_image_row_item.xml
 create mode 100644 app/src/main/res/layout/emoji_row_item.xml

diff --git a/app/src/main/res/layout/emoji_image_row_item.xml b/app/src/main/res/layout/emoji_image_row_item.xml
new file mode 100644
index 0000000000..5aca146ac1
--- /dev/null
+++ b/app/src/main/res/layout/emoji_image_row_item.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="48dp"
+    android:layout_height="48dp"
+    android:layout_gravity="center">
+
+    <ImageView
+        android:id="@+id/emoji_image_view"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_gravity="center"
+        tools:src="@tools:sample/avatars" />
+</FrameLayout>
diff --git a/app/src/main/res/layout/emoji_row_item.xml b/app/src/main/res/layout/emoji_row_item.xml
new file mode 100644
index 0000000000..83bd68fb0d
--- /dev/null
+++ b/app/src/main/res/layout/emoji_row_item.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/emoji_view"
+    android:layout_width="48dp"
+    android:layout_height="48dp"
+    android:foreground="?selectableItemBackground"
+    android:layout_gravity="center"
+    android:gravity="center"
+    android:textColor="#000000"
+    android:textSize="24sp"
+    tools:text="😀" />

From 29603965a444f7ba999002ae14457272d3016604 Mon Sep 17 00:00:00 2001
From: Lucio Maciel <luciofm@gmail.com>
Date: Wed, 5 Dec 2018 15:43:03 -0300
Subject: [PATCH 062/149] Remove duplicate strings

---
 app/src/main/res/values-de/strings.xml     | 1 -
 app/src/main/res/values-ru-rRU/strings.xml | 2 --
 2 files changed, 3 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 08833a99e4..8066850f3f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -28,7 +28,6 @@
     <string name="title_announcement">Ankündigung</string>
     <string name="title_description">Beschreibung</string>
     <string name="title_licence">Licence</string> <!-- TODO Add translation -->
-    <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
 
     <!-- Actions -->
     <string name="action_connect">Verbinde</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 8406b1750b..8899d001f5 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -22,7 +22,6 @@
     <string name="title_update_profile">Обновить профиль</string>
     <string name="title_about">О программе</string>
     <string name="title_create_channel">Создать новый канал</string>
-    <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
     <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
     <string name="title_topic">Тема</string>
     <string name="title_announcement">Объявление</string>
@@ -164,7 +163,6 @@
     <string name="msg_view_more">больше</string>
     <string name="msg_view_less">меньше</string>
     <string name="msg_permalink_copied">Ссылка скопирована</string>
-    <string name="msg_muted_on_this_channel">You are muted on this channel</string> <!-- TODO - Add proper translation -->
     <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
     <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
     <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->

From 040d3bc954fc48610fd999b4b4dd44e37b95feb9 Mon Sep 17 00:00:00 2001
From: Lucio Maciel <luciofm@gmail.com>
Date: Wed, 5 Dec 2018 16:11:09 -0300
Subject: [PATCH 063/149] Fixed DB versions

---
 .../chat.rocket.android.db.RCDatabase/10.json | 24 +++----------------
 .../{12.json => 11.json}                      |  2 +-
 .../java/chat/rocket/android/db/RCDatabase.kt |  2 +-
 3 files changed, 5 insertions(+), 23 deletions(-)
 rename app/schemas/chat.rocket.android.db.RCDatabase/{12.json => 11.json} (99%)

diff --git a/app/schemas/chat.rocket.android.db.RCDatabase/10.json b/app/schemas/chat.rocket.android.db.RCDatabase/10.json
index d6d34f33e3..a17af93dbf 100644
--- a/app/schemas/chat.rocket.android.db.RCDatabase/10.json
+++ b/app/schemas/chat.rocket.android.db.RCDatabase/10.json
@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 10,
-    "identityHash": "4024406c23a09800c0c3e987c6b5d40b",
+    "identityHash": "db46c12dbb8747200288f48d5dc5558b",
     "entities": [
       {
         "tableName": "users",
@@ -59,7 +59,7 @@
       },
       {
         "tableName": "chatrooms",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `topic` TEXT, `announcement` TEXT, `description` TEXT, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, `broadcast` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, `broadcast` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
         "fields": [
           {
             "fieldPath": "id",
@@ -121,24 +121,6 @@
             "affinity": "INTEGER",
             "notNull": false
           },
-          {
-            "fieldPath": "topic",
-            "columnName": "topic",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "announcement",
-            "columnName": "announcement",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": false
-          },
           {
             "fieldPath": "open",
             "columnName": "open",
@@ -1093,7 +1075,7 @@
     ],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"4024406c23a09800c0c3e987c6b5d40b\")"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"db46c12dbb8747200288f48d5dc5558b\")"
     ]
   }
 }
\ No newline at end of file
diff --git a/app/schemas/chat.rocket.android.db.RCDatabase/12.json b/app/schemas/chat.rocket.android.db.RCDatabase/11.json
similarity index 99%
rename from app/schemas/chat.rocket.android.db.RCDatabase/12.json
rename to app/schemas/chat.rocket.android.db.RCDatabase/11.json
index 6a44649139..1c2b7c60a1 100644
--- a/app/schemas/chat.rocket.android.db.RCDatabase/12.json
+++ b/app/schemas/chat.rocket.android.db.RCDatabase/11.json
@@ -1,7 +1,7 @@
 {
   "formatVersion": 1,
   "database": {
-    "version": 12,
+    "version": 11,
     "identityHash": "fb9f1c815809b0217d326452aeb34e92",
     "entities": [
       {
diff --git a/app/src/main/java/chat/rocket/android/db/RCDatabase.kt b/app/src/main/java/chat/rocket/android/db/RCDatabase.kt
index 55fa447c0e..c2c31492c4 100644
--- a/app/src/main/java/chat/rocket/android/db/RCDatabase.kt
+++ b/app/src/main/java/chat/rocket/android/db/RCDatabase.kt
@@ -25,7 +25,7 @@ import chat.rocket.android.emoji.internal.db.StringListConverter
         AttachmentFieldEntity::class, AttachmentActionEntity::class, UrlEntity::class,
         ReactionEntity::class, MessagesSync::class
     ],
-    version = 12,
+    version = 11,
     exportSchema = true
 )
 @TypeConverters(StringListConverter::class)

From b354573109d34b8186267934f8b6d297b60e6e95 Mon Sep 17 00:00:00 2001
From: Leonardo Aramaki <leoaramaki@gmail.com>
Date: Thu, 6 Dec 2018 11:07:20 -0200
Subject: [PATCH 064/149] Temporarily remove buggy draft saving feature and
 duplicated setup of the composer buttons

---
 .../rocket/android/chatroom/ui/ChatRoomFragment.kt  | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index c28037bffd..c9107631d6 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -68,17 +68,18 @@ import chat.rocket.android.helper.ImageHelper
 import chat.rocket.android.helper.KeyboardHelper
 import chat.rocket.android.helper.MessageParser
 import chat.rocket.android.util.extension.asObservable
+import chat.rocket.android.util.extension.createImageFile
 import chat.rocket.android.util.extensions.circularRevealOrUnreveal
+import chat.rocket.android.util.extensions.content
 import chat.rocket.android.util.extensions.fadeIn
 import chat.rocket.android.util.extensions.fadeOut
+import chat.rocket.android.util.extensions.getBitmpap
 import chat.rocket.android.util.extensions.hideKeyboard
 import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.rotateBy
 import chat.rocket.android.util.extensions.showToast
 import chat.rocket.android.util.extensions.textContent
 import chat.rocket.android.util.extensions.ui
-import chat.rocket.android.util.extension.createImageFile
-import chat.rocket.android.util.extensions.getBitmpap
 import chat.rocket.common.model.RoomType
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.core.internal.realtime.socket.model.State
@@ -86,19 +87,16 @@ import dagger.android.support.AndroidSupportInjection
 import io.reactivex.Observable
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
-import kotlinx.android.synthetic.main.emoji_image_row_item.*
 import kotlinx.android.synthetic.main.emoji_image_row_item.view.*
-import kotlinx.android.synthetic.main.emoji_row_item.*
 import kotlinx.android.synthetic.main.emoji_row_item.view.*
 import kotlinx.android.synthetic.main.fragment_chat_room.*
 import kotlinx.android.synthetic.main.message_attachment_options.*
 import kotlinx.android.synthetic.main.message_composer.*
 import kotlinx.android.synthetic.main.message_list.*
+import kotlinx.android.synthetic.main.reaction_praises_list_item.view.*
 import timber.log.Timber
 import java.io.File
 import java.io.IOException
-import kotlinx.android.synthetic.main.reaction_praises_list_item.*
-import kotlinx.android.synthetic.main.reaction_praises_list_item.view.*
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicInteger
 import javax.inject.Inject
@@ -842,9 +840,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         } else {
             input_container.isVisible = true
             text_room_is_read_only.isVisible = false
-            button_send.isVisible = false
             button_show_attachment_options.alpha = 1f
-            button_show_attachment_options.isVisible = true
 
             activity?.supportFragmentManager?.registerFragmentLifecycleCallbacks(
                 object : FragmentManager.FragmentLifecycleCallbacks() {
@@ -862,7 +858,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             )
 
             subscribeComposeTextMessage()
-            getUnfinishedMessage()
             emojiKeyboardPopup = EmojiKeyboardPopup(activity!!, activity!!.findViewById(R.id.fragment_container))
             emojiKeyboardPopup.listener = this
             text_message.listener = object : ComposerEditText.ComposerEditTextListener {

From a8dc3f8c81483fd590d5852e4e27e042778d7e31 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Thu, 6 Dec 2018 13:45:43 -0300
Subject: [PATCH 065/149] Removes some spacing for chat list view.

---
 app/src/main/res/values/styles.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 73d34b2f7d..e81bae146f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -141,8 +141,6 @@
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textStyle">bold</item>
         <item name="android:textColor">@color/colorPrimary</item>
-        <item name="android:letterSpacing">0.01</item>
-        <item name="android:lineSpacingExtra">8sp</item>
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">1</item>
     </style>
@@ -152,8 +150,6 @@
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textStyle">normal</item>
         <item name="android:textColor">@color/colorLastMessageText</item>
-        <item name="android:letterSpacing">0.02</item>
-        <item name="android:lineSpacingExtra">6sp</item>
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">2</item>
     </style>
@@ -184,8 +180,6 @@
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textStyle">normal</item>
         <item name="android:textColor">@color/colorTimestampText</item>
-        <item name="android:letterSpacing">0.03</item>
-        <item name="android:lineSpacingExtra">4sp</item>
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">1</item>
     </style>
@@ -195,8 +189,6 @@
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textStyle">normal</item>
         <item name="android:textColor">@color/colorWhite</item>
-        <item name="android:letterSpacing">0.04</item>
-        <item name="android:lineSpacingExtra">2sp</item>
         <item name="android:gravity">center</item>
     </style>
 

From d1e0e9e182d47b589eeaae85f2a458e14bf0a144 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Thu, 6 Dec 2018 13:48:59 -0300
Subject: [PATCH 066/149] Removes spacing for authentication view.

---
 app/src/main/res/values/styles.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e81bae146f..4088a077c3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -18,7 +18,6 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textSize">24sp</item>
-        <item name="android:lineSpacingExtra">4sp</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textColor">@color/colorPrimary</item>
         <item name="android:textStyle">bold</item>
@@ -29,7 +28,6 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textSize">16sp</item>
         <item name="android:fontFamily">sans-serif</item>
-        <item name="android:lineSpacingExtra">4sp</item>
         <item name="android:textColor">#FF54585E</item>
         <item name="android:textStyle">normal</item>
     </style>
@@ -39,7 +37,6 @@
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textStyle">bold</item>
         <item name="android:textColor">@color/colorAccent</item>
-        <item name="android:letterSpacing">0.04</item>
         <item name="android:maxLines">1</item>
         <item name="android:ellipsize">end</item>
     </style>
@@ -53,7 +50,6 @@
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textStyle">normal</item>
         <item name="android:textColor">@color/colorAuthenticationSecondaryText</item>
-        <item name="android:letterSpacing">0.04</item>
         <item name="android:maxLines">1</item>
         <item name="android:ellipsize">end</item>
     </style>
@@ -63,7 +59,6 @@
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textStyle">normal</item>
         <item name="android:textColorHint">@color/colorAuthenticationSecondaryText</item>
-        <item name="android:lineSpacingExtra">3sp</item>
     </style>
 
     <style name="Authentication.EditText.Border" parent="Widget.AppCompat.EditText">
@@ -87,7 +82,6 @@
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textStyle">normal</item>
         <item name="android:textColor">@color/colorWhite</item>
-        <item name="android:lineSpacingExtra">2sp</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:background">@drawable/rounded_color_accent</item>
     </style>
@@ -100,7 +94,6 @@
         <item name="android:textSize">18sp</item>
         <item name="android:textStyle">bold</item>
         <item name="android:fontFamily">sans-serif</item>
-        <item name="android:lineSpacingExtra">2sp</item>
     </style>
 
     <style name="Authentication.AVLoadingIndicatorView" parent="AVLoadingIndicatorView">

From f661b3aa03a0d6c37f31aa47cb72bbfaddac3e5c Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Thu, 6 Dec 2018 16:26:29 -0300
Subject: [PATCH 067/149] Updates chat list widgets styles.

---
 .../chatrooms/adapter/RoomViewHolder.kt       | 28 ++++--
 app/src/main/res/layout/item_chat.xml         | 10 +--
 app/src/main/res/layout/item_message.xml      |  2 +-
 .../res/layout/item_message_attachment.xml    |  2 +-
 .../layout/item_message_attachment_old.xml    |  2 +-
 .../main/res/layout/unread_messages_badge.xml |  2 +-
 app/src/main/res/values/colors.xml            |  3 +-
 app/src/main/res/values/styles.xml            | 89 ++++++++++---------
 8 files changed, 79 insertions(+), 59 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt b/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt
index 2275201b33..6286ab2805 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt
@@ -10,6 +10,7 @@ import chat.rocket.android.R
 import chat.rocket.android.chatrooms.adapter.model.RoomUiModel
 import chat.rocket.common.model.RoomType
 import chat.rocket.common.model.UserStatus
+import chat.rocket.common.util.ifNull
 import kotlinx.android.synthetic.main.item_chat.view.*
 import kotlinx.android.synthetic.main.unread_messages_badge.view.*
 
@@ -29,6 +30,12 @@ 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.text = room.lastMessage
                 text_last_message.isVisible = true
@@ -37,10 +44,10 @@ class RoomViewHolder(itemView: View, private val listener: (RoomUiModel) -> Unit
             }
 
             if (room.date != null) {
-                text_last_message_date_time.text = room.date
-                text_last_message_date_time.isVisible = true
+                text_timestamp.text = room.date
+                text_timestamp.isVisible = true
             } else {
-                text_last_message_date_time.isInvisible = true
+                text_timestamp.isInvisible = true
             }
 
             if (room.unread != null) {
@@ -50,10 +57,17 @@ class RoomViewHolder(itemView: View, private val listener: (RoomUiModel) -> Unit
                 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))
+            if (room.alert || room.unread != null) {
+                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.text = "!"
+                text_total_unread_messages.isVisible = true
             }
 
             setOnClickListener { listener(room) }
diff --git a/app/src/main/res/layout/item_chat.xml b/app/src/main/res/layout/item_chat.xml
index 03ce09efaa..febbd65fe6 100644
--- a/app/src/main/res/layout/item_chat.xml
+++ b/app/src/main/res/layout/item_chat.xml
@@ -31,19 +31,19 @@
 
     <TextView
         android:id="@+id/text_chat_name"
-        style="@style/ChatRoom.Name.TextView"
+        style="@style/ChatList.ChatName.TextView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/text_view_drawable_padding"
         android:textDirection="locale"
-        app:layout_constraintEnd_toStartOf="@+id/text_last_message_date_time"
+        app:layout_constraintEnd_toStartOf="@+id/text_timestamp"
         app:layout_constraintStart_toEndOf="@+id/image_chat_icon"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Margaret Hanson" />
 
     <TextView
-        android:id="@+id/text_last_message_date_time"
-        style="@style/Timestamp.TextView"
+        android:id="@+id/text_timestamp"
+        style="@style/ChatList.Timestamp.TextView"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:textDirection="locale"
@@ -53,7 +53,7 @@
 
     <TextView
         android:id="@+id/text_last_message"
-        style="@style/ChatRoom.LastMessage.TextView"
+        style="@style/ChatList.LastMessage.TextView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index c28415b322..7f102bc4e8 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -102,7 +102,7 @@
 
     <TextView
         android:id="@+id/text_message_time"
-        style="@style/Timestamp.TextView"
+        style="@style/ChatList.Timestamp.TextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
diff --git a/app/src/main/res/layout/item_message_attachment.xml b/app/src/main/res/layout/item_message_attachment.xml
index 6edd39479b..c60d1071d6 100644
--- a/app/src/main/res/layout/item_message_attachment.xml
+++ b/app/src/main/res/layout/item_message_attachment.xml
@@ -131,7 +131,7 @@
 
     <TextView
         android:id="@+id/text_message_time"
-        style="@style/Timestamp.TextView"
+        style="@style/ChatList.Timestamp.TextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
diff --git a/app/src/main/res/layout/item_message_attachment_old.xml b/app/src/main/res/layout/item_message_attachment_old.xml
index d3dfdeac79..33f3ea6dd6 100644
--- a/app/src/main/res/layout/item_message_attachment_old.xml
+++ b/app/src/main/res/layout/item_message_attachment_old.xml
@@ -37,7 +37,7 @@
 
     <TextView
         android:id="@+id/text_message_time"
-        style="@style/Timestamp.TextView"
+        style="@style/ChatList.Timestamp.TextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
diff --git a/app/src/main/res/layout/unread_messages_badge.xml b/app/src/main/res/layout/unread_messages_badge.xml
index 869e7000f1..83fe544115 100644
--- a/app/src/main/res/layout/unread_messages_badge.xml
+++ b/app/src/main/res/layout/unread_messages_badge.xml
@@ -6,7 +6,7 @@
 
     <TextView
         android:id="@+id/text_total_unread_messages"
-        style="@style/Badge.TextView"
+        style="@style/ChatList.Badge.TextView"
         android:layout_width="21dp"
         android:layout_height="21dp"
         android:background="@drawable/style_total_unread_messages"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b1e1bf58fa..6b357d9187 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,7 +10,8 @@
     <color name="colorPrimaryText">#DE000000</color>
     <color name="colorSecondaryText">#FF787878</color>
     <color name="colorSecondaryTextLight">#FFC1C1C1</color>
-    <color name="colorTimestampText">#FF5699FF</color>
+    <color name="colorTimestampText">#FF9DA2A9</color>
+    <color name="colorTimestampTextUnread">#FF5699FF</color>
     <color name="colorLastMessageText">#99000000</color>
 
     <!-- User status colors -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4088a077c3..3758813efe 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -96,12 +96,59 @@
         <item name="android:fontFamily">sans-serif</item>
     </style>
 
+    // REMARK: To be removed as soon as we have our loading view.
     <style name="Authentication.AVLoadingIndicatorView" parent="AVLoadingIndicatorView">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="indicatorColor">@color/colorPrimary</item>
         <item name="indicatorName">BallPulseIndicator</item>
     </style>
+    <!-- End Authentication -->
+
+    <!-- Chat list -->
+    <style name="ChatList.ChatName.TextView" parent="TextAppearance.AppCompat.Title">
+        <item name="android:textSize">16sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">@color/colorPrimary</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:maxLines">1</item>
+    </style>
+
+    <style name="ChatList.LastMessage.TextView" parent="TextAppearance.AppCompat.Title">
+        <item name="android:textSize">14sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textColor">@color/colorLastMessageText</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:maxLines">2</item>
+    </style>
+
+    <style name="ChatList.LastMessage.Unread.TextView" parent="ChatList.LastMessage.TextView">
+        <item name="android:fontFamily">sans-serif-medium</item>
+    </style>
+
+    <style name="ChatList.Timestamp.TextView" parent="TextAppearance.AppCompat.Title">
+        <item name="android:textSize">12sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textColor">@color/colorTimestampText</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:maxLines">1</item>
+    </style>
+
+    <style name="ChatList.Timestamp.Unread.TextView" parent="ChatList.Timestamp.TextView">
+        <item name="android:textColor">@color/colorTimestampTextUnread</item>
+    </style>
+
+    <style name="ChatList.Badge.TextView" parent="TextAppearance.AppCompat.Title">
+        <item name="android:textSize">14sp</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textColor">@color/colorWhite</item>
+        <item name="android:gravity">center</item>
+    </style>
+    <!-- End chat list -->
 
     <style name="EditText.Password" parent="TextAppearance.AppCompat">
         <!-- Hint color and label color in FALSE state -->
@@ -111,13 +158,6 @@
         <item name="colorControlActivated">@color/colorPrimaryDark</item>
     </style>
 
-    <style name="AuthenticationLabel" parent="TextAppearance.AppCompat.Medium">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">50dp</item>
-        <item name="android:layout_marginStart">@dimen/screen_edge_left_and_right_margins</item>
-        <item name="android:paddingStart">@dimen/edit_text_margin</item>
-    </style>
-
     <style name="ChatRoom.SearchView" parent="Widget.AppCompat.SearchView">
         <item name="queryHint">@string/title_search_message</item>
         <item name="searchIcon">@drawable/ic_search_white_24dp</item>
@@ -129,24 +169,6 @@
         <item name="android:textSize">16sp</item>
     </style>
 
-    <style name="ChatRoom.Name.TextView" parent="TextAppearance.AppCompat.Title">
-        <item name="android:textSize">16sp</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textColor">@color/colorPrimary</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:maxLines">1</item>
-    </style>
-
-    <style name="ChatRoom.LastMessage.TextView" parent="TextAppearance.AppCompat.Title">
-        <item name="android:textSize">14sp</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:textColor">@color/colorLastMessageText</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:maxLines">2</item>
-    </style>
-
     <style name="Sender.Name.TextView" parent="TextAppearance.AppCompat.Title">
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">1</item>
@@ -168,23 +190,6 @@
         <item name="android:textColor">@color/colorPrimaryText</item>
     </style>
 
-    <style name="Timestamp.TextView" parent="TextAppearance.AppCompat.Title">
-        <item name="android:textSize">12sp</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:textColor">@color/colorTimestampText</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:maxLines">1</item>
-    </style>
-
-    <style name="Badge.TextView" parent="TextAppearance.AppCompat.Title">
-        <item name="android:textSize">14sp</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:textColor">@color/colorWhite</item>
-        <item name="android:gravity">center</item>
-    </style>
-
     // REMARK: To be removed.
     <style name="Profile.EditText" parent="Authentication.EditText.Border">
         <item name="android:background">@drawable/style_edit_text_profile</item>

From da111591a28731100e3c7006e181674ab89411b9 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Thu, 6 Dec 2018 17:02:44 -0300
Subject: [PATCH 068/149] Fix merge conflicts.

---
 app/src/main/res/layout/item_message.xml | 21 ++++-----------------
 app/src/main/res/values/styles.xml       |  4 ++++
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index a23d3fa0f7..3ec1842668 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -92,38 +92,25 @@
         android:id="@+id/message_header"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
         android:layout_marginStart="16dp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintLeft_toRightOf="@+id/layout_avatar"
         app:layout_constraintStart_toEndOf="@+id/layout_avatar"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/day_marker_layout">
 
-<<<<<<< HEAD
-    <TextView
-        android:id="@+id/text_message_time"
-        style="@style/ChatList.Timestamp.TextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        app:layout_constraintBaseline_toBaselineOf="@+id/text_sender"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/text_sender"
-        tools:text="11:45 PM" />
-=======
         <TextView
             android:id="@+id/text_sender"
             style="@style/Sender.Name.TextView"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
             android:layout_marginEnd="8dp"
+            android:layout_weight="1"
             tools:text="User Name with long name" />
->>>>>>> 1d1f9ba1c422f9bea486a0b4d356753f68f10ca0
 
         <TextView
             android:id="@+id/text_message_time"
-            style="@style/Timestamp.TextView"
+            style="@style/ChatRoom.Timestamp.TextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 883228a4d8..dda40047f4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -165,6 +165,10 @@
         <item name="closeIcon">@drawable/ic_close_white_24dp</item>
     </style>
 
+    <style name="ChatRoom.Timestamp.TextView" parent="TextAppearance.AppCompat.Caption">
+        <item name="android:textSize">10sp</item>
+    </style>
+
     <style name="ChatRooms.Header" parent="TextAppearance.AppCompat.Headline">
         <item name="android:textSize">16sp</item>
     </style>

From be7e816a07d0e356df70d83701f7ca922e9a6b5e Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Thu, 6 Dec 2018 19:13:06 -0300
Subject: [PATCH 069/149] Updates material library version.

---
 .../chatrooms/adapter/RoomViewHolder.kt       | 26 ++++++++++---------
 dependencies.gradle                           |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt b/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt
index 6286ab2805..c489bbf7c2 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt
@@ -10,7 +10,6 @@ import chat.rocket.android.R
 import chat.rocket.android.chatrooms.adapter.model.RoomUiModel
 import chat.rocket.common.model.RoomType
 import chat.rocket.common.model.UserStatus
-import chat.rocket.common.util.ifNull
 import kotlinx.android.synthetic.main.item_chat.view.*
 import kotlinx.android.synthetic.main.unread_messages_badge.view.*
 
@@ -57,17 +56,20 @@ class RoomViewHolder(itemView: View, private val listener: (RoomUiModel) -> Unit
                 text_total_unread_messages.isInvisible = true
             }
 
-            if (room.alert || room.unread != null) {
-                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.text = "!"
-                text_total_unread_messages.isVisible = true
+            context?.let {
+                if (room.alert || room.unread != null) {
+                    text_timestamp.setTextAppearance(it, R.style.ChatList_Timestamp_Unread_TextView)
+                    text_last_message.setTextAppearance(
+                        it,
+                        R.style.ChatList_LastMessage_Unread_TextView
+                    )
+                    text_total_unread_messages.text = "!"
+                    text_total_unread_messages.isVisible = true
+                } else {
+                    text_timestamp.setTextAppearance(it, R.style.ChatList_Timestamp_TextView)
+                    text_last_message.setTextAppearance(it, R.style.ChatList_LastMessage_TextView)
+                    text_total_unread_messages.isInvisible = true
+                }
             }
 
             setOnClickListener { listener(room) }
diff --git a/dependencies.gradle b/dependencies.gradle
index e7ce68b712..986725301e 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -26,7 +26,7 @@ ext {
             playServices          : '16.0.0',
             exoPlayer             : '2.8.2',
             flexbox               : '1.1.0',
-            material              : '1.0.0-beta01',
+            material              : '1.0.0',
 
             room                  : '2.0.0',
             lifecycle             : '2.0.0',

From 927406ac0ec13b1effd0906d8bc3a40ea084d10c Mon Sep 17 00:00:00 2001
From: Pitstopper <18574776+Pitstopper@users.noreply.github.com>
Date: Fri, 7 Dec 2018 09:13:40 +0300
Subject: [PATCH 070/149] Update strings.xml

---
 app/src/main/res/values-ru-rRU/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 8899d001f5..14e7028bb7 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -22,7 +22,7 @@
     <string name="title_update_profile">Обновить профиль</string>
     <string name="title_about">О программе</string>
     <string name="title_create_channel">Создать новый канал</string>
-    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_channel_details">О канале</string>
     <string name="title_topic">Тема</string>
     <string name="title_announcement">Объявление</string>
     <string name="title_description">Описание</string>
@@ -163,9 +163,9 @@
     <string name="msg_view_more">больше</string>
     <string name="msg_view_less">меньше</string>
     <string name="msg_permalink_copied">Ссылка скопирована</string>
-    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
-    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
-    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
+    <string name="msg_no_topic">Нет темы</string>
+    <string name="msg_no_announcement">Нет объявления</string>
+    <string name="msg_no_description">Нет описания</string>
     <string name="msg_send_email">Отправить e-mail</string>
     <string name="msg_android_app_support">Поддержка Android-приложения</string>
     <string name="msg_muted_on_this_channel">Вы лишены дара речи на этом канале</string>

From 33f99bec037bca3ffcc95f2aa05689298264893f Mon Sep 17 00:00:00 2001
From: Leonardo Aramaki <leoaramaki@gmail.com>
Date: Fri, 23 Nov 2018 19:46:36 -0200
Subject: [PATCH 071/149] Open user details screen when tapping on username or
 avatar image when inside a chat

---
 app/src/main/AndroidManifest.xml              |  10 ++
 .../ui/AuthenticationActivity.kt              |   2 -
 .../chatroom/adapter/MessageViewHolder.kt     |  16 ++
 .../presentation/ChatRoomNavigator.kt         |   2 +-
 .../android/chatroom/ui/ChatRoomFragment.kt   |  11 +-
 .../chat/rocket/android/chatroom/ui/Menu.kt   |   6 +-
 .../android/dagger/module/ActivityBuilder.kt  |  27 ++--
 .../settings/password/ui/PasswordFragment.kt  |  10 +-
 .../userdetails/di/UserDetailsModule.kt       |  32 ++++
 .../presentation/UserDetailsPresenter.kt      | 139 +++++++++++++++++
 .../presentation/UserDetailsView.kt           |   8 +
 .../userdetails/ui/UserDetailsActivity.kt     | 116 ++++++++++++++
 app/src/main/res/drawable/ic_message_24dp.xml |  10 ++
 app/src/main/res/layout/activity_password.xml |   4 +-
 .../main/res/layout/activity_user_details.xml | 141 ++++++++++++++++++
 15 files changed, 505 insertions(+), 29 deletions(-)
 create mode 100644 app/src/main/java/chat/rocket/android/userdetails/di/UserDetailsModule.kt
 create mode 100644 app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
 create mode 100644 app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsView.kt
 create mode 100644 app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt
 create mode 100644 app/src/main/res/drawable/ic_message_24dp.xml
 create mode 100644 app/src/main/res/layout/activity_user_details.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 250fd8387a..a745cb319e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -93,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"
diff --git a/app/src/main/java/chat/rocket/android/authentication/ui/AuthenticationActivity.kt b/app/src/main/java/chat/rocket/android/authentication/ui/AuthenticationActivity.kt
index 7e23411eea..7500d442f1 100644
--- a/app/src/main/java/chat/rocket/android/authentication/ui/AuthenticationActivity.kt
+++ b/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)
diff --git a/app/src/main/java/chat/rocket/android/chatroom/adapter/MessageViewHolder.kt b/app/src/main/java/chat/rocket/android/chatroom/adapter/MessageViewHolder.kt
index fce412f052..61bfdbe9a4 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/adapter/MessageViewHolder.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/adapter/MessageViewHolder.kt
@@ -1,5 +1,6 @@
 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,23 @@ class MessageViewHolder(
                 )
                 read_receipt_view.isVisible = true
             }
+
+            val senderId = data.message.sender?.id
+            text_sender.setOnClickListener {
+                toUserDetails(context, senderId)
+            }
+
+            image_avatar.setOnClickListener {
+                toUserDetails(context, senderId)
+            }
+
         }
     }
 
+    private fun toUserDetails(context: Context, userId: String?) {
+        userId?.let { context.startActivity(context.userDetailsIntent(it)) }
+    }
+
     override fun unscheduleDrawable(who: Drawable?, what: Runnable?) {
         with(itemView) {
             text_content.removeCallbacks(what)
diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomNavigator.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomNavigator.kt
index 51e967858c..53ea424f56 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomNavigator.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomNavigator.kt
@@ -66,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
+}
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index c28037bffd..ff0ba7490d 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -68,17 +68,17 @@ import chat.rocket.android.helper.ImageHelper
 import chat.rocket.android.helper.KeyboardHelper
 import chat.rocket.android.helper.MessageParser
 import chat.rocket.android.util.extension.asObservable
+import chat.rocket.android.util.extension.createImageFile
 import chat.rocket.android.util.extensions.circularRevealOrUnreveal
 import chat.rocket.android.util.extensions.fadeIn
 import chat.rocket.android.util.extensions.fadeOut
+import chat.rocket.android.util.extensions.getBitmpap
 import chat.rocket.android.util.extensions.hideKeyboard
 import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.rotateBy
 import chat.rocket.android.util.extensions.showToast
 import chat.rocket.android.util.extensions.textContent
 import chat.rocket.android.util.extensions.ui
-import chat.rocket.android.util.extension.createImageFile
-import chat.rocket.android.util.extensions.getBitmpap
 import chat.rocket.common.model.RoomType
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.core.internal.realtime.socket.model.State
@@ -86,19 +86,16 @@ import dagger.android.support.AndroidSupportInjection
 import io.reactivex.Observable
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
-import kotlinx.android.synthetic.main.emoji_image_row_item.*
 import kotlinx.android.synthetic.main.emoji_image_row_item.view.*
-import kotlinx.android.synthetic.main.emoji_row_item.*
 import kotlinx.android.synthetic.main.emoji_row_item.view.*
 import kotlinx.android.synthetic.main.fragment_chat_room.*
 import kotlinx.android.synthetic.main.message_attachment_options.*
 import kotlinx.android.synthetic.main.message_composer.*
 import kotlinx.android.synthetic.main.message_list.*
+import kotlinx.android.synthetic.main.reaction_praises_list_item.view.*
 import timber.log.Timber
 import java.io.File
 import java.io.IOException
-import kotlinx.android.synthetic.main.reaction_praises_list_item.*
-import kotlinx.android.synthetic.main.reaction_praises_list_item.view.*
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicInteger
 import javax.inject.Inject
@@ -144,7 +141,7 @@ private const val BUNDLE_CHAT_ROOM_IS_CREATOR = "chat_room_is_creator"
 private const val BUNDLE_CHAT_ROOM_IS_FAVORITE = "chat_room_is_favorite"
 private const val BUNDLE_CHAT_ROOM_MESSAGE = "chat_room_message"
 
-internal const val MENU_ACTION_FAVORITE_UNFAVORITE_CHAT = 1
+internal const val MENU_ACTION_FAVORITE_UNFAVOURITE_CHAT = 1
 internal const val MENU_ACTION_SHOW_DETAILS = 2
 
 class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiReactionListener,
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/Menu.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/Menu.kt
index 2e1f14263c..1024bd6947 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/Menu.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/Menu.kt
@@ -17,7 +17,7 @@ internal fun ChatRoomFragment.setupMenu(menu: 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
         )
@@ -87,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)
@@ -95,7 +95,7 @@ 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)
diff --git a/app/src/main/java/chat/rocket/android/dagger/module/ActivityBuilder.kt b/app/src/main/java/chat/rocket/android/dagger/module/ActivityBuilder.kt
index c79ad30c6d..708309a9a7 100644
--- a/app/src/main/java/chat/rocket/android/dagger/module/ActivityBuilder.kt
+++ b/app/src/main/java/chat/rocket/android/dagger/module/ActivityBuilder.kt
@@ -38,6 +38,8 @@ 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
@@ -46,16 +48,16 @@ import dagger.android.ContributesAndroidInjector
 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
 
@@ -108,6 +110,11 @@ abstract class ActivityBuilder {
     @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
 }
diff --git a/app/src/main/java/chat/rocket/android/settings/password/ui/PasswordFragment.kt b/app/src/main/java/chat/rocket/android/settings/password/ui/PasswordFragment.kt
index ce9637604e..cab79b3d21 100644
--- a/app/src/main/java/chat/rocket/android/settings/password/ui/PasswordFragment.kt
+++ b/app/src/main/java/chat/rocket/android/settings/password/ui/PasswordFragment.kt
@@ -35,10 +35,6 @@ class PasswordFragment : Fragment(), PasswordView, ActionMode.Callback {
     private var actionMode: ActionMode? = null
     private val disposables = CompositeDisposable()
 
-    companion object {
-        fun newInstance() = PasswordFragment()
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         AndroidSupportInjection.inject(this)
         super.onCreate(savedInstanceState)
@@ -143,4 +139,8 @@ class PasswordFragment : Fragment(), PasswordView, ActionMode.Callback {
             actionMode = (activity as PasswordActivity).startSupportActionMode(this)
         }
     }
-}
\ No newline at end of file
+
+    companion object {
+        fun newInstance() = PasswordFragment()
+    }
+}
diff --git a/app/src/main/java/chat/rocket/android/userdetails/di/UserDetailsModule.kt b/app/src/main/java/chat/rocket/android/userdetails/di/UserDetailsModule.kt
new file mode 100644
index 0000000000..6435abc70b
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/userdetails/di/UserDetailsModule.kt
@@ -0,0 +1,32 @@
+package chat.rocket.android.userdetails.di
+
+import androidx.lifecycle.LifecycleOwner
+import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.dagger.scope.PerActivity
+import chat.rocket.android.userdetails.presentation.UserDetailsView
+import chat.rocket.android.userdetails.ui.UserDetailsActivity
+import dagger.Module
+import dagger.Provides
+import kotlinx.coroutines.experimental.Job
+
+@Module
+class UserDetailsModule {
+
+    @Provides
+    @PerActivity
+    fun provideJob() = Job()
+
+    @Provides
+    @PerActivity
+    fun provideUserDetailsView(activity: UserDetailsActivity): UserDetailsView = activity
+
+    @Provides
+    @PerActivity
+    fun provideLifecycleOwner(activity: UserDetailsActivity): LifecycleOwner = activity
+
+    @Provides
+    @PerActivity
+    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
+        return CancelStrategy(owner, jobs)
+    }
+}
diff --git a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
new file mode 100644
index 0000000000..ca5e4e6cd3
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
@@ -0,0 +1,139 @@
+package chat.rocket.android.userdetails.presentation
+
+import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.db.DatabaseManager
+import chat.rocket.android.server.domain.GetConnectingServerInteractor
+import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.android.util.extension.launchUI
+import chat.rocket.android.util.extensions.avatarUrl
+import chat.rocket.android.util.retryIO
+import chat.rocket.common.model.RoomType
+import chat.rocket.common.model.SimpleUser
+import chat.rocket.common.model.roomTypeOf
+import chat.rocket.core.internal.rest.spotlight
+import chat.rocket.core.model.ChatRoom
+import kotlinx.coroutines.experimental.CommonPool
+import kotlinx.coroutines.experimental.withContext
+import timber.log.Timber
+import javax.inject.Inject
+
+class UserDetailsPresenter @Inject constructor(
+    private val view: UserDetailsView,
+    private val dbManager: DatabaseManager,
+    private val strategy: CancelStrategy,
+    serverInteractor: GetConnectingServerInteractor,
+    factory: ConnectionManagerFactory
+) {
+    private var currentServer = serverInteractor.get()!!
+    private val manager = factory.create(currentServer)
+    private val client = manager.client
+
+    fun loadUserDetails(userId: String) {
+        launchUI(strategy) {
+            try {
+                val user = withContext(CommonPool) {
+                    dbManager.userDao().getUser(id = userId)
+                }
+
+                user?.let { u ->
+                    val localDMs = chatRoomByName(name = u.name)
+                    val avatarUrl = u.username?.let { currentServer.avatarUrl(avatar = it) }
+
+                    val chatRoom: ChatRoom? = if (localDMs.isEmpty()) {
+                        val query = u.username!!
+                        val result = retryIO("spotlight($query)") {
+                            client.spotlight(query = query)
+                        }
+
+                        val userMatch = result.users.firstOrNull()
+
+                        if (userMatch != null) {
+                            with (userMatch) {
+                                    ChatRoom(
+                                        id = id,
+                                        type = roomTypeOf(RoomType.DIRECT_MESSAGE),
+                                        name = u.username ?: u.name.orEmpty(),
+                                        fullName = u.name,
+                                        favorite = false,
+                                        open = false,
+                                        alert = false,
+                                        status = status,
+                                        client = client,
+                                        broadcast = false,
+                                        archived = false,
+                                        default = false,
+                                        description = null,
+                                        groupMentions = null,
+                                        userMentions = null,
+                                        lastMessage = null,
+                                        lastSeen = null,
+                                        topic = null,
+                                        announcement = null,
+                                        roles = null,
+                                        unread = 0,
+                                        readonly = false,
+                                        muted = null,
+                                        subscriptionId = "",
+                                        timestamp = null,
+                                        updatedAt = null,
+                                        user = SimpleUser(id, username)
+                                )
+                            }
+                        } else null
+                    } else localDMs.firstOrNull()
+                    view.showUserDetails(
+                        avatarUrl = avatarUrl,
+                        username = u.username,
+                        name = u.name,
+                        utcOffset = u.utcOffset,
+                        status = u.status,
+                        chatRoom = chatRoom
+                    )
+                }
+            } catch (ex: Exception) {
+                Timber.e(ex)
+            }
+        }
+    }
+
+    private suspend fun chatRoomByName(name: String? = null): List<ChatRoom> = withContext(CommonPool) {
+        return@withContext dbManager.chatRoomDao().getAllSync().filter {
+            if (name == null) {
+                return@filter true
+            }
+            it.chatRoom.name == name || it.chatRoom.fullname == name
+        }.map {
+            with(it.chatRoom) {
+                ChatRoom(
+                    id = id,
+                    subscriptionId = subscriptionId,
+                    type = roomTypeOf(type),
+                    unread = unread,
+                    broadcast = broadcast ?: false,
+                    alert = alert,
+                    fullName = fullname,
+                    name = name ?: "",
+                    favorite = favorite ?: false,
+                    default = isDefault ?: false,
+                    readonly = readonly,
+                    open = open,
+                    lastMessage = null,
+                    archived = false,
+                    status = null,
+                    user = null,
+                    userMentions = userMentions,
+                    client = client,
+                    announcement = null,
+                    description = null,
+                    groupMentions = groupMentions,
+                    roles = null,
+                    topic = null,
+                    lastSeen = this.lastSeen,
+                    timestamp = timestamp,
+                    updatedAt = updatedAt
+                )
+            }
+        }
+    }
+
+}
diff --git a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsView.kt b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsView.kt
new file mode 100644
index 0000000000..198c4f3ba3
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsView.kt
@@ -0,0 +1,8 @@
+package chat.rocket.android.userdetails.presentation
+
+import chat.rocket.core.model.ChatRoom
+
+interface UserDetailsView {
+
+    fun showUserDetails(avatarUrl: String?, username: String?, name: String?, utcOffset: Float?, status: String, chatRoom: ChatRoom?)
+}
diff --git a/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt b/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt
new file mode 100644
index 0000000000..5e9516fff3
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt
@@ -0,0 +1,116 @@
+package chat.rocket.android.userdetails.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.chatroom.ui.chatRoomIntent
+import chat.rocket.android.emoji.internal.GlideApp
+import chat.rocket.android.userdetails.presentation.UserDetailsPresenter
+import chat.rocket.android.userdetails.presentation.UserDetailsView
+import chat.rocket.android.util.extension.orFalse
+import chat.rocket.android.util.extensions.showToast
+import chat.rocket.common.model.roomTypeOf
+import chat.rocket.core.model.ChatRoom
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners
+import com.bumptech.glide.request.RequestOptions
+import dagger.android.AndroidInjection
+import dagger.android.AndroidInjector
+import dagger.android.DispatchingAndroidInjector
+import dagger.android.support.HasSupportFragmentInjector
+import kotlinx.android.synthetic.main.activity_user_details.*
+import org.threeten.bp.OffsetDateTime
+import org.threeten.bp.ZoneId
+import org.threeten.bp.ZoneOffset
+import org.threeten.bp.ZonedDateTime
+import org.threeten.bp.format.DateTimeFormatter
+import javax.inject.Inject
+import kotlin.math.roundToLong
+
+fun Context.userDetailsIntent(userId: String): Intent {
+    return Intent(this, UserDetailsActivity::class.java).apply {
+        putExtra(EXTRA_USER_ID, userId)
+    }
+}
+
+const val EXTRA_USER_ID = "EXTRA_USER_ID"
+
+class UserDetailsActivity : AppCompatActivity(), UserDetailsView, HasSupportFragmentInjector {
+
+    @Inject
+    lateinit var fragmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
+    @Inject
+    lateinit var presenter: UserDetailsPresenter
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        AndroidInjection.inject(this)
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_user_details)
+        setupToolbar()
+
+        val userId = intent.getStringExtra(EXTRA_USER_ID)
+        presenter.loadUserDetails(userId = userId)
+    }
+
+    override fun supportFragmentInjector(): AndroidInjector<Fragment> = fragmentDispatchingAndroidInjector
+
+    private fun setupToolbar() {
+        setSupportActionBar(toolbar)
+        supportActionBar?.setDisplayShowTitleEnabled(false)
+        toolbar.setNavigationOnClickListener { finish() }
+    }
+
+    override fun showUserDetails(
+        avatarUrl: String?,
+        username: String?,
+        name: String?,
+        utcOffset: Float?,
+        status: String,
+        chatRoom: ChatRoom?
+    ) {
+        text_view_name.text = name
+        text_view_username.text = username
+        text_view_status.text = status.capitalize()
+        GlideApp.with(this)
+            .load(avatarUrl)
+            .centerCrop()
+            .apply(RequestOptions().transform(RoundedCorners(25)))
+            .into(image_view_avatar)
+
+        utcOffset?.let {
+            val offsetLong = it.roundToLong()
+            val offset = if (it > 0) "+$offsetLong" else offsetLong.toString()
+            val formatter = DateTimeFormatter.ofPattern("'(GMT$offset)' hh:mm a")
+            val zoneId = ZoneId.systemDefault()
+            val timeNow = OffsetDateTime.now(ZoneOffset.UTC).plusHours(offsetLong).toLocalDateTime()
+            text_view_tz.text = formatter.format(ZonedDateTime.of(timeNow, zoneId))
+        }
+
+        text_view_message.setOnClickListener {
+            toDirectMessage(chatRoom = chatRoom)
+        }
+
+        image_view_message.setOnClickListener {
+            toDirectMessage(chatRoom = chatRoom)
+        }
+    }
+
+    private fun toDirectMessage(chatRoom: ChatRoom?) {
+        chatRoom?.let { c ->
+            startActivity(
+                chatRoomIntent(
+                    chatRoomId = c.id,
+                    chatRoomName = c.name,
+                    chatRoomType = c.type.toString(),
+                    isReadOnly = c.readonly.orFalse(),
+                    chatRoomLastSeen = c.lastSeen ?: 0,
+                    isSubscribed = c.open,
+                    isCreator = false,
+                    isFavorite = c.favorite
+                )
+            )
+        }
+    }
+}
diff --git a/app/src/main/res/drawable/ic_message_24dp.xml b/app/src/main/res/drawable/ic_message_24dp.xml
new file mode 100644
index 0000000000..2bb7785af1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_message_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+    <path
+        android:fillColor="#1d74f5"
+        android:fillType="evenOdd"
+        android:pathData="M10.11,16.546h-0.183c-4.329,0 -7.47,-2.753 -7.47,-6.546 0,-3.61 2.942,-6.547 6.56,-6.547 3.616,0 6.56,2.937 6.56,6.547 0,0.59 -0.276,1.18 -0.567,1.803 -0.1,0.218 -0.2,0.433 -0.278,0.618 -0.756,1.626 0.731,2.41 1.364,2.743 0.098,0.051 0.224,0.117 0.326,0.178 -0.416,0.478 -1.814,1.22 -6.312,1.204m6.666,-2.667c-0.895,-0.473 -0.852,-0.567 -0.71,-0.875 0.081,-0.193 0.172,-0.389 0.264,-0.587 0.33,-0.705 0.703,-1.505 0.703,-2.417 0,-4.412 -3.597,-8 -8.017,-8S1,5.588 1,10c0,4.635 3.755,8 8.927,8h0.382c2.857,0 6.632,-0.256 7.565,-2.237 0.493,-1.046 -0.58,-1.612 -1.098,-1.884" />
+</vector>
diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml
index d69c1aecdc..c4dd4a2a8f 100644
--- a/app/src/main/res/layout/activity_password.xml
+++ b/app/src/main/res/layout/activity_password.xml
@@ -6,11 +6,13 @@
     android:orientation="vertical"
     android:theme="@style/AppTheme"
     tools:context=".settings.password.ui.PasswordActivity">
+
     <include
         android:id="@+id/layout_app_bar"
         layout="@layout/app_bar_password" />
+
     <FrameLayout
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_user_details.xml b/app/src/main/res/layout/activity_user_details.xml
new file mode 100644
index 0000000000..55a6e12ef6
--- /dev/null
+++ b/app/src/main/res/layout/activity_user_details.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/white">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:background="@android:color/white"
+        app:elevation="0dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            app:elevation="0dp"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:navigationIcon="?android:attr/homeAsUpIndicator"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <ImageView
+        android:id="@+id/image_view_avatar"
+        android:layout_width="90dp"
+        android:layout_height="90dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintBottom_toBottomOf="@+id/appBarLayout"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
+        tools:srcCompat="@tools:sample/avatars[6]" />
+
+    <ImageView
+        android:id="@+id/image_view_message"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginTop="24dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_view_username"
+        app:srcCompat="@drawable/ic_message_24dp" />
+
+    <TextView
+        android:id="@+id/text_view_message"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Message"
+        android:textSize="18sp"
+        android:textColor="#1d74f5"
+        app:layout_constraintEnd_toEndOf="@+id/image_view_message"
+        app:layout_constraintStart_toStartOf="@+id/image_view_message"
+        app:layout_constraintTop_toBottomOf="@+id/image_view_message" />
+
+    <TextView
+        android:id="@+id/text_view_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
+        android:fontFamily="sans-serif-medium"
+        android:textColor="@android:color/black"
+        android:textSize="18sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/image_view_avatar"
+        tools:text="Karem Flusser" />
+
+    <TextView
+        android:id="@+id/text_view_username"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:textColor="@color/darkGray"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_view_name"
+        tools:text="karem.flusser" />
+
+    <TextView
+        android:id="@+id/textView3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="24dp"
+        android:text="Status"
+        android:textColor="@color/darkGray"
+        android:textSize="14sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_view_message" />
+
+    <TextView
+        android:id="@+id/text_view_status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:textColor="@android:color/black"
+        android:textSize="16sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView3"
+        tools:text="Online" />
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:text="Timezone"
+        android:textColor="@color/darkGray"
+        android:textSize="14sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_view_status" />
+
+    <TextView
+        android:id="@+id/text_view_tz"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:textColor="@android:color/black"
+        android:textSize="16sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView"
+        tools:text="(UTC-2) 11:08 AM" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/group_message"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:constraint_referenced_ids="text_view_message,image_view_message" />
+</androidx.constraintlayout.widget.ConstraintLayout>

From a7409d780a1d10d49845075f14509c7e9db4a452 Mon Sep 17 00:00:00 2001
From: Leonardo Aramaki <leoaramaki@gmail.com>
Date: Sun, 25 Nov 2018 16:19:24 -0200
Subject: [PATCH 072/149] Implement blur extension function to Bitmap and add
 further details to the ui for the user details screen

---
 .../presentation/UserDetailsPresenter.kt      |   8 +-
 .../userdetails/ui/UserDetailsActivity.kt     |  40 ++-
 .../android/util/extensions/Graphics.kt       |  25 ++
 .../chat/rocket/android/util/extensions/Ui.kt |   2 +-
 .../res/drawable/bg_round_bounds_white.xml    |  14 +
 .../main/res/layout/activity_user_details.xml | 255 ++++++++++--------
 6 files changed, 215 insertions(+), 129 deletions(-)
 create mode 100644 app/src/main/java/chat/rocket/android/util/extensions/Graphics.kt
 create mode 100644 app/src/main/res/drawable/bg_round_bounds_white.xml

diff --git a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
index ca5e4e6cd3..88650d6865 100644
--- a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
@@ -41,14 +41,14 @@ class UserDetailsPresenter @Inject constructor(
 
                     val chatRoom: ChatRoom? = if (localDMs.isEmpty()) {
                         val query = u.username!!
-                        val result = retryIO("spotlight($query)") {
+                        val spotlightResult = retryIO("spotlight($query)") {
                             client.spotlight(query = query)
                         }
 
-                        val userMatch = result.users.firstOrNull()
+                        val matchFromSpotlight = spotlightResult.users.firstOrNull()
 
-                        if (userMatch != null) {
-                            with (userMatch) {
+                        if (matchFromSpotlight != null) {
+                            with (matchFromSpotlight) {
                                     ChatRoom(
                                         id = id,
                                         type = roomTypeOf(RoomType.DIRECT_MESSAGE),
diff --git a/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt b/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt
index 5e9516fff3..c36f22231c 100644
--- a/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt
+++ b/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt
@@ -2,18 +2,26 @@ package chat.rocket.android.userdetails.ui
 
 import android.content.Context
 import android.content.Intent
+import android.graphics.drawable.BitmapDrawable
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
+import blurred
 import chat.rocket.android.R
 import chat.rocket.android.chatroom.ui.chatRoomIntent
 import chat.rocket.android.emoji.internal.GlideApp
 import chat.rocket.android.userdetails.presentation.UserDetailsPresenter
 import chat.rocket.android.userdetails.presentation.UserDetailsView
+import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extension.orFalse
 import chat.rocket.android.util.extensions.showToast
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.core.model.ChatRoom
+import com.bumptech.glide.Glide
+import com.bumptech.glide.Priority
+import com.bumptech.glide.load.resource.bitmap.CenterCrop
+import com.bumptech.glide.load.resource.bitmap.CenterInside
+import com.bumptech.glide.load.resource.bitmap.FitCenter
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.request.RequestOptions
 import dagger.android.AndroidInjection
@@ -21,6 +29,10 @@ import dagger.android.AndroidInjector
 import dagger.android.DispatchingAndroidInjector
 import dagger.android.support.HasSupportFragmentInjector
 import kotlinx.android.synthetic.main.activity_user_details.*
+import kotlinx.coroutines.experimental.CommonPool
+import kotlinx.coroutines.experimental.android.UI
+import kotlinx.coroutines.experimental.launch
+import kotlinx.coroutines.experimental.withContext
 import org.threeten.bp.OffsetDateTime
 import org.threeten.bp.ZoneId
 import org.threeten.bp.ZoneOffset
@@ -73,11 +85,28 @@ class UserDetailsActivity : AppCompatActivity(), UserDetailsView, HasSupportFrag
         text_view_name.text = name
         text_view_username.text = username
         text_view_status.text = status.capitalize()
-        GlideApp.with(this)
-            .load(avatarUrl)
-            .centerCrop()
-            .apply(RequestOptions().transform(RoundedCorners(25)))
-            .into(image_view_avatar)
+
+        launch(UI) {
+            val image = withContext(CommonPool) {
+                val requestOptions = RequestOptions()
+                    .priority(Priority.IMMEDIATE)
+                    .transforms(CenterInside(), FitCenter())
+
+                return@withContext GlideApp.with(this@UserDetailsActivity)
+                    .asBitmap()
+                    .load(avatarUrl)
+                    .apply(requestOptions)
+                    .submit()
+                    .get()
+            }
+
+            toolbar.background = BitmapDrawable(resources, image.blurred(this@UserDetailsActivity))
+            GlideApp.with(this@UserDetailsActivity)
+                .asBitmap()
+                .transforms(RoundedCorners(25), CenterCrop())
+                .load(avatarUrl)
+                .into(image_view_avatar)
+        }
 
         utcOffset?.let {
             val offsetLong = it.roundToLong()
@@ -99,6 +128,7 @@ class UserDetailsActivity : AppCompatActivity(), UserDetailsView, HasSupportFrag
 
     private fun toDirectMessage(chatRoom: ChatRoom?) {
         chatRoom?.let { c ->
+            finish()
             startActivity(
                 chatRoomIntent(
                     chatRoomId = c.id,
diff --git a/app/src/main/java/chat/rocket/android/util/extensions/Graphics.kt b/app/src/main/java/chat/rocket/android/util/extensions/Graphics.kt
new file mode 100644
index 0000000000..c481e2fe0e
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/util/extensions/Graphics.kt
@@ -0,0 +1,25 @@
+import android.content.Context
+import android.graphics.Bitmap
+import android.renderscript.Allocation
+import android.renderscript.Element
+import android.renderscript.RenderScript
+import android.renderscript.ScriptIntrinsicBlur
+
+
+fun Bitmap.blurred(context: Context, intensity: Float = 25f): Bitmap {
+    if (intensity <= 0 || intensity > 25) {
+        throw IllegalStateException("Intensity out of range (0 < intensity <= 25).")
+    }
+    val bitmap = copy(config, true)
+
+    val rs = RenderScript.create(context)
+    val input = Allocation.createFromBitmap(rs, this, Allocation.MipmapControl.MIPMAP_NONE,
+        Allocation.USAGE_SCRIPT)
+    val output = Allocation.createTyped(rs, input.type)
+    val script = ScriptIntrinsicBlur.create(rs, Element.U8_4(rs))
+    script.setRadius(intensity)
+    script.setInput(input)
+    script.forEach(output)
+    output.copyTo(bitmap)
+    return bitmap
+}
diff --git a/app/src/main/java/chat/rocket/android/util/extensions/Ui.kt b/app/src/main/java/chat/rocket/android/util/extensions/Ui.kt
index 836f551db6..9fcdc89528 100644
--- a/app/src/main/java/chat/rocket/android/util/extensions/Ui.kt
+++ b/app/src/main/java/chat/rocket/android/util/extensions/Ui.kt
@@ -118,4 +118,4 @@ fun Menu.toList(): List<MenuItem> {
     val menuItems = ArrayList<MenuItem>(this.size())
     (0 until this.size()).mapTo(menuItems) { this.getItem(it) }
     return menuItems
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/drawable/bg_round_bounds_white.xml b/app/src/main/res/drawable/bg_round_bounds_white.xml
new file mode 100644
index 0000000000..ceddaa4a68
--- /dev/null
+++ b/app/src/main/res/drawable/bg_round_bounds_white.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <padding
+        android:bottom="2dp"
+        android:left="2dp"
+        android:right="2dp"
+        android:top="2dp" />
+
+    <solid android:color="@android:color/white" />
+
+    <corners android:radius="25px" />
+</shape>
diff --git a/app/src/main/res/layout/activity_user_details.xml b/app/src/main/res/layout/activity_user_details.xml
index 55a6e12ef6..daada7549a 100644
--- a/app/src/main/res/layout/activity_user_details.xml
+++ b/app/src/main/res/layout/activity_user_details.xml
@@ -1,141 +1,158 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/white">
+    android:background="@android:color/white"
+    android:fitsSystemWindows="true">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayout"
-        android:layout_width="0dp"
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@android:color/white"
-        app:elevation="0dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            app:elevation="0dp"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:navigationIcon="?android:attr/homeAsUpIndicator"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
-    </com.google.android.material.appbar.AppBarLayout>
+            android:layout_height="match_parent"
+            android:background="@android:color/white">
 
-    <ImageView
-        android:id="@+id/image_view_avatar"
-        android:layout_width="90dp"
-        android:layout_height="90dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="32dp"
-        android:layout_marginEnd="16dp"
-        app:layout_constraintBottom_toBottomOf="@+id/appBarLayout"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
-        tools:srcCompat="@tools:sample/avatars[6]" />
+            <ImageView
+                android:id="@+id/image_view_message"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginTop="24dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/text_view_username"
+                app:srcCompat="@drawable/ic_message_24dp" />
 
-    <ImageView
-        android:id="@+id/image_view_message"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_marginTop="24dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_view_username"
-        app:srcCompat="@drawable/ic_message_24dp" />
+            <TextView
+                android:id="@+id/text_view_message"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Message"
+                android:textColor="#1d74f5"
+                android:textSize="18sp"
+                app:layout_constraintEnd_toEndOf="@+id/image_view_message"
+                app:layout_constraintStart_toStartOf="@+id/image_view_message"
+                app:layout_constraintTop_toBottomOf="@+id/image_view_message" />
 
-    <TextView
-        android:id="@+id/text_view_message"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Message"
-        android:textSize="18sp"
-        android:textColor="#1d74f5"
-        app:layout_constraintEnd_toEndOf="@+id/image_view_message"
-        app:layout_constraintStart_toStartOf="@+id/image_view_message"
-        app:layout_constraintTop_toBottomOf="@+id/image_view_message" />
+            <TextView
+                android:id="@+id/text_view_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="16dp"
+                android:fontFamily="sans-serif-medium"
+                android:textColor="@android:color/black"
+                android:textSize="18sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="Karem Flusser" />
 
-    <TextView
-        android:id="@+id/text_view_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="16dp"
-        android:fontFamily="sans-serif-medium"
-        android:textColor="@android:color/black"
-        android:textSize="18sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/image_view_avatar"
-        tools:text="Karem Flusser" />
+            <TextView
+                android:id="@+id/text_view_username"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:textColor="@color/darkGray"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/text_view_name"
+                tools:text="karem.flusser" />
 
-    <TextView
-        android:id="@+id/text_view_username"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:textColor="@color/darkGray"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_view_name"
-        tools:text="karem.flusser" />
+            <TextView
+                android:id="@+id/textView3"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="24dp"
+                android:text="Status"
+                android:textColor="@color/darkGray"
+                android:textSize="14sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/text_view_message" />
 
-    <TextView
-        android:id="@+id/textView3"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="24dp"
-        android:text="Status"
-        android:textColor="@color/darkGray"
-        android:textSize="14sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_view_message" />
+            <TextView
+                android:id="@+id/text_view_status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:textColor="@android:color/black"
+                android:textSize="16sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/textView3"
+                tools:text="Online" />
 
-    <TextView
-        android:id="@+id/text_view_status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:textColor="@android:color/black"
-        android:textSize="16sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView3"
-        tools:text="Online" />
+            <TextView
+                android:id="@+id/textView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                android:text="Timezone"
+                android:textColor="@color/darkGray"
+                android:textSize="14sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/text_view_status" />
 
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:text="Timezone"
-        android:textColor="@color/darkGray"
-        android:textSize="14sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_view_status" />
+            <TextView
+                android:id="@+id/text_view_tz"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:textColor="@android:color/black"
+                android:textSize="16sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/textView"
+                tools:text="(UTC-2) 11:08 AM" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
 
-    <TextView
-        android:id="@+id/text_view_tz"
-        android:layout_width="wrap_content"
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:textColor="@android:color/black"
-        android:textSize="16sp"
+        android:background="@android:color/white"
+        app:elevation="0dp"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView"
-        tools:text="(UTC-2) 11:08 AM" />
+        app:layout_constraintTop_toTopOf="parent">
 
-    <androidx.constraintlayout.widget.Group
-        android:id="@+id/group_message"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:constraint_referenced_ids="text_view_message,image_view_message" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:contentScrim="@android:color/white"
+            app:expandedTitleGravity="top"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingBottom="?actionBarSize"
+                app:elevation="0dp"
+                app:layout_collapseMode="pin"
+                app:layout_scrollFlags="scroll|enterAlways"
+                app:navigationIcon="?android:attr/homeAsUpIndicator"
+                app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+
+            <ImageView
+                android:id="@+id/image_view_avatar"
+                android:layout_width="98dp"
+                android:layout_height="98dp"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="?actionBarSize"
+                android:layout_marginEnd="16dp"
+                android:background="@drawable/bg_round_bounds_white"
+                tools:srcCompat="@tools:sample/avatars[6]" />
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

From 8c0916b19e6ba41f798d901411a70b6432cbb59b Mon Sep 17 00:00:00 2001
From: Leonardo Aramaki <leoaramaki@gmail.com>
Date: Sun, 25 Nov 2018 17:24:44 -0200
Subject: [PATCH 073/149] Add localization strings and do not create a new
 conversation if already opend

---
 .../chatroom/adapter/MessageViewHolder.kt     |  9 ++---
 .../chatroom/uimodel/MessageUiModel.kt        |  3 +-
 .../android/chatroom/uimodel/UiModelMapper.kt |  3 +-
 .../presentation/UserDetailsPresenter.kt      | 10 ++++--
 .../userdetails/ui/UserDetailsActivity.kt     | 33 ++++++++++++-------
 .../main/res/layout/activity_user_details.xml |  7 ++--
 app/src/main/res/values-de/strings.xml        |  9 +++--
 app/src/main/res/values-es/strings.xml        |  7 ++--
 app/src/main/res/values-fr/strings.xml        |  6 ++++
 app/src/main/res/values-hi-rIN/strings.xml    |  6 ++++
 app/src/main/res/values-it/strings.xml        |  5 +++
 app/src/main/res/values-ja/strings.xml        |  5 +++
 app/src/main/res/values-pt-rBR/strings.xml    |  6 ++++
 app/src/main/res/values-ru-rRU/strings.xml    |  6 ++++
 app/src/main/res/values-tr/strings.xml        |  7 ++--
 app/src/main/res/values-uk/strings.xml        |  6 ++++
 app/src/main/res/values/strings.xml           |  9 +++--
 17 files changed, 103 insertions(+), 34 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatroom/adapter/MessageViewHolder.kt b/app/src/main/java/chat/rocket/android/chatroom/adapter/MessageViewHolder.kt
index 61bfdbe9a4..4e196e9dfe 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/adapter/MessageViewHolder.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/adapter/MessageViewHolder.kt
@@ -74,19 +74,20 @@ class MessageViewHolder(
             }
 
             val senderId = data.message.sender?.id
+            val subscriptionId = data.subscriptionId
             text_sender.setOnClickListener {
-                toUserDetails(context, senderId)
+                toUserDetails(context, senderId, subscriptionId)
             }
 
             image_avatar.setOnClickListener {
-                toUserDetails(context, senderId)
+                toUserDetails(context, senderId, subscriptionId)
             }
 
         }
     }
 
-    private fun toUserDetails(context: Context, userId: String?) {
-        userId?.let { context.startActivity(context.userDetailsIntent(it)) }
+    private fun toUserDetails(context: Context, userId: String?, subscriptionId: String) {
+        userId?.let { context.startActivity(context.userDetailsIntent(it, subscriptionId)) }
     }
 
     override fun unscheduleDrawable(who: Drawable?, what: Runnable?) {
diff --git a/app/src/main/java/chat/rocket/android/chatroom/uimodel/MessageUiModel.kt b/app/src/main/java/chat/rocket/android/chatroom/uimodel/MessageUiModel.kt
index 94aa396531..f69ab559ac 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/uimodel/MessageUiModel.kt
+++ b/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
diff --git a/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt b/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt
index 02551a0770..c6b5fab97c 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt
@@ -456,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 {
diff --git a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
index 88650d6865..7f77370719 100644
--- a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
@@ -1,7 +1,9 @@
 package chat.rocket.android.userdetails.presentation
 
+import androidx.core.text.toSpannable
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManager
+import chat.rocket.android.helper.UserHelper
 import chat.rocket.android.server.domain.GetConnectingServerInteractor
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
 import chat.rocket.android.util.extension.launchUI
@@ -22,11 +24,13 @@ class UserDetailsPresenter @Inject constructor(
     private val dbManager: DatabaseManager,
     private val strategy: CancelStrategy,
     serverInteractor: GetConnectingServerInteractor,
-    factory: ConnectionManagerFactory
+    factory: ConnectionManagerFactory,
+    userHelper: UserHelper
 ) {
     private var currentServer = serverInteractor.get()!!
     private val manager = factory.create(currentServer)
     private val client = manager.client
+    private val userId = userHelper.user()?.id
 
     fun loadUserDetails(userId: String) {
         launchUI(strategy) {
@@ -50,7 +54,7 @@ class UserDetailsPresenter @Inject constructor(
                         if (matchFromSpotlight != null) {
                             with (matchFromSpotlight) {
                                     ChatRoom(
-                                        id = id,
+                                        id = "$id$userId",
                                         type = roomTypeOf(RoomType.DIRECT_MESSAGE),
                                         name = u.username ?: u.name.orEmpty(),
                                         fullName = u.name,
@@ -76,7 +80,7 @@ class UserDetailsPresenter @Inject constructor(
                                         subscriptionId = "",
                                         timestamp = null,
                                         updatedAt = null,
-                                        user = SimpleUser(id, username)
+                                        user = null
                                 )
                             }
                         } else null
diff --git a/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt b/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt
index c36f22231c..403c2cc591 100644
--- a/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt
+++ b/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt
@@ -17,6 +17,7 @@ import chat.rocket.android.util.extension.orFalse
 import chat.rocket.android.util.extensions.showToast
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.core.model.ChatRoom
+import chat.rocket.core.model.userId
 import com.bumptech.glide.Glide
 import com.bumptech.glide.Priority
 import com.bumptech.glide.load.resource.bitmap.CenterCrop
@@ -38,16 +39,19 @@ import org.threeten.bp.ZoneId
 import org.threeten.bp.ZoneOffset
 import org.threeten.bp.ZonedDateTime
 import org.threeten.bp.format.DateTimeFormatter
+import timber.log.Timber
 import javax.inject.Inject
 import kotlin.math.roundToLong
 
-fun Context.userDetailsIntent(userId: String): Intent {
+fun Context.userDetailsIntent(userId: String, subscriptionId: String): Intent {
     return Intent(this, UserDetailsActivity::class.java).apply {
         putExtra(EXTRA_USER_ID, userId)
+        putExtra(EXTRA_SUBSCRIPTION_ID, subscriptionId)
     }
 }
 
 const val EXTRA_USER_ID = "EXTRA_USER_ID"
+const val EXTRA_SUBSCRIPTION_ID = "EXTRA_USERNAME"
 
 class UserDetailsActivity : AppCompatActivity(), UserDetailsView, HasSupportFragmentInjector {
 
@@ -56,6 +60,8 @@ class UserDetailsActivity : AppCompatActivity(), UserDetailsView, HasSupportFrag
     @Inject
     lateinit var presenter: UserDetailsPresenter
 
+    private lateinit var subscriptionId: String
+
     override fun onCreate(savedInstanceState: Bundle?) {
         AndroidInjection.inject(this)
         super.onCreate(savedInstanceState)
@@ -63,6 +69,7 @@ class UserDetailsActivity : AppCompatActivity(), UserDetailsView, HasSupportFrag
         setupToolbar()
 
         val userId = intent.getStringExtra(EXTRA_USER_ID)
+        subscriptionId = intent.getStringExtra(EXTRA_SUBSCRIPTION_ID)
         presenter.loadUserDetails(userId = userId)
     }
 
@@ -129,18 +136,20 @@ class UserDetailsActivity : AppCompatActivity(), UserDetailsView, HasSupportFrag
     private fun toDirectMessage(chatRoom: ChatRoom?) {
         chatRoom?.let { c ->
             finish()
-            startActivity(
-                chatRoomIntent(
-                    chatRoomId = c.id,
-                    chatRoomName = c.name,
-                    chatRoomType = c.type.toString(),
-                    isReadOnly = c.readonly.orFalse(),
-                    chatRoomLastSeen = c.lastSeen ?: 0,
-                    isSubscribed = c.open,
-                    isCreator = false,
-                    isFavorite = c.favorite
+            if (c.subscriptionId.isEmpty() || c.subscriptionId != subscriptionId) {
+                startActivity(
+                    chatRoomIntent(
+                        chatRoomId = c.id,
+                        chatRoomName = c.name,
+                        chatRoomType = c.type.toString(),
+                        isReadOnly = c.readonly.orFalse(),
+                        chatRoomLastSeen = c.lastSeen ?: 0,
+                        isSubscribed = c.open,
+                        isCreator = false,
+                        isFavorite = c.favorite
+                    )
                 )
-            )
+            }
         }
     }
 }
diff --git a/app/src/main/res/layout/activity_user_details.xml b/app/src/main/res/layout/activity_user_details.xml
index daada7549a..d672c034fe 100644
--- a/app/src/main/res/layout/activity_user_details.xml
+++ b/app/src/main/res/layout/activity_user_details.xml
@@ -32,7 +32,7 @@
                 android:id="@+id/text_view_message"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Message"
+                android:text="@string/message"
                 android:textColor="#1d74f5"
                 android:textSize="18sp"
                 app:layout_constraintEnd_toEndOf="@+id/image_view_message"
@@ -72,7 +72,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="24dp"
-                android:text="Status"
+                android:text="@string/status"
                 android:textColor="@color/darkGray"
                 android:textSize="14sp"
                 app:layout_constraintStart_toStartOf="parent"
@@ -95,7 +95,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="16dp"
-                android:text="Timezone"
+                android:text="@string/timezone"
                 android:textColor="@color/darkGray"
                 android:textSize="14sp"
                 app:layout_constraintStart_toStartOf="parent"
@@ -152,7 +152,6 @@
                 android:layout_marginEnd="16dp"
                 android:background="@drawable/bg_round_bounds_white"
                 tools:srcCompat="@tools:sample/avatars[6]" />
-
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 8066850f3f..ae8f7ad7e4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -329,6 +329,9 @@
     <string name="notif_success_sending">Nachricht gesendet nach %1$s!</string>
     <string name="read_by">Gelesen von</string>
     <string name="message_information_title">Nachricht Information</string>
-    <!--TODO - Add proper translation-->
-    <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
-</resources>
\ No newline at end of file
+    <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string> <!--TODO - Add proper translation-->
+
+    <!-- User Details -->
+    <string name="message">Message</string> <!--TODO - Add proper translation-->
+    <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
+</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b4e1a37456..887f347232 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -330,6 +330,9 @@
     <string name="msg_file_description">Descripción del archivo</string>
     <string name="msg_send">Enviar</string>
     <string name="msg_sent_attachment">Envió un archivo</string>
-    <!--TODO - Add proper translation-->
-    <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
+    <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string> <!--TODO - Add proper translation-->
+
+    <!-- User Details -->
+    <string name="message">Message</string> <!-- TODO - Add proper translation -->
+    <string name="timezone">Timezone</string> <!-- TODO - Add proper translation -->
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 359908114d..4ed69c0900 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -334,4 +334,10 @@
     <string name="msg_sent_attachment">Envoyé un fichier</string>
     <!--TODO - Add proper translation-->
     <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
+
+    <!-- User Details -->
+    <!-- TODO - Add proper translation -->
+    <string name="message">Message</string>
+    <!-- TODO - Add proper translation -->
+    <string name="timezone">Timezone</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 2e2a0f0fab..5cdb6eedfe 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -334,4 +334,10 @@
     <string name="message_information_title">संदेश की जानकारी</string>
     <string name="msg_log_out">लॉग आउट कर रहा हूं…</string>
     <string name="message_room_changed_privacy">%2$s ने रूम का प्रकार बदलकर %1$s किया </string>
+
+    <!-- User Details -->
+    <!-- TODO - Add proper translation -->
+    <string name="message">Message</string>
+    <!-- TODO - Add proper translation -->
+    <string name="timezone">Timezone</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b08403a058..ea9cb4df4e 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -329,4 +329,9 @@
     <string name="message_information_title">Informazioni Messaggio</string>
     <string name="message_room_changed_privacy">Il tipo di stanza è cambiato in: %1$s da %2$s</string>
 
+    <!-- User Details -->
+    <!-- TODO - Add proper translation -->
+    <string name="message">Message</string>
+    <!-- TODO - Add proper translation -->
+    <string name="timezone">Timezone</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index b322170dd9..534ccce063 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -336,4 +336,9 @@
 
     <string name="message_room_changed_privacy">ルームタイプを %2$s から %1$s に変更しました</string>
 
+    <!-- User Details -->
+    <!-- TODO - Add proper translation -->
+    <string name="message">Message</string>
+    <!-- TODO - Add proper translation -->
+    <string name="timezone">Timezone</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index a5845a9e15..5a59cac9f6 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -332,4 +332,10 @@
     <string name="msg_log_out">Deslogando…</string>
     <string name="msg_sent_attachment">Enviou um arquivo</string>
     <string name="message_room_changed_privacy">O tipo da sala mudou para: %1$s por %2$s</string>
+
+    <!-- User Details -->
+    <!-- TODO - Add proper translation -->
+    <string name="message">Mensagem</string>
+    <!-- TODO - Add proper translation -->
+    <string name="timezone">Fuso Horário</string>
 </resources>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 14e7028bb7..45be7b121f 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -330,4 +330,10 @@
     <string name="message_information_title">Информация о прочтении</string>
     <string name="msg_log_out">Выходим…</string>
     <string name="message_room_changed_privacy">Тип канала изменен на: %1$s пользователем %2$s</string>
+
+    <!-- User Details -->
+    <!-- TODO - Add proper translation -->
+    <string name="message">Message</string>
+    <!-- TODO - Add proper translation -->
+    <string name="timezone">Timezone</string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 88377f64c1..3a69268967 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -332,6 +332,9 @@
     <string name="notif_success_sending">Mesaj %1$s\'a gönderildi!</string>
     <string name="read_by">ile oku</string>
     <string name="message_information_title">Mesaj bilgisi</string>
-    <!--TODO - Add proper translation-->
-    <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
+    <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string> <!--TODO - Add proper translation-->
+
+    <!-- User Details -->
+    <string name="message">Message</string> <!--TODO - Add proper translation-->
+    <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index a8aa3fb5dd..e5ff83d5ea 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -332,4 +332,10 @@
     <string name="msg_sent_attachment">Долучення відправлено</string>
     <!--TODO - Add proper translation-->
     <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
+
+    <!-- User Details -->
+    <!-- TODO - Add proper translation -->
+    <string name="message">Message</string>
+    <!-- TODO - Add proper translation -->
+    <string name="timezone">Timezone</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 59615608c9..d1e592aeeb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -203,7 +203,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="msg_view_more">view more</string>
     <string name="msg_view_less">view less</string>
     <string name="msg_muted_on_this_channel">You are muted on this channel</string>
-    
+
     <!-- Preferences messages -->
     <string name="msg_analytics_tracking">Analytics tracking</string>
     <string name="msg_send_analytics_tracking">Send anonymous statics to help improving this app</string>
@@ -346,5 +346,10 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="message_information_title">Message information</string>
     <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
 
-    <string name="foss" tools:ignore="MissingTranslation">(FOSS)</string>
+    <string name="foss" translatable="false">(FOSS)</string>
+
+    <!-- User Details -->
+    <string name="message">Message</string>
+    <string name="timezone">Timezone</string>
+    <string name="status" translatable="false">Status</string>
 </resources>
\ No newline at end of file

From b59ba20ac3f3b4ef31c80b07641088b81d88e0c6 Mon Sep 17 00:00:00 2001
From: Leonardo Aramaki <leoaramaki@gmail.com>
Date: Sun, 25 Nov 2018 19:18:16 -0200
Subject: [PATCH 074/149] Add loading view while loading details

---
 .../userdetails/ui/UserDetailsActivity.kt        | 11 ++++++++++-
 .../main/res/layout/activity_user_details.xml    | 16 ++++++++++++++++
 app/src/main/res/values-pt-rBR/strings.xml       |  2 +-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt b/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt
index 403c2cc591..e846901017 100644
--- a/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt
+++ b/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt
@@ -5,6 +5,7 @@ import android.content.Intent
 import android.graphics.drawable.BitmapDrawable
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import blurred
 import chat.rocket.android.R
@@ -70,6 +71,7 @@ class UserDetailsActivity : AppCompatActivity(), UserDetailsView, HasSupportFrag
 
         val userId = intent.getStringExtra(EXTRA_USER_ID)
         subscriptionId = intent.getStringExtra(EXTRA_SUBSCRIPTION_ID)
+        showLoadingView(true)
         presenter.loadUserDetails(userId = userId)
     }
 
@@ -104,7 +106,7 @@ class UserDetailsActivity : AppCompatActivity(), UserDetailsView, HasSupportFrag
                     .load(avatarUrl)
                     .apply(requestOptions)
                     .submit()
-                    .get()
+                    .get().also { showLoadingView(false) }
             }
 
             toolbar.background = BitmapDrawable(resources, image.blurred(this@UserDetailsActivity))
@@ -133,6 +135,13 @@ class UserDetailsActivity : AppCompatActivity(), UserDetailsView, HasSupportFrag
         }
     }
 
+    private fun showLoadingView(show: Boolean) {
+        runOnUiThread {
+            group_user_details.isVisible = !show
+            view_loading.isVisible = show
+        }
+    }
+
     private fun toDirectMessage(chatRoom: ChatRoom?) {
         chatRoom?.let { c ->
             finish()
diff --git a/app/src/main/res/layout/activity_user_details.xml b/app/src/main/res/layout/activity_user_details.xml
index d672c034fe..48f55261d7 100644
--- a/app/src/main/res/layout/activity_user_details.xml
+++ b/app/src/main/res/layout/activity_user_details.xml
@@ -18,6 +18,16 @@
             android:layout_height="match_parent"
             android:background="@android:color/white">
 
+            <com.wang.avi.AVLoadingIndicatorView
+                android:id="@+id/view_loading"
+                style="@style/Authentication.AVLoadingIndicatorView"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:visibility="visible" />
+
             <ImageView
                 android:id="@+id/image_view_message"
                 android:layout_width="24dp"
@@ -111,6 +121,12 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/textView"
                 tools:text="(UTC-2) 11:08 AM" />
+
+            <androidx.constraintlayout.widget.Group
+                android:id="@+id/group_user_details"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:constraint_referenced_ids="text_view_tz,textView,text_view_status,text_view_message,textView3,text_view_name,text_view_username,image_view_message" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.core.widget.NestedScrollView>
 
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 5a59cac9f6..f401ee6612 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -337,5 +337,5 @@
     <!-- TODO - Add proper translation -->
     <string name="message">Mensagem</string>
     <!-- TODO - Add proper translation -->
-    <string name="timezone">Fuso Horário</string>
+    <string name="timezone">Fuso horário</string>
 </resources>

From 69a8dfe2ee14d2ac38d233970a317fa0b38d91dd Mon Sep 17 00:00:00 2001
From: Leonardo Aramaki <leoaramaki@gmail.com>
Date: Mon, 3 Dec 2018 16:07:18 -0200
Subject: [PATCH 075/149] Scale and crop background on user details screen so
 to respect the aspect ratio of the original image

---
 .../userdetails/ui/UserDetailsActivity.kt        |  4 +++-
 .../rocket/android/util/extensions/Graphics.kt   | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt b/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt
index e846901017..daced2c9b4 100644
--- a/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt
+++ b/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt
@@ -109,7 +109,9 @@ class UserDetailsActivity : AppCompatActivity(), UserDetailsView, HasSupportFrag
                     .get().also { showLoadingView(false) }
             }
 
-            toolbar.background = BitmapDrawable(resources, image.blurred(this@UserDetailsActivity))
+            val blurredBitmap = image.blurred(context = this@UserDetailsActivity,
+                newWidth = toolbar.measuredWidth, newHeight =  toolbar.measuredHeight)
+            toolbar.background = BitmapDrawable(resources, blurredBitmap)
             GlideApp.with(this@UserDetailsActivity)
                 .asBitmap()
                 .transforms(RoundedCorners(25), CenterCrop())
diff --git a/app/src/main/java/chat/rocket/android/util/extensions/Graphics.kt b/app/src/main/java/chat/rocket/android/util/extensions/Graphics.kt
index c481e2fe0e..599d60eefc 100644
--- a/app/src/main/java/chat/rocket/android/util/extensions/Graphics.kt
+++ b/app/src/main/java/chat/rocket/android/util/extensions/Graphics.kt
@@ -6,14 +6,22 @@ import android.renderscript.RenderScript
 import android.renderscript.ScriptIntrinsicBlur
 
 
-fun Bitmap.blurred(context: Context, intensity: Float = 25f): Bitmap {
+fun Bitmap.blurred(context: Context, intensity: Float = 25f, newWidth: Int = -1, newHeight: Int = -1): Bitmap {
     if (intensity <= 0 || intensity > 25) {
         throw IllegalStateException("Intensity out of range (0 < intensity <= 25).")
     }
-    val bitmap = copy(config, true)
-
+    val nonScaledBitmap = copy(config, true)
+    val bitmap = if (newWidth > 0 && newHeight > 0) {
+        val height = nonScaledBitmap.height
+        val width = nonScaledBitmap.width
+        val aspectRadio = width / height
+        val adjustedWidth = newHeight * aspectRadio
+        val adjustedHeight = newWidth * height / width
+        val scaledBitmap = Bitmap.createScaledBitmap(nonScaledBitmap, adjustedWidth, adjustedHeight, false)
+        Bitmap.createBitmap(scaledBitmap, 0, 0, adjustedWidth, newHeight)
+    } else nonScaledBitmap
     val rs = RenderScript.create(context)
-    val input = Allocation.createFromBitmap(rs, this, Allocation.MipmapControl.MIPMAP_NONE,
+    val input = Allocation.createFromBitmap(rs, bitmap, Allocation.MipmapControl.MIPMAP_NONE,
         Allocation.USAGE_SCRIPT)
     val output = Allocation.createTyped(rs, input.type)
     val script = ScriptIntrinsicBlur.create(rs, Element.U8_4(rs))

From 2e15f4a718dccccaf8519991bf541608ac4eb821 Mon Sep 17 00:00:00 2001
From: Leonardo Aramaki <leoaramaki@gmail.com>
Date: Thu, 6 Dec 2018 16:02:30 -0200
Subject: [PATCH 076/149] Create a DM session if one do not alredy exists

---
 .../android/members/adapter/MembersAdapter.kt |  2 +-
 .../members/presentation/MembersNavigator.kt  |  8 +--
 .../members/presentation/MembersPresenter.kt  | 10 +--
 .../android/members/uimodel/MemberUiModel.kt  |  3 +-
 .../members/uimodel/MemberUiModelMapper.kt    |  7 +-
 .../presentation/UserDetailsPresenter.kt      | 72 ++++++++++---------
 6 files changed, 52 insertions(+), 50 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/members/adapter/MembersAdapter.kt b/app/src/main/java/chat/rocket/android/members/adapter/MembersAdapter.kt
index 51351781f7..c031687762 100644
--- a/app/src/main/java/chat/rocket/android/members/adapter/MembersAdapter.kt
+++ b/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
+}
diff --git a/app/src/main/java/chat/rocket/android/members/presentation/MembersNavigator.kt b/app/src/main/java/chat/rocket/android/members/presentation/MembersNavigator.kt
index 212f7ca6fe..ee1c293c0c 100644
--- a/app/src/main/java/chat/rocket/android/members/presentation/MembersNavigator.kt
+++ b/app/src/main/java/chat/rocket/android/members/presentation/MembersNavigator.kt
@@ -1,15 +1,13 @@
 package chat.rocket.android.members.presentation
 
 import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
-import chat.rocket.android.members.ui.TAG_MEMBER_BOTTOM_SHEET_FRAGMENT
-import chat.rocket.android.members.ui.newInstance
+import chat.rocket.android.userdetails.ui.userDetailsIntent
 
 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, ""))
         }
     }
 }
diff --git a/app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt b/app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt
index 92948640f7..40c366d0ce 100644
--- a/app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt
@@ -59,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
+}
diff --git a/app/src/main/java/chat/rocket/android/members/uimodel/MemberUiModel.kt b/app/src/main/java/chat/rocket/android/members/uimodel/MemberUiModel.kt
index 90660638de..1487578230 100644
--- a/app/src/main/java/chat/rocket/android/members/uimodel/MemberUiModel.kt
+++ b/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
+}
diff --git a/app/src/main/java/chat/rocket/android/members/uimodel/MemberUiModelMapper.kt b/app/src/main/java/chat/rocket/android/members/uimodel/MemberUiModelMapper.kt
index bb2e2ebc4b..6cf69f12cb 100644
--- a/app/src/main/java/chat/rocket/android/members/uimodel/MemberUiModelMapper.kt
+++ b/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
+}
diff --git a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
index 7f77370719..ceb808a609 100644
--- a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
@@ -1,6 +1,5 @@
 package chat.rocket.android.userdetails.presentation
 
-import androidx.core.text.toSpannable
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.helper.UserHelper
@@ -10,8 +9,8 @@ import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.model.RoomType
-import chat.rocket.common.model.SimpleUser
 import chat.rocket.common.model.roomTypeOf
+import chat.rocket.core.internal.rest.createDirectMessage
 import chat.rocket.core.internal.rest.spotlight
 import chat.rocket.core.model.ChatRoom
 import kotlinx.coroutines.experimental.CommonPool
@@ -30,7 +29,7 @@ class UserDetailsPresenter @Inject constructor(
     private var currentServer = serverInteractor.get()!!
     private val manager = factory.create(currentServer)
     private val client = manager.client
-    private val userId = userHelper.user()?.id
+    private val currentUserId = userHelper.user()?.id
 
     fun loadUserDetails(userId: String) {
         launchUI(strategy) {
@@ -49,38 +48,41 @@ class UserDetailsPresenter @Inject constructor(
                             client.spotlight(query = query)
                         }
 
-                        val matchFromSpotlight = spotlightResult.users.firstOrNull()
+                        val matchFromSpotlight = spotlightResult.users.firstOrNull { it.username == query }
 
                         if (matchFromSpotlight != null) {
-                            with (matchFromSpotlight) {
-                                    ChatRoom(
-                                        id = "$id$userId",
-                                        type = roomTypeOf(RoomType.DIRECT_MESSAGE),
-                                        name = u.username ?: u.name.orEmpty(),
-                                        fullName = u.name,
-                                        favorite = false,
-                                        open = false,
-                                        alert = false,
-                                        status = status,
-                                        client = client,
-                                        broadcast = false,
-                                        archived = false,
-                                        default = false,
-                                        description = null,
-                                        groupMentions = null,
-                                        userMentions = null,
-                                        lastMessage = null,
-                                        lastSeen = null,
-                                        topic = null,
-                                        announcement = null,
-                                        roles = null,
-                                        unread = 0,
-                                        readonly = false,
-                                        muted = null,
-                                        subscriptionId = "",
-                                        timestamp = null,
-                                        updatedAt = null,
-                                        user = null
+                            val result = retryIO("createDirectMessage(${matchFromSpotlight.id}") {
+                                client.createDirectMessage(username = matchFromSpotlight.id)
+                            }
+                            with(matchFromSpotlight) {
+                                ChatRoom(
+                                    id = result.id,
+                                    type = roomTypeOf(RoomType.DIRECT_MESSAGE),
+                                    name = u.username ?: u.name.orEmpty(),
+                                    fullName = u.name,
+                                    favorite = false,
+                                    open = false,
+                                    alert = false,
+                                    status = status,
+                                    client = client,
+                                    broadcast = false,
+                                    archived = false,
+                                    default = false,
+                                    description = null,
+                                    groupMentions = null,
+                                    userMentions = null,
+                                    lastMessage = null,
+                                    lastSeen = null,
+                                    topic = null,
+                                    announcement = null,
+                                    roles = null,
+                                    unread = 0,
+                                    readonly = false,
+                                    muted = null,
+                                    subscriptionId = "",
+                                    timestamp = null,
+                                    updatedAt = null,
+                                    user = null
                                 )
                             }
                         } else null
@@ -100,6 +102,10 @@ class UserDetailsPresenter @Inject constructor(
         }
     }
 
+    fun createDirectMessage(username: String) {
+
+    }
+
     private suspend fun chatRoomByName(name: String? = null): List<ChatRoom> = withContext(CommonPool) {
         return@withContext dbManager.chatRoomDao().getAllSync().filter {
             if (name == null) {

From 04a833e4cb31f9ef063feab53f48616a2c3282f2 Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Fri, 7 Dec 2018 21:14:12 +0530
Subject: [PATCH 077/149] update strings.xml

---
 app/src/main/res/values-hi-rIN/strings.xml | 47 +++++++++++-----------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 2e2a0f0fab..2de7b45dc2 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -22,9 +22,9 @@
     <string name="title_update_profile">प्रोफ़ाइल अपडेट करें</string>
     <string name="title_about">परिचय</string>
     <string name="title_create_channel">चैनल बनाएं</string>
-    <string name="title_licence">Licence</string> <!-- TODO Add translation -->
-    <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
-    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_licence">लाइसेंस</string>
+    <string name="title_are_you_sure">क्या आपको यकीन है?</string>
+    <string name="title_channel_details">चैनल विवरण</string>
     <string name="title_topic">विषय</string>
     <string name="title_announcement">घोषणा</string>
     <string name="title_description">विवरण</string>
@@ -40,7 +40,7 @@
     <string name="action_create_channel">चैनल बनाएं</string>
     <string name="action_create">बनाएं</string>
     <string name="action_logout">लोग आउट करें</string>
-    <string name="action_attach_a_files">Attach a file</string> <!-- TODO Add translation -->
+    <string name="action_attach_a_files">एक फ़ाइल जोडो</string>
     <string name="action_confirm_password">पासवर्ड परिवर्तन की पुष्टि करें</string>
     <string name="action_join_chat">चैट में शामिल हों</string>
     <string name="action_add_account">खाता जोड़ो</string>
@@ -58,17 +58,17 @@
     <string name="action_create_server">नया सर्वर बनाएं</string>
     <string name="action_register">रजिस्टर</string>
     <string name="action_confirm">पुष्टि करें</string>
-    <string name="action_delete_account">Delete account</string> <!-- TODO Add translation -->
+    <string name="action_delete_account">खाता हटा दो</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
-        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
-        <item name="item_password">Change password</item> <!-- TODO Add translation -->
-        <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
-        <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
-        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
-        <item name="item_licence">Licence</item> <!-- TODO Add translation -->
-        <item name="item_about">About</item> <!-- TODO Add translation -->
+        <item name="item_preferences">पसंद</item>
+        <item name="item_password">पासवर्ड बदलें</item>
+        <item name="item_share_app">ऐप शेयर करें</item>
+        <item name="item_rate_us">हमें रेटिंग दें</item>
+        <item name="item_contact_us">हमसे संपर्क करें</item>
+        <item name="item_licence">लाइसेंस</item>
+        <item name="item_about">के बारे में</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -177,18 +177,18 @@
     <string name="msg_channel_created_successfully">चैनल सफलतापूर्वक बनाया गया</string>
     <string name="msg_view_more">और देखें</string>
     <string name="msg_view_less">कम देखें</string>
-    <string name="msg_permalink_copied">Permalink copied</string> <!-- TODO - Add proper translation -->
-    <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
-    <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
-    <string name="msg_muted_on_this_channel">You are muted on this channel</string> <!-- TODO - Add proper translation -->
-    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
-    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
-    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
+    <string name="msg_permalink_copied">पर्मलिंक की प्रतिलिपि बनाई गई</string>
+    <string name="msg_send_email">ईमेल भेजें</string>
+    <string name="msg_android_app_support">एंड्रॉइड ऐप समर्थन</string>
+    <string name="msg_muted_on_this_channel">आप इस चैनल पर म्यूट कर रहे हैं</string>
+    <string name="msg_no_topic">कोई विषय नहीं जोड़ा गया</string>
+    <string name="msg_no_announcement">कोई घोषणा नहीं जोड़ा गया</string>
+    <string name="msg_no_description">कोई विवरण नहीं जोड़ा गया</string>
 
     <plurals name="msg_reacted_with_">
-        <item quantity="one">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
-        <item quantity="few">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
-        <item quantity="many">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
+        <item quantity="one">% 1 $ s ने% 2 $ %d s के साथ प्रतिक्रिया व्यक्त की</item>
+        <item quantity="few">% 1 $ s ने% 2 $ s के साथ प्रतिक्रिया व्यक्त की</item>
+        <item quantity="many">% 1 $ s ने% 2 $ s के साथ प्रतिक्रिया व्यक्त की</item>
     </plurals>
 
     <!-- Preferences messages -->
@@ -226,8 +226,7 @@
     <string name="action_msg_share">शेयर करें</string>
     <string name="action_title_editing">संपादन संदेश</string>
     <string name="action_msg_add_reaction">प्रतिक्रिया जोड़ें</string>
-    <!-- TODO - Add proper translation -->
-    <string name="action_msg_copy_permalink">Copy permalink</string>
+    <string name="action_msg_copy_permalink">परमालिंक कॉपी करें</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">संपादन की अनुमति नहीं है</string>

From 1c5e33febbe1f090cef7ad231cac9e1d4172b564 Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Fri, 7 Dec 2018 21:53:51 +0530
Subject: [PATCH 078/149] update (IT)strings.xml

---
 app/src/main/res/values-it/strings.xml | 32 +++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b08403a058..199224fa7a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -22,9 +22,9 @@
     <string name="title_update_profile">Aggiorna Profilo</string>
     <string name="title_about">Informazioni</string>
     <string name="title_create_channel">Crea Canale</string>
-    <string name="title_licence">Licence</string> <!-- TODO ADD translation -->
+    <string name="title_licence">Ceadúnas</string>
     <string name="title_are_you_sure">Sei sicuro che vuoi uscire ?</string>
-    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_channel_details">Sonraí na Channel</string>
     <string name="title_topic">Argomento</string>
     <string name="title_announcement">Annuncio</string>
     <string name="title_description">Descrizione</string>
@@ -40,7 +40,7 @@
     <string name="action_create_channel">Crea canale</string>
     <string name="action_create">Crea</string>
     <string name="action_logout">Disconnettersi</string>
-    <string name="action_attach_a_files">Attach a file</string> <!-- TODO ADD translation -->
+    <string name="action_attach_a_files">Ceangail comhad</string>
     <string name="action_confirm_password">Conferma Cambio Password</string>
     <string name="action_join_chat">Iscriviti alla stanza</string>
     <string name="action_add_account">Aggiungi utente</string>
@@ -51,7 +51,7 @@
     <string name="action_drawing">Disegno</string>
     <string name="action_save_to_gallery">Salva in galleria</string>
     <string name="action_select_photo_from_gallery">Seleziona foto dalla galleria</string>
-    <string name="action_take_a_photo">Take a photo</string> <!-- TODO ADD translation -->
+    <string name="action_take_a_photo">Tóg grianghraf</string>
     <string name="action_reset_avatar">Reimposta avatar</string>
     <string name="action_connect_server">Collegati a un server</string>
     <string name="action_join_community">Entra nella community</string>
@@ -62,13 +62,13 @@
 
     <!-- Settings List -->
     <string-array name="settings_actions">
-        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
-        <item name="item_password">Change password</item> <!-- TODO Add translation -->
-        <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
-        <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
-        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
-        <item name="item_licence">Licence</item> <!-- TODO Add translation -->
-        <item name="item_about">About</item> <!-- TODO Add translation -->
+        <item name="item_preferences">Roghanna</item>
+        <item name="item_password">Athraigh do phasfhocal</item>
+        <item name="item_share_app">Comhroinn app</item>
+        <item name="item_rate_us">Ráta linn</item>
+        <item name="item_contact_us">Glaoigh orainn</item>
+        <item name="item_licence">Ceadúnas</item>
+        <item name="item_about">Faoi</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -158,11 +158,11 @@
     <string name="msg_two_factor_authentication">Autenticazione a 2 fattori (2FA)</string>
     <string name="msg__your_2fa_code">Qual è il tuo codice 2FA ?</string>
     <string name="msg_permalink_copied">Permalink copiato</string>
-    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
-    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
-    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
-    <string name="msg_send_email">Send email</string>
-    <string name="msg_android_app_support">Android app support</string>
+    <string name="msg_no_topic">Níl aon ábhar curtha leis</string>
+    <string name="msg_no_announcement">Níor cuireadh fógra leis</string>
+    <string name="msg_no_description">Níor cuireadh cur síos ar bith</string>
+    <string name="msg_send_email">Seol r-phost</string>
+    <string name="msg_android_app_support">Tacaíocht app Android</string>
 
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s ha reagito con %2$s</item>

From 0e4b3810051faf3fff4b314942d931b956847419 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Fri, 7 Dec 2018 14:57:14 -0300
Subject: [PATCH 079/149] Shows mentions with @ symbol

---
 .../chatroom/di/ChatRoomFragmentModule.kt     |  2 --
 .../chatrooms/adapter/RoomUiModelMapper.kt    | 12 ++++++++-
 .../chatrooms/adapter/RoomViewHolder.kt       | 26 ++++++-------------
 .../chatrooms/adapter/model/RoomUiModel.kt    |  1 +
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt b/app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt
index 72bc966e19..6cbd5ddce2 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt
@@ -9,9 +9,7 @@ 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.db.UserDao
-import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.GetCurrentUserInteractor
 import chat.rocket.android.server.domain.PermissionsInteractor
 import chat.rocket.android.server.domain.SettingsRepository
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt b/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt
index 4d2dbb4160..3caf330574 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt
@@ -126,8 +126,8 @@ class RoomUiModelMapper(
             } else {
                 null
             }
+            val hasMentions = mapMentions(userMentions, groupMentions)
             val open = open
-
             val lastMessageMarkdown =
                 lastMessage?.let { Markwon.markdown(context, it.toString()).toString() }
 
@@ -139,6 +139,7 @@ class RoomUiModelMapper(
                 open = open,
                 date = timestamp,
                 unread = unread,
+                mentions = hasMentions,
                 alert = isUnread,
                 lastMessage = lastMessageMarkdown,
                 status = status,
@@ -203,5 +204,14 @@ class RoomUiModelMapper(
         }
     }
 
+    private fun mapMentions(userMentions: Long?, groupMentions: Long?): Boolean {
+        if (userMentions != null && groupMentions != null) {
+            if (userMentions > 0 || groupMentions > 0) {
+                return true
+            }
+        }
+        return false
+    }
+
     private fun mapDate(date: Long?): CharSequence? = date?.localDateTime()?.date(context)
 }
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt b/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt
index c489bbf7c2..44c235e1a8 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt
@@ -49,29 +49,19 @@ class RoomViewHolder(itemView: View, private val listener: (RoomUiModel) -> Unit
                 text_timestamp.isInvisible = true
             }
 
-            if (room.unread != null) {
-                text_total_unread_messages.text = room.unread
+            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_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
             } else {
+                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
             }
 
-            context?.let {
-                if (room.alert || room.unread != null) {
-                    text_timestamp.setTextAppearance(it, R.style.ChatList_Timestamp_Unread_TextView)
-                    text_last_message.setTextAppearance(
-                        it,
-                        R.style.ChatList_LastMessage_Unread_TextView
-                    )
-                    text_total_unread_messages.text = "!"
-                    text_total_unread_messages.isVisible = true
-                } else {
-                    text_timestamp.setTextAppearance(it, R.style.ChatList_Timestamp_TextView)
-                    text_last_message.setTextAppearance(it, R.style.ChatList_LastMessage_TextView)
-                    text_total_unread_messages.isInvisible = true
-                }
-            }
-
             setOnClickListener { listener(room) }
         }
     }
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/adapter/model/RoomUiModel.kt b/app/src/main/java/chat/rocket/android/chatrooms/adapter/model/RoomUiModel.kt
index dcca0406de..857e87f6f3 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/adapter/model/RoomUiModel.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/adapter/model/RoomUiModel.kt
@@ -12,6 +12,7 @@ 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,

From 1032d8e48108d3799c7c4e42da23a599063c7663 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Fri, 7 Dec 2018 15:10:11 -0300
Subject: [PATCH 080/149] Adds unread chat room name style.

---
 .../rocket/android/chatrooms/adapter/RoomViewHolder.kt   | 2 ++
 app/src/main/res/values/styles.xml                       | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt b/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt
index 44c235e1a8..49555ca679 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt
@@ -53,10 +53,12 @@ class RoomViewHolder(itemView: View, private val listener: (RoomUiModel) -> Unit
                 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
             } else {
+                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
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index dda40047f4..24387c15a2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -108,13 +108,18 @@
     <!-- Chat list -->
     <style name="ChatList.ChatName.TextView" parent="TextAppearance.AppCompat.Title">
         <item name="android:textSize">16sp</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textStyle">bold</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textStyle">normal</item>
         <item name="android:textColor">@color/colorPrimary</item>
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">1</item>
     </style>
 
+    <style name="ChatList.ChatName.Unread.TextView" parent="ChatList.ChatName.TextView">
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
     <style name="ChatList.LastMessage.TextView" parent="TextAppearance.AppCompat.Title">
         <item name="android:textSize">14sp</item>
         <item name="android:fontFamily">sans-serif</item>

From 3a5d33f20a9a746258115d02ee02329277086c2a Mon Sep 17 00:00:00 2001
From: Rafael Kellermann Streit <rafaelks@me.com>
Date: Fri, 7 Dec 2018 18:27:23 -0200
Subject: [PATCH 081/149] Update build.gradle

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5b18932936..b2c2a5cbb2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,7 +16,7 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 2051
+        versionCode 2052
         versionName "3.2.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true

From 57507918f7156b9afd5984c2f3a7b7db0425d1d0 Mon Sep 17 00:00:00 2001
From: Leonardo Aramaki <leoaramaki@gmail.com>
Date: Mon, 26 Nov 2018 00:57:34 -0200
Subject: [PATCH 082/149] Show Report message action to context menu

---
 .../chatroom/adapter/ChatRoomAdapter.kt       |  16 +++
 .../presentation/ChatRoomPresenter.kt         |  13 ++
 .../android/chatroom/ui/ChatRoomFragment.kt   |  35 +++++
 app/src/main/res/layout/dialog_report.xml     | 129 ++++++++++++++++++
 app/src/main/res/menu/message_actions.xml     |  20 +--
 app/src/main/res/values-de/strings.xml        |   6 +
 app/src/main/res/values-es/strings.xml        |   5 +
 app/src/main/res/values-fr/strings.xml        |   9 +-
 app/src/main/res/values-hi-rIN/strings.xml    |   8 ++
 app/src/main/res/values-it/strings.xml        |  10 +-
 app/src/main/res/values-ja/strings.xml        |  10 +-
 app/src/main/res/values-pt-rBR/strings.xml    |   8 ++
 app/src/main/res/values-ru-rRU/strings.xml    |   8 ++
 app/src/main/res/values-tr/strings.xml        |   6 +
 app/src/main/res/values-uk/strings.xml        |   8 ++
 app/src/main/res/values/strings.xml           |   7 +-
 16 files changed, 285 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/res/layout/dialog_report.xml

diff --git a/app/src/main/java/chat/rocket/android/chatroom/adapter/ChatRoomAdapter.kt b/app/src/main/java/chat/rocket/android/chatroom/adapter/ChatRoomAdapter.kt
index 8fd2e2af95..b13174a6a6 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/adapter/ChatRoomAdapter.kt
+++ b/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)
     }
 }
diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
index a6f32158aa..15a736059a 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
@@ -60,6 +60,7 @@ import chat.rocket.core.internal.rest.joinChat
 import chat.rocket.core.internal.rest.markAsRead
 import chat.rocket.core.internal.rest.messages
 import chat.rocket.core.internal.rest.pinMessage
+import chat.rocket.core.internal.rest.reportMessage
 import chat.rocket.core.internal.rest.runCommand
 import chat.rocket.core.internal.rest.searchMessages
 import chat.rocket.core.internal.rest.sendMessage
@@ -373,6 +374,18 @@ class ChatRoomPresenter @Inject constructor(
         }
     }
 
+    fun reportMessage(messageId: String, description: String) {
+        launchUI(strategy) {
+            try {
+                retryIO("reportMessage($messageId, $description)") {
+                    client.reportMessage(messageId = messageId, description = description)
+                }
+            } catch (ex: RocketChatException) {
+                Timber.e(ex)
+            }
+        }
+    }
+
     fun selectFile() {
         view.showFileSelection(settings.uploadMimeTypeFilter())
     }
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index ff0ba7490d..68f8545901 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -86,6 +86,8 @@ import dagger.android.support.AndroidSupportInjection
 import io.reactivex.Observable
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
+import kotlinx.android.synthetic.main.dialog_report.view.*
+import kotlinx.android.synthetic.main.emoji_image_row_item.*
 import kotlinx.android.synthetic.main.emoji_image_row_item.view.*
 import kotlinx.android.synthetic.main.emoji_row_item.view.*
 import kotlinx.android.synthetic.main.fragment_chat_room.*
@@ -93,6 +95,7 @@ import kotlinx.android.synthetic.main.message_attachment_options.*
 import kotlinx.android.synthetic.main.message_composer.*
 import kotlinx.android.synthetic.main.message_list.*
 import kotlinx.android.synthetic.main.reaction_praises_list_item.view.*
+import kotlinx.android.synthetic.main.reaction_praises_list_item.*
 import timber.log.Timber
 import java.io.File
 import java.io.IOException
@@ -1169,4 +1172,36 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     override fun sendMessage(chatRoomId: String, text: String) {
         presenter.sendMessage(chatRoomId, text, null)
     }
+
+    override fun reportMessage(id: String) {
+        val root = LayoutInflater.from(requireContext()).inflate(R.layout.dialog_report, null)
+        val disposable = CompositeDisposable()
+
+        val dialog = androidx.appcompat.app.AlertDialog.Builder(requireContext())
+            .setTitle(R.string.action_msg_report)
+            .setCancelable(true)
+            .setView(root)
+            .setOnDismissListener {
+                disposable.clear()
+            }
+            .show()
+
+        with(root) {
+            disposable.add(
+                edit_text_description.asObservable()
+                    .skip(1)
+                    .subscribe { if (it.isNotEmpty()) text_view_error.fadeOut() }
+            )
+
+            button_send_report.setOnClickListener {
+                val description = edit_text_description.text.toString()
+                if (description.isBlank()) {
+                    text_view_error.fadeIn()
+                } else {
+                    dialog.dismiss()
+                    presenter.reportMessage(messageId = id, description = description)
+                }
+            }
+        }
+    }
 }
diff --git a/app/src/main/res/layout/dialog_report.xml b/app/src/main/res/layout/dialog_report.xml
new file mode 100644
index 0000000000..cbb541084c
--- /dev/null
+++ b/app/src/main/res/layout/dialog_report.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"-->
+    <!--xmlns:app="http://schemas.android.com/apk/res-auto"-->
+    <!--xmlns:tools="http://schemas.android.com/tools"-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="wrap_content"-->
+    <!--android:fillViewport="true">-->
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="16dp">
+
+        <!--<com.google.android.material.appbar.AppBarLayout-->
+        <!--android:id="@+id/appBarLayout"-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:background="@color/colorPrimary"-->
+        <!--android:theme="@style/Theme.AppCompat.Light.NoActionBar">-->
+
+        <!--<androidx.appcompat.widget.Toolbar-->
+        <!--android:id="@+id/toolbar"-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="?attr/actionBarSize"-->
+        <!--app:layout_scrollFlags="scroll|enterAlways"-->
+        <!--app:navigationIcon="?android:attr/homeAsUpIndicator"-->
+        <!--app:popupTheme="@style/ThemeOverlay.AppCompat.Light"-->
+        <!--app:theme="@style/ActionModeStyle">-->
+
+        <!--<RelativeLayout-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="wrap_content">-->
+
+        <!--<TextView-->
+        <!--android:id="@+id/text_change_password"-->
+        <!--android:layout_width="wrap_content"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:layout_alignParentStart="true"-->
+        <!--android:ellipsize="end"-->
+        <!--android:maxLines="1"-->
+        <!--android:text="@string/action_msg_report"-->
+        <!--android:textColor="@color/colorWhite"-->
+        <!--android:textSize="18sp"-->
+        <!--android:textStyle="bold" />-->
+        <!--</RelativeLayout>-->
+        <!--</androidx.appcompat.widget.Toolbar>-->
+
+        <!--</com.google.android.material.appbar.AppBarLayout>-->
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline_start"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_begin="24dp" />
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline_end"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_end="24dp" />
+
+        <!--<TextView-->
+        <!--android:id="@+id/text_view_report_label"-->
+        <!--android:layout_width="wrap_content"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:text="Description"-->
+        <!--android:textColor="@color/darkGray"-->
+        <!--app:layout_constraintStart_toStartOf="@+id/guideline_start"-->
+        <!--app:layout_constraintTop_toTopOf="parent" />-->
+
+        <!--<TextView-->
+        <!--android:id="@+id/text_view_required"-->
+        <!--android:layout_width="0dp"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:layout_marginStart="8dp"-->
+        <!--android:text="(required)"-->
+        <!--android:textColor="@color/darkGray"-->
+        <!--android:textSize="14sp"-->
+        <!--app:layout_constraintEnd_toEndOf="@+id/guideline_end"-->
+        <!--app:layout_constraintStart_toEndOf="@id/text_view_report_label"-->
+        <!--app:layout_constraintTop_toTopOf="parent" />-->
+
+        <EditText
+            android:id="@+id/edit_text_description"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:inputType="textCapSentences|textMultiLine"
+            android:maxLines="4"
+            android:overScrollMode="always"
+            android:scrollbarStyle="insideInset"
+            android:scrollbars="vertical"
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="@+id/guideline_end"
+            app:layout_constraintStart_toStartOf="@+id/guideline_start"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="Jot something untoward..." />
+
+        <TextView
+            android:id="@+id/text_view_error"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@string/required"
+            android:textColor="@color/colorRed"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="@+id/guideline_end"
+            app:layout_constraintStart_toStartOf="@+id/guideline_start"
+            app:layout_constraintTop_toBottomOf="@+id/edit_text_description"
+            tools:visibility="visible" />
+
+        <Button
+            android:id="@+id/button_send_report"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:background="@drawable/rounded_color_accent"
+            android:fontFamily="sans-serif-medium"
+            android:text="@string/submit"
+            android:textColor="@android:color/white"
+            app:layout_constraintEnd_toEndOf="@+id/guideline_end"
+            app:layout_constraintStart_toStartOf="@+id/guideline_start"
+            app:layout_constraintTop_toBottomOf="@id/text_view_error" />1
+    </androidx.constraintlayout.widget.ConstraintLayout>
+<!--</androidx.core.widget.NestedScrollView>-->
diff --git a/app/src/main/res/menu/message_actions.xml b/app/src/main/res/menu/message_actions.xml
index 7a30f225d4..fa66f757a5 100644
--- a/app/src/main/res/menu/message_actions.xml
+++ b/app/src/main/res/menu/message_actions.xml
@@ -6,11 +6,19 @@
         android:id="@+id/action_message_info"
         android:icon="@drawable/ic_action_message_info_outline_24dp"
         android:title="@string/action_msg_info" />
-
     <item
         android:id="@+id/action_message_reply"
         android:icon="@drawable/ic_action_message_reply_24dp"
         android:title="@string/action_msg_reply" />
+    <item
+        android:id="@+id/action_message_edit"
+        android:icon="@drawable/ic_action_message_edit_24dp"
+        android:title="@string/action_msg_edit" />
+
+    <item
+        android:id="@+id/action_menu_msg_react"
+        android:icon="@drawable/ic_add_reaction"
+        android:title="@string/action_msg_add_reaction" />
 
     <item
         android:id="@+id/action_message_permalink"
@@ -27,11 +35,6 @@
         android:icon="@drawable/ic_action_message_copy_24dp"
         android:title="@string/action_msg_copy" />
 
-    <item
-        android:id="@+id/action_menu_msg_react"
-        android:icon="@drawable/ic_add_reaction"
-        android:title="@string/action_msg_add_reaction" />
-
     <!--<item-->
     <!--android:id="@+id/action_menu_msg_share"-->
     <!--andrtextIconicon="@drawable/ic_share_black_24px"-->
@@ -48,9 +51,8 @@
         android:title="@string/action_msg_pin" />
 
     <item
-        android:id="@+id/action_message_edit"
-        android:icon="@drawable/ic_action_message_edit_24dp"
-        android:title="@string/action_msg_edit" />
+        android:id="@+id/action_message_report"
+        android:title="@string/action_msg_report" />
 
     <item
         android:id="@+id/action_message_delete"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ae8f7ad7e4..9c7220476b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -225,6 +225,8 @@
     <string name="action_msg_add_reaction">Reaktion hinzufügen</string>
     <!-- TODO - Add proper translation -->
     <string name="action_msg_copy_permalink">Copy permalink</string>
+    <!-- TODO - Add proper translation -->
+    <string name="action_msg_report">Report</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">Bearbeiten nicht erlaubt</string>
@@ -334,4 +336,8 @@
     <!-- User Details -->
     <string name="message">Message</string> <!--TODO - Add proper translation-->
     <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
+
+    <!-- Report -->
+    <string name="submit">Submit</string>
+    <string name="required">*required</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 887f347232..9caedc743d 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -220,6 +220,8 @@
     <string name="action_title_editing">Edición de mensaje</string>
     <string name="action_msg_add_reaction">Añadir una reacción</string>
     <string name="action_msg_copy_permalink">Copiar permalink</string>
+    <!-- TODO - Add proper translation -->
+    <string name="action_msg_report">Report</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">La edición no és permitida</string>
@@ -335,4 +337,7 @@
     <!-- User Details -->
     <string name="message">Message</string> <!-- TODO - Add proper translation -->
     <string name="timezone">Timezone</string> <!-- TODO - Add proper translation -->
+    <!-- Report -->
+    <string name="submit">Submit</string> <!--TODO - Add proper translation-->
+    <string name="required">*required</string> <!--TODO - Add proper translation-->
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4ed69c0900..62c3758cfa 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -226,6 +226,8 @@
     <string name="action_msg_add_reaction">Ajouter une réaction</string>
     <!-- TODO - Add proper translation -->
     <string name="action_msg_copy_permalink">Copy permalink</string>
+    <!-- TODO - Add proper translation -->
+    <string name="action_msg_report">Report</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">L\'édition n\'est pas autorisée</string>
@@ -340,4 +342,9 @@
     <string name="message">Message</string>
     <!-- TODO - Add proper translation -->
     <string name="timezone">Timezone</string>
-</resources>
\ No newline at end of file
+    <!-- Report -->
+    <!--TODO - Add proper translation-->
+    <string name="submit">Submit</string>
+    <!--TODO - Add proper translation-->
+    <string name="required">*required</string>
+</resources>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 7d2971575e..ef8ecdf830 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -227,6 +227,8 @@
     <string name="action_title_editing">संपादन संदेश</string>
     <string name="action_msg_add_reaction">प्रतिक्रिया जोड़ें</string>
     <string name="action_msg_copy_permalink">परमालिंक कॉपी करें</string>
+    <!-- TODO - Add proper translation -->
+    <string name="action_msg_report">Report</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">संपादन की अनुमति नहीं है</string>
@@ -339,4 +341,10 @@
     <string name="message">Message</string>
     <!-- TODO - Add proper translation -->
     <string name="timezone">Timezone</string>
+
+    <!-- Report -->
+    <!--TODO - Add proper translation-->
+    <string name="submit">Submit</string>
+    <!--TODO - Add proper translation-->
+    <string name="required">*required</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index ea9cb4df4e..0855badff3 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -222,7 +222,9 @@
     <string name="action_msg_share">Condividi</string>
     <string name="action_title_editing">Modifica messaggio</string>
     <string name="action_msg_add_reaction">Aggiungi reazione</string>
-    <string name="action_msg_copy_permalink">Copia permalink</string>3
+    <string name="action_msg_copy_permalink">Copia permalink</string>
+    <!-- TODO - Add proper translation -->
+    <string name="action_msg_report">Report</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">La modifica non è consentita</string>
@@ -334,4 +336,10 @@
     <string name="message">Message</string>
     <!-- TODO - Add proper translation -->
     <string name="timezone">Timezone</string>
+
+    <!-- Report -->
+    <!--TODO - Add proper translation-->
+    <string name="submit">Submit</string>
+    <!--TODO - Add proper translation-->
+    <string name="required">*required</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 534ccce063..118ce92046 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -228,6 +228,8 @@
     <string name="action_title_editing">メッセージの編集</string>
     <string name="action_msg_add_reaction">リアクションする</string>
     <string name="action_msg_copy_permalink">パーマリンクのコピー</string>
+    <!-- TODO - Add proper translation -->
+    <string name="action_msg_report">Report</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">編集は許可されていません</string>
@@ -341,4 +343,10 @@
     <string name="message">Message</string>
     <!-- TODO - Add proper translation -->
     <string name="timezone">Timezone</string>
-</resources>
\ No newline at end of file
+
+    <!-- Report -->
+    <!--TODO - Add proper translation-->
+    <string name="submit">Submit</string>
+    <!--TODO - Add proper translation-->
+    <string name="required">*required</string>
+</resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index f401ee6612..2a65a86194 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -225,6 +225,8 @@
     <string name="action_title_editing">Editando mensagem</string>
     <string name="action_msg_add_reaction">Adicionar reação</string>
     <string name="action_msg_copy_permalink">Copiar permalink</string>
+    <!-- TODO - Add proper translation -->
+    <string name="action_msg_report">Reportar</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">Edição não permitida</string>
@@ -338,4 +340,10 @@
     <string name="message">Mensagem</string>
     <!-- TODO - Add proper translation -->
     <string name="timezone">Fuso horário</string>
+
+    <!-- Report -->
+    <!--TODO - Add proper translation-->
+    <string name="submit">Enviar</string>
+    <!--TODO - Add proper translation-->
+    <string name="required">*obrigatório</string>
 </resources>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 45be7b121f..123f2030e3 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -224,6 +224,8 @@
     <string name="action_title_editing">Редактирование сообщения</string>
     <string name="action_msg_add_reaction">Отреагировать</string>
     <string name="action_msg_copy_permalink">Копировать ссылку</string>
+    <!-- TODO - Add proper translation -->
+    <string name="action_msg_report">Report</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">Редактирование запрещено</string>
@@ -336,4 +338,10 @@
     <string name="message">Message</string>
     <!-- TODO - Add proper translation -->
     <string name="timezone">Timezone</string>
+
+    <!-- Report -->
+    <!--TODO - Add proper translation-->
+    <string name="submit">Submit</string>
+    <!--TODO - Add proper translation-->
+    <string name="required">*required</string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 3a69268967..56e6d7b0ec 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -228,6 +228,8 @@
     <string name="action_msg_add_reaction">Tepki Ekle</string>
     <!-- TODO - Add proper translation -->
     <string name="action_msg_copy_permalink">Copy permalink</string>
+    <!-- TODO - Add proper translation -->
+    <string name="action_msg_report">Report</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">Düzenlemeye izin verilmiyor</string>
@@ -337,4 +339,8 @@
     <!-- User Details -->
     <string name="message">Message</string> <!--TODO - Add proper translation-->
     <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
+
+    <!-- Report -->
+    <string name="submit">Submit</string> <!--TODO - Add proper translation-->
+    <string name="required">*required</string> <!--TODO - Add proper translation-->
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index e5ff83d5ea..432fafad59 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -224,6 +224,8 @@
     <string name="action_msg_add_reaction">Відреагувати</string>
     <!-- TODO - Add proper translation -->
     <string name="action_msg_copy_permalink">Copy permalink</string>
+    <!-- TODO - Add proper translation -->
+    <string name="action_msg_report">Report</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">Редагування заборонено</string>
@@ -338,4 +340,10 @@
     <string name="message">Message</string>
     <!-- TODO - Add proper translation -->
     <string name="timezone">Timezone</string>
+
+    <!-- Report -->
+    <!--TODO - Add proper translation-->
+    <string name="submit">Submit</string>
+    <!--TODO - Add proper translation-->
+    <string name="required">*required</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d1e592aeeb..f4be3c63b8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -240,6 +240,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="action_title_editing">Editing Message</string>
     <string name="action_msg_add_reaction">Add reaction</string>
     <string name="action_msg_copy_permalink">Copy permalink</string>
+    <string name="action_msg_report">Report</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">Editing is not allowed</string>
@@ -352,4 +353,8 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="message">Message</string>
     <string name="timezone">Timezone</string>
     <string name="status" translatable="false">Status</string>
-</resources>
\ No newline at end of file
+
+    <!-- Report -->
+    <string name="submit">Submit</string>
+    <string name="required">*required</string>
+</resources>

From c16a1d36351eab4b64df9929b31946223a410fb1 Mon Sep 17 00:00:00 2001
From: Leonardo Aramaki <leoaramaki@gmail.com>
Date: Mon, 26 Nov 2018 13:38:53 -0200
Subject: [PATCH 083/149] Add icon and localization strings to the report
 feature

---
 .../presentation/ChatRoomPresenter.kt         |  1 +
 .../android/chatroom/ui/ChatRoomFragment.kt   | 34 ++-----------------
 .../ic_action_message_report_24dp.xml         | 10 ++++++
 app/src/main/res/menu/message_actions.xml     |  4 +--
 app/src/main/res/values-de/strings.xml        |  5 +--
 app/src/main/res/values-es/strings.xml        |  1 +
 app/src/main/res/values-fr/strings.xml        |  2 ++
 app/src/main/res/values-hi-rIN/strings.xml    |  2 ++
 app/src/main/res/values-it/strings.xml        |  2 ++
 app/src/main/res/values-ja/strings.xml        |  2 ++
 app/src/main/res/values-pt-rBR/strings.xml    |  3 +-
 app/src/main/res/values-ru-rRU/strings.xml    |  2 ++
 app/src/main/res/values-tr/strings.xml        |  1 +
 app/src/main/res/values-uk/strings.xml        |  2 ++
 app/src/main/res/values/strings.xml           |  1 +
 15 files changed, 34 insertions(+), 38 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_action_message_report_24dp.xml

diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
index 15a736059a..64aefc4c66 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
@@ -380,6 +380,7 @@ class ChatRoomPresenter @Inject constructor(
                 retryIO("reportMessage($messageId, $description)") {
                     client.reportMessage(messageId = messageId, description = description)
                 }
+                view.showMessage(R.string.report_sent)
             } catch (ex: RocketChatException) {
                 Timber.e(ex)
             }
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index 68f8545901..26b8431dfa 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -86,8 +86,6 @@ import dagger.android.support.AndroidSupportInjection
 import io.reactivex.Observable
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
-import kotlinx.android.synthetic.main.dialog_report.view.*
-import kotlinx.android.synthetic.main.emoji_image_row_item.*
 import kotlinx.android.synthetic.main.emoji_image_row_item.view.*
 import kotlinx.android.synthetic.main.emoji_row_item.view.*
 import kotlinx.android.synthetic.main.fragment_chat_room.*
@@ -95,7 +93,6 @@ import kotlinx.android.synthetic.main.message_attachment_options.*
 import kotlinx.android.synthetic.main.message_composer.*
 import kotlinx.android.synthetic.main.message_list.*
 import kotlinx.android.synthetic.main.reaction_praises_list_item.view.*
-import kotlinx.android.synthetic.main.reaction_praises_list_item.*
 import timber.log.Timber
 import java.io.File
 import java.io.IOException
@@ -1174,34 +1171,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     }
 
     override fun reportMessage(id: String) {
-        val root = LayoutInflater.from(requireContext()).inflate(R.layout.dialog_report, null)
-        val disposable = CompositeDisposable()
-
-        val dialog = androidx.appcompat.app.AlertDialog.Builder(requireContext())
-            .setTitle(R.string.action_msg_report)
-            .setCancelable(true)
-            .setView(root)
-            .setOnDismissListener {
-                disposable.clear()
-            }
-            .show()
-
-        with(root) {
-            disposable.add(
-                edit_text_description.asObservable()
-                    .skip(1)
-                    .subscribe { if (it.isNotEmpty()) text_view_error.fadeOut() }
-            )
-
-            button_send_report.setOnClickListener {
-                val description = edit_text_description.text.toString()
-                if (description.isBlank()) {
-                    text_view_error.fadeIn()
-                } else {
-                    dialog.dismiss()
-                    presenter.reportMessage(messageId = id, description = description)
-                }
-            }
-        }
+        presenter.reportMessage(messageId = id,
+            description = "This message was reported by a user from the Android app")
     }
 }
diff --git a/app/src/main/res/drawable/ic_action_message_report_24dp.xml b/app/src/main/res/drawable/ic_action_message_report_24dp.xml
new file mode 100644
index 0000000000..f789e51484
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_message_report_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+
+    <path
+        android:fillColor="@color/actionMenuColor"
+        android:pathData="M10.11,16.546h-0.183c-4.329,0 -7.47,-2.753 -7.47,-6.546 0,-3.61 2.942,-6.547 6.56,-6.547 3.616,0 6.56,2.937 6.56,6.547 0,0.59 -0.276,1.18 -0.567,1.803 -0.1,0.218 -0.2,0.433 -0.278,0.618 -0.756,1.626 0.731,2.41 1.364,2.743 0.098,0.051 0.224,0.117 0.326,0.178 -0.416,0.478 -1.814,1.22 -6.312,1.204m6.666,-2.667c-0.895,-0.473 -0.852,-0.567 -0.71,-0.875 0.081,-0.193 0.172,-0.389 0.264,-0.587 0.33,-0.705 0.703,-1.505 0.703,-2.417 0,-4.412 -3.597,-8 -8.017,-8S1,5.588 1,10c0,4.635 3.755,8 8.927,8h0.382c2.857,0 6.632,-0.256 7.565,-2.237 0.493,-1.046 -0.58,-1.612 -1.098,-1.884" />
+</vector>
diff --git a/app/src/main/res/menu/message_actions.xml b/app/src/main/res/menu/message_actions.xml
index fa66f757a5..62b7506f94 100644
--- a/app/src/main/res/menu/message_actions.xml
+++ b/app/src/main/res/menu/message_actions.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/action_message_info"
@@ -52,6 +51,7 @@
 
     <item
         android:id="@+id/action_message_report"
+        android:icon="@drawable/ic_action_message_report_24dp"
         android:title="@string/action_msg_report" />
 
     <item
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9c7220476b..f135f8eb7a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -338,6 +338,7 @@
     <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
 
     <!-- Report -->
-    <string name="submit">Submit</string>
-    <string name="required">*required</string>
+    <string name="submit">Submit</string> <!--TODO - Add proper translation-->
+    <string name="required">*required</string> <!--TODO - Add proper translation-->
+    <string name="report_sent">Your report has been sent!</string> <!--TODO - Add proper translation-->
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 9caedc743d..7236139077 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -340,4 +340,5 @@
     <!-- Report -->
     <string name="submit">Submit</string> <!--TODO - Add proper translation-->
     <string name="required">*required</string> <!--TODO - Add proper translation-->
+    <string name="report_sent">Your report has been sent!</string> <!--TODO - Add proper translation-->
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 62c3758cfa..593463cefa 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -347,4 +347,6 @@
     <string name="submit">Submit</string>
     <!--TODO - Add proper translation-->
     <string name="required">*required</string>
+    <!--TODO - Add proper translation-->
+    <string name="report_sent">Your report has been sent!</string>
 </resources>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index ef8ecdf830..33d7ac8db4 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -347,4 +347,6 @@
     <string name="submit">Submit</string>
     <!--TODO - Add proper translation-->
     <string name="required">*required</string>
+    <!--TODO - Add proper translation-->
+    <string name="report_sent">Your report has been sent!</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0855badff3..2ef522ac10 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -342,4 +342,6 @@
     <string name="submit">Submit</string>
     <!--TODO - Add proper translation-->
     <string name="required">*required</string>
+    <!--TODO - Add proper translation-->
+    <string name="report_sent">Your report has been sent!</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 118ce92046..4c33fd0d59 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -349,4 +349,6 @@
     <string name="submit">Submit</string>
     <!--TODO - Add proper translation-->
     <string name="required">*required</string>
+    <!--TODO - Add proper translation-->
+    <string name="report_sent">Your report has been sent!</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 2a65a86194..d1363b82b2 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -342,8 +342,7 @@
     <string name="timezone">Fuso horário</string>
 
     <!-- Report -->
-    <!--TODO - Add proper translation-->
     <string name="submit">Enviar</string>
-    <!--TODO - Add proper translation-->
     <string name="required">*obrigatório</string>
+    <string name="report_sent">A mensagem foi reportada!</string>
 </resources>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 123f2030e3..255dea05fc 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -344,4 +344,6 @@
     <string name="submit">Submit</string>
     <!--TODO - Add proper translation-->
     <string name="required">*required</string>
+    <!--TODO - Add proper translation-->
+    <string name="report_sent">Your report has been sent!</string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 56e6d7b0ec..77c3c60eb5 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -343,4 +343,5 @@
     <!-- Report -->
     <string name="submit">Submit</string> <!--TODO - Add proper translation-->
     <string name="required">*required</string> <!--TODO - Add proper translation-->
+    <string name="report_sent">Your report has been sent!</string> <!--TODO - Add proper translation-->
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 432fafad59..738570815c 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -346,4 +346,6 @@
     <string name="submit">Submit</string>
     <!--TODO - Add proper translation-->
     <string name="required">*required</string>
+    <!--TODO - Add proper translation-->
+    <string name="report_sent">Your report has been sent!</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f4be3c63b8..229279481f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -357,4 +357,5 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <!-- Report -->
     <string name="submit">Submit</string>
     <string name="required">*required</string>
+    <string name="report_sent">Your report has been sent!</string>
 </resources>

From 056c213a9fc1d17640e53d02c4af532796977625 Mon Sep 17 00:00:00 2001
From: Leonardo Aramaki <leoaramaki@gmail.com>
Date: Fri, 7 Dec 2018 18:05:18 -0200
Subject: [PATCH 084/149] Some usability adjustments

---
 .../chatroom/adapter/MessageViewHolder.kt     |   1 +
 .../java/chat/rocket/android/db/UserDao.kt    |   2 +-
 .../presentation/UserDetailsPresenter.kt      | 133 ++++++++++-------
 .../presentation/UserDetailsView.kt           |   4 +
 .../userdetails/ui/UserDetailsActivity.kt     | 136 +++++++++++-------
 .../main/res/layout/activity_user_details.xml |   1 +
 app/src/main/res/values-de/strings.xml        |   2 +
 app/src/main/res/values-es/strings.xml        |   3 +
 app/src/main/res/values-fr/strings.xml        |  18 ++-
 app/src/main/res/values-hi-rIN/strings.xml    |  15 +-
 app/src/main/res/values-it/strings.xml        |  17 +--
 app/src/main/res/values-ja/strings.xml        |  17 +--
 app/src/main/res/values-pt-rBR/strings.xml    |   4 +-
 app/src/main/res/values-ru-rRU/strings.xml    |  17 +--
 app/src/main/res/values-tr/strings.xml        |   2 +
 app/src/main/res/values-uk/strings.xml        |  16 +--
 app/src/main/res/values/strings.xml           |   2 +
 17 files changed, 223 insertions(+), 167 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatroom/adapter/MessageViewHolder.kt b/app/src/main/java/chat/rocket/android/chatroom/adapter/MessageViewHolder.kt
index 4e196e9dfe..dee006e6ad 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/adapter/MessageViewHolder.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/adapter/MessageViewHolder.kt
@@ -75,6 +75,7 @@ class MessageViewHolder(
 
             val senderId = data.message.sender?.id
             val subscriptionId = data.subscriptionId
+
             text_sender.setOnClickListener {
                 toUserDetails(context, senderId, subscriptionId)
             }
diff --git a/app/src/main/java/chat/rocket/android/db/UserDao.kt b/app/src/main/java/chat/rocket/android/db/UserDao.kt
index 863e1a51d5..d10304de93 100644
--- a/app/src/main/java/chat/rocket/android/db/UserDao.kt
+++ b/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) {
diff --git a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
index ceb808a609..3ff2d8c79f 100644
--- a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
@@ -2,7 +2,6 @@ package chat.rocket.android.userdetails.presentation
 
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManager
-import chat.rocket.android.helper.UserHelper
 import chat.rocket.android.server.domain.GetConnectingServerInteractor
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
 import chat.rocket.android.util.extension.launchUI
@@ -10,8 +9,8 @@ import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.model.RoomType
 import chat.rocket.common.model.roomTypeOf
+import chat.rocket.common.model.userStatusOf
 import chat.rocket.core.internal.rest.createDirectMessage
-import chat.rocket.core.internal.rest.spotlight
 import chat.rocket.core.model.ChatRoom
 import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.withContext
@@ -23,13 +22,11 @@ class UserDetailsPresenter @Inject constructor(
     private val dbManager: DatabaseManager,
     private val strategy: CancelStrategy,
     serverInteractor: GetConnectingServerInteractor,
-    factory: ConnectionManagerFactory,
-    userHelper: UserHelper
+    factory: ConnectionManagerFactory
 ) {
     private var currentServer = serverInteractor.get()!!
     private val manager = factory.create(currentServer)
     private val client = manager.client
-    private val currentUserId = userHelper.user()?.id
 
     fun loadUserDetails(userId: String) {
         launchUI(strategy) {
@@ -39,54 +36,41 @@ class UserDetailsPresenter @Inject constructor(
                 }
 
                 user?.let { u ->
-                    val localDMs = chatRoomByName(name = u.name)
+                    val openedChatRooms = chatRoomByName(name = u.name)
                     val avatarUrl = u.username?.let { currentServer.avatarUrl(avatar = it) }
 
-                    val chatRoom: ChatRoom? = if (localDMs.isEmpty()) {
-                        val query = u.username!!
-                        val spotlightResult = retryIO("spotlight($query)") {
-                            client.spotlight(query = query)
-                        }
+                    val chatRoom: ChatRoom? = if (openedChatRooms.isEmpty()) {
+                        ChatRoom(
+                            id = "",
+                            type = roomTypeOf(RoomType.DIRECT_MESSAGE),
+                            name = u.username ?: u.name.orEmpty(),
+                            fullName = u.name,
+                            favorite = false,
+                            open = false,
+                            alert = false,
+                            status = userStatusOf(u.status),
+                            client = client,
+                            broadcast = false,
+                            archived = false,
+                            default = false,
+                            description = null,
+                            groupMentions = null,
+                            userMentions = null,
+                            lastMessage = null,
+                            lastSeen = null,
+                            topic = null,
+                            announcement = null,
+                            roles = null,
+                            unread = 0,
+                            readonly = false,
+                            muted = null,
+                            subscriptionId = "",
+                            timestamp = null,
+                            updatedAt = null,
+                            user = null
+                        )
+                    } else openedChatRooms.firstOrNull()
 
-                        val matchFromSpotlight = spotlightResult.users.firstOrNull { it.username == query }
-
-                        if (matchFromSpotlight != null) {
-                            val result = retryIO("createDirectMessage(${matchFromSpotlight.id}") {
-                                client.createDirectMessage(username = matchFromSpotlight.id)
-                            }
-                            with(matchFromSpotlight) {
-                                ChatRoom(
-                                    id = result.id,
-                                    type = roomTypeOf(RoomType.DIRECT_MESSAGE),
-                                    name = u.username ?: u.name.orEmpty(),
-                                    fullName = u.name,
-                                    favorite = false,
-                                    open = false,
-                                    alert = false,
-                                    status = status,
-                                    client = client,
-                                    broadcast = false,
-                                    archived = false,
-                                    default = false,
-                                    description = null,
-                                    groupMentions = null,
-                                    userMentions = null,
-                                    lastMessage = null,
-                                    lastSeen = null,
-                                    topic = null,
-                                    announcement = null,
-                                    roles = null,
-                                    unread = 0,
-                                    readonly = false,
-                                    muted = null,
-                                    subscriptionId = "",
-                                    timestamp = null,
-                                    updatedAt = null,
-                                    user = null
-                                )
-                            }
-                        } else null
-                    } else localDMs.firstOrNull()
                     view.showUserDetails(
                         avatarUrl = avatarUrl,
                         username = u.username,
@@ -102,10 +86,54 @@ class UserDetailsPresenter @Inject constructor(
         }
     }
 
-    fun createDirectMessage(username: String) {
+    fun createDirectMessage(id: String) = launchUI(strategy) {
+        try {
+            val result = retryIO("createDirectMessage($id") {
+                client.createDirectMessage(username = id)
+            }
 
-    }
+            val userEntity = withContext(CommonPool) {
+                dbManager.userDao().getUser(id = id)
+            }
 
+            if (userEntity != null) {
+                view.toDirectMessage(
+                    chatRoom = ChatRoom(
+                        id = result.id,
+                        type = roomTypeOf(RoomType.DIRECT_MESSAGE),
+                        name = userEntity.username ?: userEntity.name.orEmpty(),
+                        fullName = userEntity.name,
+                        favorite = false,
+                        open = false,
+                        alert = false,
+                        status = userStatusOf(userEntity.status),
+                        client = client,
+                        broadcast = false,
+                        archived = false,
+                        default = false,
+                        description = null,
+                        groupMentions = null,
+                        userMentions = null,
+                        lastMessage = null,
+                        lastSeen = null,
+                        topic = null,
+                        announcement = null,
+                        roles = null,
+                        unread = 0,
+                        readonly = false,
+                        muted = null,
+                        subscriptionId = "",
+                        timestamp = null,
+                        updatedAt = result.updatedAt,
+                        user = null
+                    )
+                )
+            }
+        } catch (ex: Exception) {
+            Timber.e(ex)
+            view.onOpenDirectMessageError()
+        }
+    }
     private suspend fun chatRoomByName(name: String? = null): List<ChatRoom> = withContext(CommonPool) {
         return@withContext dbManager.chatRoomDao().getAllSync().filter {
             if (name == null) {
@@ -145,5 +173,4 @@ class UserDetailsPresenter @Inject constructor(
             }
         }
     }
-
 }
diff --git a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsView.kt b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsView.kt
index 198c4f3ba3..664812dcbc 100644
--- a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsView.kt
+++ b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsView.kt
@@ -5,4 +5,8 @@ import chat.rocket.core.model.ChatRoom
 interface UserDetailsView {
 
     fun showUserDetails(avatarUrl: String?, username: String?, name: String?, utcOffset: Float?, status: String, chatRoom: ChatRoom?)
+
+    fun toDirectMessage(chatRoom: ChatRoom)
+
+    fun onOpenDirectMessageError()
 }
diff --git a/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt b/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt
index daced2c9b4..c39d7b82bd 100644
--- a/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt
+++ b/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt
@@ -16,16 +16,20 @@ import chat.rocket.android.userdetails.presentation.UserDetailsView
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extension.orFalse
 import chat.rocket.android.util.extensions.showToast
+import chat.rocket.android.util.retryIO
 import chat.rocket.common.model.roomTypeOf
+import chat.rocket.core.internal.rest.createDirectMessage
 import chat.rocket.core.model.ChatRoom
 import chat.rocket.core.model.userId
 import com.bumptech.glide.Glide
 import com.bumptech.glide.Priority
+import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.load.resource.bitmap.CenterCrop
 import com.bumptech.glide.load.resource.bitmap.CenterInside
 import com.bumptech.glide.load.resource.bitmap.FitCenter
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.request.RequestOptions
+import com.google.android.material.snackbar.Snackbar
 import dagger.android.AndroidInjection
 import dagger.android.AndroidInjector
 import dagger.android.DispatchingAndroidInjector
@@ -62,6 +66,7 @@ class UserDetailsActivity : AppCompatActivity(), UserDetailsView, HasSupportFrag
     lateinit var presenter: UserDetailsPresenter
 
     private lateinit var subscriptionId: String
+    private lateinit var userId: String
 
     override fun onCreate(savedInstanceState: Bundle?) {
         AndroidInjection.inject(this)
@@ -69,7 +74,7 @@ class UserDetailsActivity : AppCompatActivity(), UserDetailsView, HasSupportFrag
         setContentView(R.layout.activity_user_details)
         setupToolbar()
 
-        val userId = intent.getStringExtra(EXTRA_USER_ID)
+        userId = intent.getStringExtra(EXTRA_USER_ID)
         subscriptionId = intent.getStringExtra(EXTRA_SUBSCRIPTION_ID)
         showLoadingView(true)
         presenter.loadUserDetails(userId = userId)
@@ -95,45 +100,67 @@ class UserDetailsActivity : AppCompatActivity(), UserDetailsView, HasSupportFrag
         text_view_username.text = username
         text_view_status.text = status.capitalize()
 
-        launch(UI) {
-            val image = withContext(CommonPool) {
-                val requestOptions = RequestOptions()
-                    .priority(Priority.IMMEDIATE)
-                    .transforms(CenterInside(), FitCenter())
-
-                return@withContext GlideApp.with(this@UserDetailsActivity)
-                    .asBitmap()
-                    .load(avatarUrl)
-                    .apply(requestOptions)
-                    .submit()
-                    .get().also { showLoadingView(false) }
+        try {
+            launch(UI) {
+                val image = withContext(CommonPool) {
+                    try {
+                        val requestOptions = RequestOptions()
+                            .priority(Priority.IMMEDIATE)
+                            .transforms(CenterInside(), FitCenter())
+
+                        return@withContext GlideApp.with(this@UserDetailsActivity)
+                            .asBitmap()
+                            .diskCacheStrategy(DiskCacheStrategy.ALL)
+                            .load(avatarUrl)
+                            .apply(requestOptions)
+                            .submit()
+                            .get()
+                    } catch (ex: Exception) {
+                        Timber.e(ex)
+                        return@withContext null
+                    } finally {
+                        showLoadingView(false)
+                    }
+                }
+
+                image?.let {
+                    val blurredBitmap = image.blurred(context = this@UserDetailsActivity,
+                        newWidth = toolbar.measuredWidth, newHeight = toolbar.measuredHeight)
+                    toolbar.background = BitmapDrawable(resources, blurredBitmap)
+                    GlideApp.with(this@UserDetailsActivity)
+                        .asBitmap()
+                        .transforms(RoundedCorners(25), CenterCrop())
+                        .load(image)
+                        .into(image_view_avatar)
+                }
             }
 
-            val blurredBitmap = image.blurred(context = this@UserDetailsActivity,
-                newWidth = toolbar.measuredWidth, newHeight =  toolbar.measuredHeight)
-            toolbar.background = BitmapDrawable(resources, blurredBitmap)
-            GlideApp.with(this@UserDetailsActivity)
-                .asBitmap()
-                .transforms(RoundedCorners(25), CenterCrop())
-                .load(avatarUrl)
-                .into(image_view_avatar)
-        }
-
-        utcOffset?.let {
-            val offsetLong = it.roundToLong()
-            val offset = if (it > 0) "+$offsetLong" else offsetLong.toString()
-            val formatter = DateTimeFormatter.ofPattern("'(GMT$offset)' hh:mm a")
-            val zoneId = ZoneId.systemDefault()
-            val timeNow = OffsetDateTime.now(ZoneOffset.UTC).plusHours(offsetLong).toLocalDateTime()
-            text_view_tz.text = formatter.format(ZonedDateTime.of(timeNow, zoneId))
-        }
+            utcOffset?.let {
+                val offsetLong = it.roundToLong()
+                val offset = if (it > 0) "+$offsetLong" else offsetLong.toString()
+                val formatter = DateTimeFormatter.ofPattern("'(GMT$offset)' hh:mm a")
+                val zoneId = ZoneId.systemDefault()
+                val timeNow = OffsetDateTime.now(ZoneOffset.UTC).plusHours(offsetLong).toLocalDateTime()
+                text_view_tz.text = formatter.format(ZonedDateTime.of(timeNow, zoneId))
+            }
 
-        text_view_message.setOnClickListener {
-            toDirectMessage(chatRoom = chatRoom)
-        }
+            text_view_message.setOnClickListener {
+                if (chatRoom == null) {
+                    presenter.createDirectMessage(id = userId)
+                } else {
+                    toDirectMessage(chatRoom)
+                }
+            }
 
-        image_view_message.setOnClickListener {
-            toDirectMessage(chatRoom = chatRoom)
+            image_view_message.setOnClickListener {
+                if (chatRoom == null) {
+                    presenter.createDirectMessage(id = userId)
+                } else {
+                    toDirectMessage(chatRoom)
+                }
+            }
+        } catch (ex: Exception) {
+            Timber.e(ex)
         }
     }
 
@@ -144,23 +171,28 @@ class UserDetailsActivity : AppCompatActivity(), UserDetailsView, HasSupportFrag
         }
     }
 
-    private fun toDirectMessage(chatRoom: ChatRoom?) {
-        chatRoom?.let { c ->
-            finish()
-            if (c.subscriptionId.isEmpty() || c.subscriptionId != subscriptionId) {
-                startActivity(
-                    chatRoomIntent(
-                        chatRoomId = c.id,
-                        chatRoomName = c.name,
-                        chatRoomType = c.type.toString(),
-                        isReadOnly = c.readonly.orFalse(),
-                        chatRoomLastSeen = c.lastSeen ?: 0,
-                        isSubscribed = c.open,
-                        isCreator = false,
-                        isFavorite = c.favorite
-                    )
+    override fun onOpenDirectMessageError() {
+        Snackbar.make(root_layout, R.string.error_opening_dm, Snackbar.LENGTH_INDEFINITE)
+            .setAction(R.string.retry) {
+                presenter.createDirectMessage(userId)
+            }.show()
+    }
+
+    override fun toDirectMessage(chatRoom: ChatRoom) {
+        finish()
+        if (chatRoom.subscriptionId.isEmpty() || chatRoom.subscriptionId != subscriptionId) {
+            startActivity(
+                chatRoomIntent(
+                    chatRoomId = chatRoom.id,
+                    chatRoomName = chatRoom.name,
+                    chatRoomType = chatRoom.type.toString(),
+                    isReadOnly = chatRoom.readonly.orFalse(),
+                    chatRoomLastSeen = chatRoom.lastSeen ?: 0,
+                    isSubscribed = chatRoom.open,
+                    isCreator = false,
+                    isFavorite = chatRoom.favorite
                 )
-            }
+            )
         }
     }
 }
diff --git a/app/src/main/res/layout/activity_user_details.xml b/app/src/main/res/layout/activity_user_details.xml
index 48f55261d7..9d71c1cff4 100644
--- a/app/src/main/res/layout/activity_user_details.xml
+++ b/app/src/main/res/layout/activity_user_details.xml
@@ -2,6 +2,7 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@android:color/white"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f135f8eb7a..f307a296d1 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -336,6 +336,8 @@
     <!-- User Details -->
     <string name="message">Message</string> <!--TODO - Add proper translation-->
     <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
+    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
+    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
 
     <!-- Report -->
     <string name="submit">Submit</string> <!--TODO - Add proper translation-->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 7236139077..707ff166ba 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -337,6 +337,9 @@
     <!-- User Details -->
     <string name="message">Message</string> <!-- TODO - Add proper translation -->
     <string name="timezone">Timezone</string> <!-- TODO - Add proper translation -->
+    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
+    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
+
     <!-- Report -->
     <string name="submit">Submit</string> <!--TODO - Add proper translation-->
     <string name="required">*required</string> <!--TODO - Add proper translation-->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 593463cefa..ba91c7eed8 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -338,15 +338,13 @@
     <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
 
     <!-- User Details -->
-    <!-- TODO - Add proper translation -->
-    <string name="message">Message</string>
-    <!-- TODO - Add proper translation -->
-    <string name="timezone">Timezone</string>
+    <string name="message">Message</string> <!-- TODO - Add proper translation -->
+    <string name="timezone">Timezone</string> <!-- TODO - Add proper translation -->
+    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
+    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
+
     <!-- Report -->
-    <!--TODO - Add proper translation-->
-    <string name="submit">Submit</string>
-    <!--TODO - Add proper translation-->
-    <string name="required">*required</string>
-    <!--TODO - Add proper translation-->
-    <string name="report_sent">Your report has been sent!</string>
+    <string name="submit">Submit</string> <!-- TODO - Add proper translation -->
+    <string name="required">*required</string> <!-- TODO - Add proper translation -->
+    <string name="report_sent">Your report has been sent!</string> <!-- TODO - Add proper translation -->
 </resources>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 33d7ac8db4..ee3a2dee26 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -337,16 +337,13 @@
     <string name="message_room_changed_privacy">%2$s ने रूम का प्रकार बदलकर %1$s किया </string>
 
     <!-- User Details -->
-    <!-- TODO - Add proper translation -->
-    <string name="message">Message</string>
-    <!-- TODO - Add proper translation -->
-    <string name="timezone">Timezone</string>
+    <string name="message">Message</string> <!-- TODO - Add proper translation -->
+    <string name="timezone">Timezone</string> <!-- TODO - Add proper translation -->
+    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
+    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
 
     <!-- Report -->
-    <!--TODO - Add proper translation-->
-    <string name="submit">Submit</string>
-    <!--TODO - Add proper translation-->
-    <string name="required">*required</string>
-    <!--TODO - Add proper translation-->
+    <string name="submit">Submit</string> <!-- TODO - Add proper translation -->
+    <string name="required">*required</string> <!-- TODO - Add proper translation -->
     <string name="report_sent">Your report has been sent!</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 2ef522ac10..4718bd5d03 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -332,16 +332,13 @@
     <string name="message_room_changed_privacy">Il tipo di stanza è cambiato in: %1$s da %2$s</string>
 
     <!-- User Details -->
-    <!-- TODO - Add proper translation -->
-    <string name="message">Message</string>
-    <!-- TODO - Add proper translation -->
-    <string name="timezone">Timezone</string>
+    <string name="message">Message</string> <!-- TODO - Add proper translation -->
+    <string name="timezone">Timezone</string> <!-- TODO - Add proper translation -->
+    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
+    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
 
     <!-- Report -->
-    <!--TODO - Add proper translation-->
-    <string name="submit">Submit</string>
-    <!--TODO - Add proper translation-->
-    <string name="required">*required</string>
-    <!--TODO - Add proper translation-->
-    <string name="report_sent">Your report has been sent!</string>
+    <string name="submit">Submit</string> <!-- TODO - Add proper translation -->
+    <string name="required">*required</string> <!-- TODO - Add proper translation -->
+    <string name="report_sent">Your report has been sent!</string> <!-- TODO - Add proper translation -->
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 4c33fd0d59..2fc356c34a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -339,16 +339,13 @@
     <string name="message_room_changed_privacy">ルームタイプを %2$s から %1$s に変更しました</string>
 
     <!-- User Details -->
-    <!-- TODO - Add proper translation -->
-    <string name="message">Message</string>
-    <!-- TODO - Add proper translation -->
-    <string name="timezone">Timezone</string>
+    <string name="message">Message</string> <!--TODO - Add proper translation-->
+    <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
+    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
+    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
 
     <!-- Report -->
-    <!--TODO - Add proper translation-->
-    <string name="submit">Submit</string>
-    <!--TODO - Add proper translation-->
-    <string name="required">*required</string>
-    <!--TODO - Add proper translation-->
-    <string name="report_sent">Your report has been sent!</string>
+    <string name="submit">Submit</string> <!--TODO - Add proper translation-->
+    <string name="required">*required</string> <!--TODO - Add proper translation-->
+    <string name="report_sent">Your report has been sent!</string> <!--TODO - Add proper translation-->
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index d1363b82b2..723d31a5f3 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -336,10 +336,10 @@
     <string name="message_room_changed_privacy">O tipo da sala mudou para: %1$s por %2$s</string>
 
     <!-- User Details -->
-    <!-- TODO - Add proper translation -->
     <string name="message">Mensagem</string>
-    <!-- TODO - Add proper translation -->
     <string name="timezone">Fuso horário</string>
+    <string name="error_opening_dm">Algo deu errado quando tentamos abrir esta conversa…</string>
+    <string name="retry">Retentar</string>
 
     <!-- Report -->
     <string name="submit">Enviar</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 255dea05fc..6488865988 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -334,16 +334,13 @@
     <string name="message_room_changed_privacy">Тип канала изменен на: %1$s пользователем %2$s</string>
 
     <!-- User Details -->
-    <!-- TODO - Add proper translation -->
-    <string name="message">Message</string>
-    <!-- TODO - Add proper translation -->
-    <string name="timezone">Timezone</string>
+    <string name="message">Message</string> <!--TODO - Add proper translation-->
+    <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
+    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
+    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
 
     <!-- Report -->
-    <!--TODO - Add proper translation-->
-    <string name="submit">Submit</string>
-    <!--TODO - Add proper translation-->
-    <string name="required">*required</string>
-    <!--TODO - Add proper translation-->
-    <string name="report_sent">Your report has been sent!</string>
+    <string name="submit">Submit</string> <!--TODO - Add proper translation-->
+    <string name="required">*required</string> <!--TODO - Add proper translation-->
+    <string name="report_sent">Your report has been sent!</string> <!--TODO - Add proper translation-->
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 77c3c60eb5..1db4dcd75b 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -339,6 +339,8 @@
     <!-- User Details -->
     <string name="message">Message</string> <!--TODO - Add proper translation-->
     <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
+    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
+    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
 
     <!-- Report -->
     <string name="submit">Submit</string> <!--TODO - Add proper translation-->
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 738570815c..3ac5b50df7 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -332,20 +332,16 @@
     <string name="message_information_title">Інформація про прочитання</string>
     <string name="msg_log_out">Виходимо…</string>
     <string name="msg_sent_attachment">Долучення відправлено</string>
-    <!--TODO - Add proper translation-->
-    <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
+    <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string> <!-- TODO - Add proper translation -->
 
     <!-- User Details -->
-    <!-- TODO - Add proper translation -->
     <string name="message">Message</string>
-    <!-- TODO - Add proper translation -->
     <string name="timezone">Timezone</string>
+    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
+    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
 
     <!-- Report -->
-    <!--TODO - Add proper translation-->
-    <string name="submit">Submit</string>
-    <!--TODO - Add proper translation-->
-    <string name="required">*required</string>
-    <!--TODO - Add proper translation-->
-    <string name="report_sent">Your report has been sent!</string>
+    <string name="submit">Submit</string> <!-- TODO - Add proper translation -->
+    <string name="required">*required</string> <!-- TODO - Add proper translation -->
+    <string name="report_sent">Your report has been sent!</string> <!-- TODO - Add proper translation -->
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 229279481f..35cb50ce8f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -353,6 +353,8 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="message">Message</string>
     <string name="timezone">Timezone</string>
     <string name="status" translatable="false">Status</string>
+    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string>
+    <string name="retry">Retry</string>
 
     <!-- Report -->
     <string name="submit">Submit</string>

From 00afeaaec3ce295bcfd4a178867c1f236842db8d Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Sat, 8 Dec 2018 16:08:57 +0530
Subject: [PATCH 085/149] update (IT)strings.xml

---
 app/src/main/res/values-it/strings.xml | 30 +++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 9d12c492b6..1e75addb0b 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -22,9 +22,9 @@
     <string name="title_update_profile">Aggiorna Profilo</string>
     <string name="title_about">Informazioni</string>
     <string name="title_create_channel">Crea Canale</string>
-    <string name="title_licence">Ceadúnas</string>
+    <string name="title_licence">licenza</string>
     <string name="title_are_you_sure">Sei sicuro che vuoi uscire ?</string>
-    <string name="title_channel_details">Sonraí na Channel</string>
+    <string name="title_channel_details">Allegare un file</string>
     <string name="title_topic">Argomento</string>
     <string name="title_announcement">Annuncio</string>
     <string name="title_description">Descrizione</string>
@@ -51,7 +51,7 @@
     <string name="action_drawing">Disegno</string>
     <string name="action_save_to_gallery">Salva in galleria</string>
     <string name="action_select_photo_from_gallery">Seleziona foto dalla galleria</string>
-    <string name="action_take_a_photo">Tóg grianghraf</string>
+    <string name="action_take_a_photo">Scatta una foto</string>
     <string name="action_reset_avatar">Reimposta avatar</string>
     <string name="action_connect_server">Collegati a un server</string>
     <string name="action_join_community">Entra nella community</string>
@@ -62,13 +62,13 @@
 
     <!-- Settings List -->
     <string-array name="settings_actions">
-        <item name="item_preferences">Roghanna</item>
-        <item name="item_password">Athraigh do phasfhocal</item>
-        <item name="item_share_app">Comhroinn app</item>
-        <item name="item_rate_us">Ráta linn</item>
-        <item name="item_contact_us">Glaoigh orainn</item>
-        <item name="item_licence">Ceadúnas</item>
-        <item name="item_about">Faoi</item>
+        <item name="item_preferences">Preferenze</item>
+        <item name="item_password">Cambia password</item>
+        <item name="item_share_app">Condividi app</item>
+        <item name="item_rate_us">Votaci</item>
+        <item name="item_contact_us">Contattaci</item>
+        <item name="item_licence">Licenza</item>
+        <item name="item_about">Di</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -158,11 +158,11 @@
     <string name="msg_two_factor_authentication">Autenticazione a 2 fattori (2FA)</string>
     <string name="msg__your_2fa_code">Qual è il tuo codice 2FA ?</string>
     <string name="msg_permalink_copied">Permalink copiato</string>
-    <string name="msg_no_topic">Níl aon ábhar curtha leis</string>
-    <string name="msg_no_announcement">Níor cuireadh fógra leis</string>
-    <string name="msg_no_description">Níor cuireadh cur síos ar bith</string>
-    <string name="msg_send_email">Seol r-phost</string>
-    <string name="msg_android_app_support">Tacaíocht app Android</string>
+    <string name="msg_no_topic">Nessun argomento aggiunto</string>
+    <string name="msg_no_announcement">Nessun annuncio aggiunto</string>
+    <string name="msg_no_description">Nessuna descrizione aggiunta</string>
+    <string name="msg_send_email">Invia una email</string>
+    <string name="msg_android_app_support">Supporto per le app Android</string>
 
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s ha reagito con %2$s</item>

From 93c2c33d85b1e06b7b96415ccd9357ac79725a55 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Mon, 10 Dec 2018 17:03:17 -0300
Subject: [PATCH 086/149] Fix a RuntimeException bug.

Fabric ref.: #3165
---
 .../presentation/PasswordPresenter.kt         | 16 +++----
 .../settings/password/ui/PasswordFragment.kt  | 43 +++++++------------
 app/src/main/res/layout/fragment_password.xml | 30 ++++++-------
 app/src/main/res/values-de/strings.xml        | 10 ++---
 app/src/main/res/values-es/strings.xml        |  3 +-
 app/src/main/res/values-fr/strings.xml        |  3 +-
 app/src/main/res/values-hi-rIN/strings.xml    |  3 +-
 app/src/main/res/values-it/strings.xml        |  3 +-
 app/src/main/res/values-ja/strings.xml        |  7 +--
 app/src/main/res/values-pt-rBR/strings.xml    |  2 +
 app/src/main/res/values-ru-rRU/strings.xml    |  3 +-
 app/src/main/res/values-tr/strings.xml        |  3 +-
 app/src/main/res/values-uk/strings.xml        |  3 +-
 app/src/main/res/values/strings.xml           |  3 +-
 14 files changed, 65 insertions(+), 67 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordPresenter.kt b/app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordPresenter.kt
index edc501f060..1436a70235 100644
--- a/app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordPresenter.kt
@@ -2,13 +2,13 @@ package chat.rocket.android.settings.password.presentation
 
 import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.helper.UserHelper
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
 import chat.rocket.core.RocketChatClient
-import chat.rocket.core.internal.rest.me
 import chat.rocket.core.internal.rest.updateProfile
 import javax.inject.Inject
 
@@ -16,6 +16,7 @@ class PasswordPresenter @Inject constructor(
     private val view: PasswordView,
     private val strategy: CancelStrategy,
     private val analyticsManager: AnalyticsManager,
+    private val userHelp: UserHelper,
     serverInteractor: GetCurrentServerInteractor,
     factory: RocketChatClientFactory
 ) {
@@ -26,14 +27,13 @@ class PasswordPresenter @Inject constructor(
         launchUI(strategy) {
             try {
                 view.showLoading()
-
-                val me = retryIO("me") { client.me() }
-                retryIO("updateProfile(${me.id})") {
-                    client.updateProfile(me.id, null, null, password, null)
+                userHelp.user()?.id?.let { userId ->
+                    retryIO("updateProfile()") {
+                        client.updateProfile(userId, null, null, password, null)
+                    }
+                    analyticsManager.logResetPassword(true)
+                    view.showPasswordSuccessfullyUpdatedMessage()
                 }
-
-                analyticsManager.logResetPassword(true)
-                view.showPasswordSuccessfullyUpdatedMessage()
             } catch (exception: RocketChatException) {
                 analyticsManager.logResetPassword(false)
                 view.showPasswordFailsUpdateMessage(exception.message)
diff --git a/app/src/main/java/chat/rocket/android/settings/password/ui/PasswordFragment.kt b/app/src/main/java/chat/rocket/android/settings/password/ui/PasswordFragment.kt
index cab79b3d21..951fbf76b1 100644
--- a/app/src/main/java/chat/rocket/android/settings/password/ui/PasswordFragment.kt
+++ b/app/src/main/java/chat/rocket/android/settings/password/ui/PasswordFragment.kt
@@ -6,7 +6,6 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toast
 import androidx.appcompat.view.ActionMode
 import androidx.fragment.app.Fragment
 import chat.rocket.android.R
@@ -16,6 +15,7 @@ import chat.rocket.android.settings.password.presentation.PasswordPresenter
 import chat.rocket.android.settings.password.presentation.PasswordView
 import chat.rocket.android.util.extension.asObservable
 import chat.rocket.android.util.extensions.inflate
+import chat.rocket.android.util.extensions.showToast
 import chat.rocket.android.util.extensions.textContent
 import chat.rocket.android.util.extensions.ui
 import dagger.android.support.AndroidSupportInjection
@@ -33,7 +33,7 @@ class PasswordFragment : Fragment(), PasswordView, ActionMode.Callback {
     @Inject
     lateinit var analyticsManager: AnalyticsManager
     private var actionMode: ActionMode? = null
-    private val disposables = CompositeDisposable()
+    private val compositeDisposable = CompositeDisposable()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         AndroidSupportInjection.inject(this)
@@ -48,14 +48,12 @@ class PasswordFragment : Fragment(), PasswordView, ActionMode.Callback {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-
-        disposables.add(listenToChanges())
-
+        compositeDisposable.add(listenToChanges())
         analyticsManager.logScreenView(ScreenViewEvent.Password)
     }
 
     override fun onDestroyView() {
-        disposables.clear()
+        compositeDisposable.clear()
         super.onDestroyView()
     }
 
@@ -74,21 +72,19 @@ class PasswordFragment : Fragment(), PasswordView, ActionMode.Callback {
                 mode.finish()
                 return true
             }
-            else -> {
-                false
-            }
+            else -> false
         }
     }
 
-    override fun onCreateActionMode(mode: ActionMode, menu: Menu?): Boolean {
+    override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
         mode.menuInflater.inflate(R.menu.password, menu)
         mode.title = resources.getString(R.string.action_confirm_password)
         return true
     }
 
-    override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean = false
+    override fun onPrepareActionMode(mode: ActionMode, menu: Menu?): Boolean = false
 
-    override fun onDestroyActionMode(mode: ActionMode?) {
+    override fun onDestroyActionMode(mode: ActionMode) {
         actionMode = null
     }
 
@@ -101,11 +97,11 @@ class PasswordFragment : Fragment(), PasswordView, ActionMode.Callback {
     }
 
     override fun showPasswordFailsUpdateMessage(error: String?) {
-        showToast("Password fails to update: " + error)
+        showToast(getString(R.string.msg_unable_to_update_password, error))
     }
 
     override fun showPasswordSuccessfullyUpdatedMessage() {
-        showToast("Password was successfully updated!")
+        showToast(R.string.msg_password_updated_successfully)
     }
 
     private fun finishActionMode() = actionMode?.finish()
@@ -115,22 +111,13 @@ class PasswordFragment : Fragment(), PasswordView, ActionMode.Callback {
             text_new_password.asObservable(),
             text_confirm_password.asObservable()
         ).subscribe {
-            val textPassword = text_new_password.textContent
-            val textConfirmPassword = text_confirm_password.textContent
-
-            if (textPassword.length > 5 && textConfirmPassword.length > 5 && textPassword.equals(
-                    textConfirmPassword
-                )
-            )
+            val newPassword = it.first.toString()
+            val newPasswordConfirmation = it.second.toString()
+            if (newPassword.length > 5 && newPassword == newPasswordConfirmation) {
                 startActionMode()
-            else
+            } else {
                 finishActionMode()
-        }
-    }
-
-    private fun showToast(msg: String?) {
-        ui {
-            Toast.makeText(it, msg, Toast.LENGTH_LONG).show()
+            }
         }
     }
 
diff --git a/app/src/main/res/layout/fragment_password.xml b/app/src/main/res/layout/fragment_password.xml
index 41b7f64381..83e8f8f6fd 100644
--- a/app/src/main/res/layout/fragment_password.xml
+++ b/app/src/main/res/layout/fragment_password.xml
@@ -1,40 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     tools:context=".settings.password.ui.PasswordFragment">
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/layout_new_password"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_margin="16dp"
         android:theme="@style/EditText.Password"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_margin="16dp"
-        >
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
         <EditText
             android:id="@+id/text_new_password"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/msg_new_password"
-            android:inputType="textPassword"
-            />
+            android:inputType="textPassword" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/layout_confirm_password"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_margin="16dp"
         android:theme="@style/EditText.Password"
-        app:layout_constraintTop_toBottomOf="@+id/layout_new_password"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:layout_margin="16dp"
-        >
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/layout_new_password">
+
         <EditText
             android:id="@+id/text_confirm_password"
             android:layout_width="match_parent"
@@ -47,12 +46,13 @@
         android:id="@+id/view_loading"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        tools:visibility="visible"
         android:visibility="gone"
         app:indicatorColor="@color/colorBlack"
         app:indicatorName="BallPulseIndicator"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+        tools:visibility="visible" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f307a296d1..46f6b25827 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -157,15 +157,15 @@
     <string name="msg_continue_with_wordpress">Continue with <b>WordPress</b></string> <!-- TODO Add translation -->
     <string name="msg_two_factor_authentication">Two-factor Authentication</string> <!-- TODO Add translation -->
     <string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
-    <!-- TODO - Add proper translation -->
-    <string name="msg_muted_on_this_channel">You are muted on this channel</string>
+    <string name="msg_muted_on_this_channel">You are muted on this channel</string>     <!-- TODO - Add proper translation -->
     <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
     <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
     <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
-    <!-- TODO - Add proper translation -->
+    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
+    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
-        <item quantity="one">%1$s reacted with %2$s</item>
-        <item quantity="other">%1$s reacted with %2$s</item>
+        <item quantity="one">%1$s reacted with %2$s</item>     <!-- TODO - Add proper translation -->
+        <item quantity="other">%1$s reacted with %2$s</item>     <!-- TODO - Add proper translation -->
     </plurals>
 
     <!-- Create channel messages -->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 707ff166ba..4c0ab28ac4 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -178,7 +178,8 @@
     <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
     <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
     <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
-
+    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
+    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
         <item quantity="other">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ba91c7eed8..4bb6a2403f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -170,7 +170,8 @@
     <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
     <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
     <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
-
+    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
+    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
         <item quantity="other">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index ee3a2dee26..c629f56776 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -184,7 +184,8 @@
     <string name="msg_no_topic">कोई विषय नहीं जोड़ा गया</string>
     <string name="msg_no_announcement">कोई घोषणा नहीं जोड़ा गया</string>
     <string name="msg_no_description">कोई विवरण नहीं जोड़ा गया</string>
-
+    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
+    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
         <item quantity="one">% 1 $ s ने% 2 $ %d s के साथ प्रतिक्रिया व्यक्त की</item>
         <item quantity="few">% 1 $ s ने% 2 $ s के साथ प्रतिक्रिया व्यक्त की</item>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 1e75addb0b..b13a71f308 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -163,7 +163,8 @@
     <string name="msg_no_description">Nessuna descrizione aggiunta</string>
     <string name="msg_send_email">Invia una email</string>
     <string name="msg_android_app_support">Supporto per le app Android</string>
-
+    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
+    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s ha reagito con %2$s</item>
         <item quantity="other">%1$s ha reagito con %2$s</item>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 2fc356c34a..e0813fa0c9 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -168,10 +168,11 @@
     <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
     <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
     <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
-    <!-- TODO - Add proper translation -->
+    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
+    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
-        <item quantity="one">%1$s reacted with %2$s</item>
-        <item quantity="other">%1$s reacted with %2$s</item>
+        <item quantity="one">%1$s reacted with %2$s</item>     <!-- TODO - Add proper translation -->
+        <item quantity="other">%1$s reacted with %2$s</item>     <!-- TODO - Add proper translation -->
     </plurals>
 
     <!-- Create channel messages -->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 723d31a5f3..1363ccc08d 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -171,6 +171,8 @@
     <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
     <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
     <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
+    <string name="msg_unable_to_update_password">Não foi possível atualizar a senha. Mensagem de erro: %1$s</string>
+    <string name="msg_password_updated_successfully">Senha alterada com sucesso</string>
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s reagiu com %2$s</item>
         <item quantity="other">%1$s reagiram com %2$s</item>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 6488865988..0249b8ede3 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -169,7 +169,8 @@
     <string name="msg_send_email">Отправить e-mail</string>
     <string name="msg_android_app_support">Поддержка Android-приложения</string>
     <string name="msg_muted_on_this_channel">Вы лишены дара речи на этом канале</string>
-
+    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
+    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s реагирует с %2$s</item>
         <item quantity="few">%1$s реагируют с %2$s</item>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 1db4dcd75b..a99f23bebb 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -185,7 +185,8 @@
     <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
     <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
     <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
-
+    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
+    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
         <item quantity="other">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 3ac5b50df7..a48e914728 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -168,7 +168,8 @@
     <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
     <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
     <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
-
+    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
+    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
         <item quantity="few">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 35cb50ce8f..dae30aea22 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -180,7 +180,8 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="msg_no_description">No description added</string>
     <string name="msg_send_email">Send email</string>
     <string name="msg_android_app_support">Android app support</string>
-
+    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string>
+    <string name="msg_password_updated_successfully">Password updated successfully</string>
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s reacted with %2$s</item>
         <item quantity="other">%1$s reacted with %2$s</item>

From 4fdd5a332f7590e333c1ba437aa89bd791a59045 Mon Sep 17 00:00:00 2001
From: Pitstopper <18574776+Pitstopper@users.noreply.github.com>
Date: Tue, 11 Dec 2018 09:44:47 +0300
Subject: [PATCH 087/149] Update strings.xml

---
 app/src/main/res/values-ru-rRU/strings.xml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 6488865988..e828709d44 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -172,8 +172,7 @@
 
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s реагирует с %2$s</item>
-        <item quantity="few">%1$s реагируют с %2$s</item>
-        <item quantity="many">%1$s реагируют с %2$s</item>
+        <item quantity="other">%1$s реагирует с %2$s</item>
     </plurals>
 
     <!-- Create channel messages -->
@@ -224,8 +223,7 @@
     <string name="action_title_editing">Редактирование сообщения</string>
     <string name="action_msg_add_reaction">Отреагировать</string>
     <string name="action_msg_copy_permalink">Копировать ссылку</string>
-    <!-- TODO - Add proper translation -->
-    <string name="action_msg_report">Report</string>
+    <string name="action_msg_report">Пожаловаться</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">Редактирование запрещено</string>
@@ -334,13 +332,13 @@
     <string name="message_room_changed_privacy">Тип канала изменен на: %1$s пользователем %2$s</string>
 
     <!-- User Details -->
-    <string name="message">Message</string> <!--TODO - Add proper translation-->
-    <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
-    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
-    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
+    <string name="message">Сообщение</string>
+    <string name="timezone">Часовой поясe</string>
+    <string name="error_opening_dm">При создании этого диалога что-то пошло не так...</string>
+    <string name="retry">Повторить</string>
 
     <!-- Report -->
-    <string name="submit">Submit</string> <!--TODO - Add proper translation-->
-    <string name="required">*required</string> <!--TODO - Add proper translation-->
-    <string name="report_sent">Your report has been sent!</string> <!--TODO - Add proper translation-->
+    <string name="submit">Отправить</string>
+    <string name="required">*требуется</string>
+    <string name="report_sent">Ваша жалоба была отправлена!</string>
 </resources>

From 69b07b15c97d334e55b6a5216ec0a24d698e9ff6 Mon Sep 17 00:00:00 2001
From: Pitstopper <18574776+Pitstopper@users.noreply.github.com>
Date: Tue, 11 Dec 2018 10:02:35 +0300
Subject: [PATCH 088/149] Update strings.xml

---
 app/src/main/res/values-ru-rRU/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index e828709d44..f05574df81 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -172,7 +172,8 @@
 
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s реагирует с %2$s</item>
-        <item quantity="other">%1$s реагирует с %2$s</item>
+        <item quantity="few">%1$s реагируют с %2$s</item>
+        <item quantity="many">%1$s реагируют с %2$s</item>
     </plurals>
 
     <!-- Create channel messages -->

From e2ce221d9ac1f41004c056c2c3430845495ec649 Mon Sep 17 00:00:00 2001
From: Lucio Maciel <luciofm@gmail.com>
Date: Tue, 11 Dec 2018 19:39:14 -0300
Subject: [PATCH 089/149] Fix error message on rotating and change server

---
 .../chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt | 6 ++++--
 .../java/chat/rocket/android/dagger/module/AppModule.kt   | 3 ++-
 .../java/chat/rocket/android/dagger/module/LocalModule.kt | 5 ++---
 .../rocket/android/main/presentation/MainPresenter.kt     | 1 +
 .../server/infraestructure/RocketChatClientFactory.kt     | 1 +
 .../java/chat/rocket/android/util/extensions/String.kt    | 8 +++++++-
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt b/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
index 880245e151..ffb5d23616 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
@@ -36,6 +36,8 @@ import chat.rocket.android.helper.SharedPreferenceHelper
 import chat.rocket.android.util.extension.onQueryTextListener
 import chat.rocket.android.util.extensions.fadeIn
 import chat.rocket.android.util.extensions.fadeOut
+import chat.rocket.android.util.extensions.ifNotNullNorEmpty
+import chat.rocket.android.util.extensions.ifNotNullNotEmpty
 import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.showToast
 import chat.rocket.android.util.extensions.ui
@@ -83,8 +85,8 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
         val bundle = arguments
         if (bundle != null) {
             chatRoomId = bundle.getString(BUNDLE_CHAT_ROOM_ID)
-            chatRoomId?.let {
-                presenter.loadChatRoom(it)
+            chatRoomId.ifNotNullNotEmpty { roomId ->
+                presenter.loadChatRoom(roomId)
                 chatRoomId = null
             }
         }
diff --git a/app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt b/app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt
index 1a54df6d41..9fbe051396 100644
--- a/app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt
+++ b/app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt
@@ -64,6 +64,7 @@ import chat.rocket.common.internal.ISO8601Date
 import chat.rocket.common.model.TimestampAdapter
 import chat.rocket.common.util.CalendarISO8601Converter
 import chat.rocket.common.util.Logger
+import chat.rocket.common.util.NoOpLogger
 import chat.rocket.common.util.PlatformLogger
 import chat.rocket.core.internal.AttachmentAdapterFactory
 import chat.rocket.core.internal.ReactionsAdapter
@@ -231,7 +232,7 @@ class AppModule {
         return Moshi.Builder()
             .add(FallbackSealedClassJsonAdapter.ADAPTER_FACTORY)
             .add(AppJsonAdapterFactory.INSTANCE)
-            .add(AttachmentAdapterFactory(Logger(logger, url)))
+            .add(AttachmentAdapterFactory(NoOpLogger))
             .add(
                 java.lang.Long::class.java,
                 ISO8601Date::class.java,
diff --git a/app/src/main/java/chat/rocket/android/dagger/module/LocalModule.kt b/app/src/main/java/chat/rocket/android/dagger/module/LocalModule.kt
index a1b758ba47..6b2ac9b416 100644
--- a/app/src/main/java/chat/rocket/android/dagger/module/LocalModule.kt
+++ b/app/src/main/java/chat/rocket/android/dagger/module/LocalModule.kt
@@ -14,6 +14,7 @@ import chat.rocket.common.internal.ISO8601Date
 import chat.rocket.common.model.TimestampAdapter
 import chat.rocket.common.util.CalendarISO8601Converter
 import chat.rocket.common.util.Logger
+import chat.rocket.common.util.NoOpLogger
 import chat.rocket.common.util.PlatformLogger
 import chat.rocket.core.internal.AttachmentAdapterFactory
 import chat.rocket.core.internal.ReactionsAdapter
@@ -47,7 +48,7 @@ class LocalModule {
         return Moshi.Builder()
             .add(FallbackSealedClassJsonAdapter.ADAPTER_FACTORY)
             .add(AppJsonAdapterFactory.INSTANCE)
-            .add(AttachmentAdapterFactory(Logger(logger, url)))
+            .add(AttachmentAdapterFactory(NoOpLogger))
             .add(
                 java.lang.Long::class.java,
                 ISO8601Date::class.java,
@@ -67,8 +68,6 @@ class LocalModule {
         return context.getSharedPreferences("rocket.chat", Context.MODE_PRIVATE)
     }
 
-
-
     @Provides
     @Singleton
     fun provideLocalRepository(sharedPreferences: SharedPreferences, moshi: Moshi): LocalRepository {
diff --git a/app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt b/app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt
index e299409ed9..ba965e9e43 100644
--- a/app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt
@@ -110,6 +110,7 @@ class MainPresenter @Inject constructor(
     }
 
     fun loadCurrentInfo() {
+        setupConnectionInfo(currentServer)
         checkServerInfo(currentServer)
         launchUI(strategy) {
             try {
diff --git a/app/src/main/java/chat/rocket/android/server/infraestructure/RocketChatClientFactory.kt b/app/src/main/java/chat/rocket/android/server/infraestructure/RocketChatClientFactory.kt
index 38c4009633..3f0bb6ce77 100644
--- a/app/src/main/java/chat/rocket/android/server/infraestructure/RocketChatClientFactory.kt
+++ b/app/src/main/java/chat/rocket/android/server/infraestructure/RocketChatClientFactory.kt
@@ -30,6 +30,7 @@ class RocketChatClientFactory @Inject constructor(
             userAgent = "RC Mobile; Android ${Build.VERSION.RELEASE}; v${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})"
             tokenRepository = repository
             platformLogger = logger
+            enableLogger = false
         }
 
         Timber.d("Returning NEW client for: $url")
diff --git a/app/src/main/java/chat/rocket/android/util/extensions/String.kt b/app/src/main/java/chat/rocket/android/util/extensions/String.kt
index 232b621ca9..b4053de3b4 100644
--- a/app/src/main/java/chat/rocket/android/util/extensions/String.kt
+++ b/app/src/main/java/chat/rocket/android/util/extensions/String.kt
@@ -76,4 +76,10 @@ fun String.lowercaseUrl(): String? {
     return httpUrl?.newBuilder()?.scheme(newScheme)?.build()?.toString()
 }
 
-fun String?.isNotNullNorEmpty(): Boolean = this != null && this.isNotEmpty()
\ No newline at end of file
+fun String?.isNotNullNorEmpty(): Boolean = this != null && this.isNotEmpty()
+
+inline fun String?.ifNotNullNotEmpty(block: (String) -> Unit) {
+    if (this != null && this.isNotEmpty()) {
+        block(this)
+    }
+}
\ No newline at end of file

From 58eb6d79a569467b385ea9582ab128e38e3c314c Mon Sep 17 00:00:00 2001
From: Jackie <jiajie.wu96@gmail.com>
Date: Tue, 11 Dec 2018 20:03:17 -0800
Subject: [PATCH 090/149] Adding gif playback

---
 .../chat/rocket/android/chatroom/uimodel/UiModelMapper.kt  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt b/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt
index c6b5fab97c..ff953b2ad1 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt
@@ -127,7 +127,12 @@ class UiModelMapper @Inject constructor(
 
             getChatRoomAsync(message.roomId)?.let { chatRoom ->
                 message.urls?.forEach { url ->
-                    mapUrl(message, url, chatRoom)?.let { list.add(it) }
+                    if (url.url.endsWith(".gif")) {
+                        val attachment = Attachment(imageUrl = url.url)
+                        mapAttachment(message, attachment, chatRoom)?.let { list.add(it) }
+                    } else {
+                        mapUrl(message, url, chatRoom)?.let { list.add(it) }
+                    }
                 }
 
                 message.attachments?.mapNotNull { attachment ->

From 622c1dc91d2788f9b1903e707e2d9bcbba50e0bf Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Wed, 12 Dec 2018 19:33:30 -0300
Subject: [PATCH 091/149] Fix some errors while inflating some classes. Updates
 theme style

---
 .../android/chatroom/ui/ChatRoomFragment.kt      |  4 ++--
 app/src/main/res/layout/dialog_report.xml        |  2 +-
 .../main/res/layout/file_attachments_dialog.xml  |  4 ++--
 .../layout/fragment_authentication_log_in.xml    |  4 ++--
 .../fragment_authentication_login_options.xml    | 16 ++++++++--------
 ...fragment_authentication_register_username.xml |  2 +-
 .../fragment_authentication_reset_password.xml   |  2 +-
 .../layout/fragment_authentication_server.xml    |  2 +-
 .../layout/fragment_authentication_sign_up.xml   |  2 +-
 .../layout/fragment_authentication_two_fa.xml    |  2 +-
 app/src/main/res/layout/item_message_reply.xml   |  2 +-
 .../res/layout/message_attachment_options.xml    |  6 +++---
 app/src/main/res/layout/message_composer.xml     |  2 +-
 .../main/res/layout/update_avatar_options.xml    |  6 +++---
 14 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index b6196a0c2b..c4e61eab06 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -198,8 +198,8 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     private val dialogView by lazy { View.inflate(context, R.layout.file_attachments_dialog, null) }
     internal val alertDialog by lazy { AlertDialog.Builder(activity).setView(dialogView).create() }
     internal val imagePreview by lazy { dialogView.findViewById<ImageView>(R.id.image_preview) }
-    internal val sendButton by lazy { dialogView.findViewById<Button>(R.id.button_send) }
-    internal val cancelButton by lazy { dialogView.findViewById<Button>(R.id.button_cancel) }
+    internal val sendButton by lazy { dialogView.findViewById<android.widget.Button>(R.id.button_send) }
+    internal val cancelButton by lazy { dialogView.findViewById<android.widget.Button>(R.id.button_cancel) }
     internal val description by lazy { dialogView.findViewById<EditText>(R.id.text_file_description) }
     internal val audioVideoAttachment by lazy { dialogView.findViewById<FrameLayout>(R.id.audio_video_attachment) }
     internal val textFile by lazy { dialogView.findViewById<TextView>(R.id.text_file_name) }
diff --git a/app/src/main/res/layout/dialog_report.xml b/app/src/main/res/layout/dialog_report.xml
index cbb541084c..c0ce689a98 100644
--- a/app/src/main/res/layout/dialog_report.xml
+++ b/app/src/main/res/layout/dialog_report.xml
@@ -113,7 +113,7 @@
             app:layout_constraintTop_toBottomOf="@+id/edit_text_description"
             tools:visibility="visible" />
 
-        <Button
+        <android.widget.Button
             android:id="@+id/button_send_report"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/file_attachments_dialog.xml b/app/src/main/res/layout/file_attachments_dialog.xml
index 78bcb421bd..08bbabbe08 100644
--- a/app/src/main/res/layout/file_attachments_dialog.xml
+++ b/app/src/main/res/layout/file_attachments_dialog.xml
@@ -79,7 +79,7 @@
             android:layout_margin="16dp"
             android:hint="@string/msg_file_description" />
 
-        <Button
+        <android.widget.Button
             android:id="@+id/button_send"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -90,7 +90,7 @@
             android:text="@string/msg_send"
             android:textColor="@color/colorWhite" />
 
-        <Button
+        <android.widget.Button
             android:id="@+id/button_cancel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_authentication_log_in.xml b/app/src/main/res/layout/fragment_authentication_log_in.xml
index f7641d9196..beb090c3ce 100644
--- a/app/src/main/res/layout/fragment_authentication_log_in.xml
+++ b/app/src/main/res/layout/fragment_authentication_log_in.xml
@@ -39,7 +39,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/text_username_or_email" />
 
-    <Button
+    <android.widget.Button
         android:id="@+id/button_log_in"
         style="@style/Authentication.Button"
         android:layout_marginTop="20dp"
@@ -50,7 +50,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/text_password" />
 
-    <Button
+    <android.widget.Button
         android:id="@+id/button_forgot_your_password"
         style="@style/Authentication.Button.Borderless"
         android:layout_marginTop="10dp"
diff --git a/app/src/main/res/layout/fragment_authentication_login_options.xml b/app/src/main/res/layout/fragment_authentication_login_options.xml
index aa5195f69e..a80efc5539 100644
--- a/app/src/main/res/layout/fragment_authentication_login_options.xml
+++ b/app/src/main/res/layout/fragment_authentication_login_options.xml
@@ -21,7 +21,7 @@
             app:layout_constraintTop_toTopOf="parent"
             tools:visibility="visible">
 
-            <Button
+            <android.widget.Button
                 android:id="@+id/button_facebook"
                 style="?borderlessButtonStyle"
                 android:layout_width="match_parent"
@@ -39,7 +39,7 @@
                 android:visibility="gone"
                 tools:visibility="visible" />
 
-            <Button
+            <android.widget.Button
                 android:id="@+id/button_github"
                 style="?borderlessButtonStyle"
                 android:layout_width="match_parent"
@@ -58,7 +58,7 @@
                 android:visibility="gone"
                 tools:visibility="visible" />
 
-            <Button
+            <android.widget.Button
                 android:id="@+id/button_google"
                 style="?borderlessButtonStyle"
                 android:layout_width="match_parent"
@@ -77,7 +77,7 @@
                 android:visibility="gone"
                 tools:visibility="visible" />
 
-            <Button
+            <android.widget.Button
                 android:id="@+id/button_linkedin"
                 style="?borderlessButtonStyle"
                 android:layout_width="match_parent"
@@ -96,7 +96,7 @@
                 android:visibility="gone"
                 tools:visibility="visible" />
 
-            <Button
+            <android.widget.Button
                 android:id="@+id/button_gitlab"
                 style="?borderlessButtonStyle"
                 android:layout_width="match_parent"
@@ -115,7 +115,7 @@
                 android:visibility="gone"
                 tools:visibility="visible" />
 
-            <Button
+            <android.widget.Button
                 android:id="@+id/button_wordpress"
                 style="?borderlessButtonStyle"
                 android:layout_width="match_parent"
@@ -179,7 +179,7 @@
                 app:layout_constraintTop_toTopOf="@+id/button_expand_collapse_accounts" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <Button
+        <android.widget.Button
             android:id="@+id/button_login_with_email"
             style="@style/Authentication.Button"
             android:layout_marginTop="32dp"
@@ -190,7 +190,7 @@
             app:layout_constraintTop_toBottomOf="@+id/expand_more_accounts_container"
             tools:visibility="visible" />
 
-        <Button
+        <android.widget.Button
             android:id="@+id/button_create_an_account"
             style="@style/Authentication.Button.Borderless"
             android:layout_marginTop="10dp"
diff --git a/app/src/main/res/layout/fragment_authentication_register_username.xml b/app/src/main/res/layout/fragment_authentication_register_username.xml
index 8e677c8748..efadf08025 100644
--- a/app/src/main/res/layout/fragment_authentication_register_username.xml
+++ b/app/src/main/res/layout/fragment_authentication_register_username.xml
@@ -26,7 +26,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/text_sign_in_to_your_server" />
 
-    <Button
+    <android.widget.Button
         android:id="@+id/button_use_this_username"
         style="@style/Authentication.Button"
         android:layout_marginTop="20dp"
diff --git a/app/src/main/res/layout/fragment_authentication_reset_password.xml b/app/src/main/res/layout/fragment_authentication_reset_password.xml
index 36f2ee4641..11f24a1947 100644
--- a/app/src/main/res/layout/fragment_authentication_reset_password.xml
+++ b/app/src/main/res/layout/fragment_authentication_reset_password.xml
@@ -26,7 +26,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/text_reset_password" />
 
-    <Button
+    <android.widget.Button
         android:id="@+id/button_reset_password"
         style="@style/Authentication.Button"
         android:layout_marginTop="20dp"
diff --git a/app/src/main/res/layout/fragment_authentication_server.xml b/app/src/main/res/layout/fragment_authentication_server.xml
index 66d30a33eb..ba32e82b50 100644
--- a/app/src/main/res/layout/fragment_authentication_server.xml
+++ b/app/src/main/res/layout/fragment_authentication_server.xml
@@ -63,7 +63,7 @@
                 android:inputType="text|textUri" />
         </RelativeLayout>
 
-        <Button
+        <android.widget.Button
             android:id="@+id/button_connect"
             style="@style/Authentication.Button"
             android:layout_marginTop="20dp"
diff --git a/app/src/main/res/layout/fragment_authentication_sign_up.xml b/app/src/main/res/layout/fragment_authentication_sign_up.xml
index 9279dc2d75..cc7dd06f6c 100644
--- a/app/src/main/res/layout/fragment_authentication_sign_up.xml
+++ b/app/src/main/res/layout/fragment_authentication_sign_up.xml
@@ -66,7 +66,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/text_password" />
 
-        <Button
+        <android.widget.Button
             android:id="@+id/button_register"
             style="@style/Authentication.Button"
             android:layout_marginTop="20dp"
diff --git a/app/src/main/res/layout/fragment_authentication_two_fa.xml b/app/src/main/res/layout/fragment_authentication_two_fa.xml
index 6324ddcee2..bbfbbaad92 100644
--- a/app/src/main/res/layout/fragment_authentication_two_fa.xml
+++ b/app/src/main/res/layout/fragment_authentication_two_fa.xml
@@ -24,7 +24,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/text_two_factor_authentication" />
 
-    <Button
+    <android.widget.Button
         android:id="@+id/button_confirm"
         style="@style/Authentication.Button"
         android:layout_marginTop="20dp"
diff --git a/app/src/main/res/layout/item_message_reply.xml b/app/src/main/res/layout/item_message_reply.xml
index 7416e729f4..7eeace9ff3 100644
--- a/app/src/main/res/layout/item_message_reply.xml
+++ b/app/src/main/res/layout/item_message_reply.xml
@@ -12,7 +12,7 @@
     android:paddingEnd="@dimen/screen_edge_left_and_right_padding"
     android:paddingBottom="@dimen/message_item_top_and_bottom_padding">
 
-    <Button
+    <android.widget.Button
         android:id="@+id/button_message_reply"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/message_attachment_options.xml b/app/src/main/res/layout/message_attachment_options.xml
index de6f00471e..fbf0150a6b 100644
--- a/app/src/main/res/layout/message_attachment_options.xml
+++ b/app/src/main/res/layout/message_attachment_options.xml
@@ -5,7 +5,7 @@
     android:background="@drawable/style_attachment_options"
     android:orientation="vertical">
 
-    <Button
+    <android.widget.Button
         android:id="@+id/button_take_a_photo"
         style="?android:attr/borderlessButtonStyle"
         android:layout_width="match_parent"
@@ -15,7 +15,7 @@
         android:gravity="start|center"
         android:text="@string/action_take_a_photo" />
 
-    <Button
+    <android.widget.Button
         android:id="@+id/button_attach_a_file"
         style="?android:attr/borderlessButtonStyle"
         android:layout_width="match_parent"
@@ -25,7 +25,7 @@
         android:gravity="start|center"
         android:text="@string/action_attach_a_files" />
 
-    <Button
+    <android.widget.Button
         android:id="@+id/button_drawing"
         style="?android:attr/borderlessButtonStyle"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/message_composer.xml b/app/src/main/res/layout/message_composer.xml
index 9f26f27f7b..79716a7983 100644
--- a/app/src/main/res/layout/message_composer.xml
+++ b/app/src/main/res/layout/message_composer.xml
@@ -33,7 +33,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/divider" />
 
-        <Button
+        <android.widget.Button
             android:id="@+id/button_join_chat"
             android:layout_width="match_parent"
             android:layout_height="45dp"
diff --git a/app/src/main/res/layout/update_avatar_options.xml b/app/src/main/res/layout/update_avatar_options.xml
index b17a355615..4431228a29 100644
--- a/app/src/main/res/layout/update_avatar_options.xml
+++ b/app/src/main/res/layout/update_avatar_options.xml
@@ -5,7 +5,7 @@
     android:background="@drawable/style_attachment_options"
     android:orientation="vertical">
 
-    <Button
+    <android.widget.Button
         android:id="@+id/button_open_gallery"
         style="?android:attr/borderlessButtonStyle"
         android:layout_width="match_parent"
@@ -15,7 +15,7 @@
         android:gravity="start|center"
         android:text="@string/action_select_photo_from_gallery" />
 
-    <Button
+    <android.widget.Button
         android:id="@+id/button_take_a_photo"
         style="?android:attr/borderlessButtonStyle"
         android:layout_width="match_parent"
@@ -25,7 +25,7 @@
         android:gravity="start|center"
         android:text="@string/action_take_a_photo" />
 
-    <Button
+    <android.widget.Button
         android:id="@+id/button_reset_avatar"
         style="?android:attr/borderlessButtonStyle"
         android:layout_width="match_parent"

From 76c9e8db7ff9d421bbf46530bf596b9638b85974 Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Thu, 13 Dec 2018 14:53:24 +0530
Subject: [PATCH 092/149] update strings.xml

---
 app/src/main/res/values-de/strings.xml | 129 ++++++++++++-------------
 1 file changed, 64 insertions(+), 65 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f307a296d1..0bb7a33d4f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -14,20 +14,20 @@
     <string name="title_members">Benutzer</string>
     <string name="title_counted_members">Benutzer (%d)</string>
     <string name="title_settings">Einstellungen</string>
-    <string name="title_preferences">Preferences</string> <!-- TODO Add translation -->
+    <string name="title_preferences">Einstellungen</string>
     <string name="title_change_password">Ändere Passwort</string>
     <string name="title_rate_us">Bewerten Sie uns</string>
-    <string name="title_admin_panel">Admin panel</string> <!-- TODO Add translation -->
+    <string name="title_admin_panel">Administrationsmenü</string>
     <string name="title_password">Ändere Passwort</string>
     <string name="title_update_profile">Update Profil</string>
     <string name="title_about">Über</string>
     <string name="title_create_channel">Erstelle Raum</string>
-    <string name="title_are_you_sure">Are you sure?</string><!-- TODO Add translation -->
-    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_are_you_sure">Bist du sicher?</string>
+    <string name="title_channel_details">Channel-Details</string>
     <string name="title_topic">Thema</string>
     <string name="title_announcement">Ankündigung</string>
     <string name="title_description">Beschreibung</string>
-    <string name="title_licence">Licence</string> <!-- TODO Add translation -->
+    <string name="title_licence">Lizenz</string>
 
     <!-- Actions -->
     <string name="action_connect">Verbinde</string>
@@ -40,7 +40,7 @@
     <string name="action_create_channel">Erstelle Raum</string>
     <string name="action_create">Erstelle</string>
     <string name="action_logout">Abmelden</string>
-    <string name="action_attach_a_files">Attach a file</string> <!-- TODO Add translation -->
+    <string name="action_attach_a_files">Eine Datei anhängen</string>
     <string name="action_confirm_password">Bestätige Passwort Änderung</string>
     <string name="action_join_chat">Trete Chat bei</string>
     <string name="action_add_account">Erstelle Account</string>
@@ -50,25 +50,25 @@
     <string name="action_invisible">Unsichtbar</string>
     <string name="action_drawing">Zeichnung</string>
     <string name="action_save_to_gallery">Sichern in Gallerie</string>
-    <string name="action_select_photo_from_gallery">Select photo from gallery</string> <!-- TODO Add translation -->
-    <string name="action_take_a_photo">Take a photo from galery</string> <!-- TODO Add translation -->
-    <string name="action_reset_avatar">Reset avatar</string> <!-- TODO Add translation -->
-    <string name="action_connect_server">Connect with a server</string> <!-- TODO Add translation -->
-    <string name="action_join_community">Join in the community</string> <!-- TODO Add translation -->
-    <string name="action_create_server">Create a new server</string> <!-- TODO Add translation -->
-    <string name="action_register">Register</string> <!-- TODO Add translation -->
-    <string name="action_confirm">Confirm</string> <!-- TODO Add translation -->
-    <string name="action_delete_account">Delete account</string> <!-- TODO Add translation -->
+    <string name="action_select_photo_from_gallery">Foto aus der Galerie auswählen</string>
+    <string name="action_take_a_photo">Mach ein Foto</string>
+    <string name="action_reset_avatar">Avatar zurücksetzen</string>
+    <string name="action_connect_server">Verbinden Sie sich mit einem Server</string>
+    <string name="action_join_community">Trete der Community bei</string>
+    <string name="action_create_server">Erstellen Sie einen neuen Server</string>
+    <string name="action_register">Registrieren</string>
+    <string name="action_confirm">Bestätigen</string>
+    <string name="action_delete_account">Konto löschen</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
-        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
-        <item name="item_password">Change password</item> <!-- TODO Add translation -->
-        <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
-        <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
-        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
-        <item name="item_licence">Licence</item> <!-- TODO Add translation -->
-        <item name="item_about">About</item> <!-- TODO Add translation -->
+        <item name="item_preferences">Einstellungen</item>
+        <item name="item_password">Ändere das Passwort</item>
+        <item name="item_share_app">App teilen</item>
+        <item name="item_rate_us">Bewerten Sie uns</item>
+        <item name="item_contact_us">Kontaktiere uns</item>
+        <item name="item_licence">Lizenz</item>
+        <item name="item_about">Über</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -80,8 +80,8 @@
     <string name="msg_username">Benutzername</string>
     <string name="msg_username_or_email">Benutzername oder E-Mail</string>
     <string name="msg_password">Passwort</string>
-    <string name="msg_name">Name</string> <!-- TODO Add translation -->
-    <string name="msg_email">EMail</string> <!-- TODO Add translation -->
+    <string name="msg_name">Name</string>
+    <string name="msg_email">EMail</string>
     <string name="msg_avatar_url">Avatar URL</string>
     <string name="msg_or_continue_using_social_accounts">Oder weiter mit einem Social Account</string>
     <string name="msg_new_user">Neuer Benutzer? %1$s</string>
@@ -106,11 +106,11 @@
     <string name="msg_content_description_log_in_using_gitlab">Login mit Gitlab</string>
     <string name="msg_content_description_log_in_using_wordpress">Login mit WordPress</string>
     <string name="msg_content_description_send_message">Sende Nachricht</string>
-    <string name="msg_content_description_show_more_login_options">Show more login options</string> <!-- TODO Translate-->
+    <string name="msg_content_description_show_more_login_options">Show more login options</string>
     <string name="msg_content_description_show_attachment_options">Zeige Anhang Optionen</string>
     <string name="msg_you">Du</string>
     <string name="msg_unknown">Unbekannt</string>
-    <string name="msg_email_address">E-Mail Addresse</string>
+    <string name="msg_email_address">E-Mail Address</string>
     <string name="msg_utc_offset">UTC Offset</string>
     <string name="msg_new_password">Neues Passwort eingeben</string>
     <string name="msg_confirm_password">Bestätige neues Passwort</string>
@@ -145,27 +145,27 @@
     <string name="msg_file_description">Datei Beschreibung</string>
     <string name="msg_send">Sende</string>
     <string name="msg_sent_attachment">Sende Anhang</string>
-    <string name="msg_welcome_to_rocket_chat">Welcome to Rocket.Chat</string> <!-- TODO Add translation -->
-    <string name="msg_team_communication">Open Source Communication</string> <!-- TODO Add translation -->
-    <string name="msg_login_with_email">Login with <b>e-mail</b></string> <!-- TODO Add translation -->
-    <string name="msg_create_account">Create an account</string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_facebook">Continue with <b>Facebook</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_github">Continue with <b>Github</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_google">Continue with <b>Google</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_linkedin">Continue with <b>Linkedin</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_gitlab">Continue with <b>GitLab</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_wordpress">Continue with <b>WordPress</b></string> <!-- TODO Add translation -->
-    <string name="msg_two_factor_authentication">Two-factor Authentication</string> <!-- TODO Add translation -->
-    <string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
+    <string name="msg_welcome_to_rocket_chat">Willkommen bei Rocket.Chat</string>
+    <string name="msg_team_communication">Open Source-Kommunikation</string>
+    <string name="msg_login_with_email">Einloggen mit <b>e-mail</b></string>
+    <string name="msg_create_account">Ein Konto erstellen</string>
+    <string name="msg_continue_with_facebook">Weitermachen mit <b>Facebook</b></string>
+    <string name="msg_continue_with_github">Weitermachen mit <b>Github</b></string>
+    <string name="msg_continue_with_google">Weitermachen mit <b>Google</b></string>
+    <string name="msg_continue_with_linkedin">Weitermachen mit <b>Linkedin</b></string>
+    <string name="msg_continue_with_gitlab">Weitermachen mit <b>GitLab</b></string>
+    <string name="msg_continue_with_wordpress">Weitermachen mit <b>WordPress</b></string>
+    <string name="msg_two_factor_authentication">Zwei-Faktor-Authentifizierung</string>
+    <string name="msg__your_2fa_code">Wie lautet Ihr 2FA-Code?</string>
     <!-- TODO - Add proper translation -->
-    <string name="msg_muted_on_this_channel">You are muted on this channel</string>
-    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
-    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
-    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
+    <string name="msg_muted_on_this_channel">Sie sind auf diesem Kanal stummgeschaltet</string>
+    <string name="msg_no_topic">Kein Thema hinzugefügt</string>
+    <string name="msg_no_announcement">Keine Ankündigung hinzugefügt</string>
+    <string name="msg_no_description">Keine Beschreibung hinzugefügt</string>
     <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
-        <item quantity="one">%1$s reacted with %2$s</item>
-        <item quantity="other">%1$s reacted with %2$s</item>
+        <item quantity="one">% 1 $ s reagierte mit% 2 $ s</item>
+        <item quantity="other">% 1 $ s reagierte mit% 2 $ s</item>
     </plurals>
 
     <!-- Create channel messages -->
@@ -182,17 +182,17 @@
     <string name="msg_message_copied">Nachricht kopiert</string>
     <string name="msg_delete_message">Lösche Nachricht</string>
     <string name="msg_delete_description">Sind Sie sicher, dass Sie diese Nachricht löschen wollen?</string>
-    <string name="msg_view_more">view more</string> <!-- TODO - Add proper translation -->
-    <string name="msg_view_less">view less</string> <!-- TODO - Add proper translation -->
-    <string name="msg_permalink_copied">Permalink copied</string> <!-- TODO - Add proper translation -->
-    <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
-    <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
+    <string name="msg_view_more">mehr sehen</string>
+    <string name="msg_view_less">weniger anzeigen</string>
+    <string name="msg_permalink_copied">Permalink kopiert</string>
+    <string name="msg_send_email">E-Mail senden</string>
+    <string name="msg_android_app_support">Android App-Unterstützung</string>
 
     <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">Analytics tracking</string> <!-- TODO Add translation -->
-    <string name="msg_send_analytics_tracking">Send anonymous statics to help improving this app</string> <!-- TODO Add translation -->
-    <string name="msg_do_not_send_analytics_tracking">Do not send anonymous statics to help improving this app</string> <!-- TODO Add translation -->
-    <string name="msg_not_applicable_since_it_is_a_foss_version">Not applicable since it is a FOSS version</string> <!-- TODO Add translation -->
+    <string name="msg_analytics_tracking">Analytics tracking</string>
+    <string name="msg_send_analytics_tracking">Send anonymous statics to help improving this app</string>
+    <string name="msg_do_not_send_analytics_tracking">Do not send anonymous statics to help improving this app</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">Not applicable since it is a FOSS version</string>
 
     <!-- System messages -->
     <string name="message_room_name_changed">Raum Namen geändert zu: %1$s von %2$s</string>
@@ -224,9 +224,9 @@
     <string name="action_title_editing">Nachricht bearbeiten</string>
     <string name="action_msg_add_reaction">Reaktion hinzufügen</string>
     <!-- TODO - Add proper translation -->
-    <string name="action_msg_copy_permalink">Copy permalink</string>
+    <string name="action_msg_copy_permalink">Permalink kopieren</string>
     <!-- TODO - Add proper translation -->
-    <string name="action_msg_report">Report</string>
+    <string name="action_msg_report">Bericht</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">Bearbeiten nicht erlaubt</string>
@@ -314,7 +314,7 @@
     <string name="dialog_sort_by_activity">Aktivität</string>
     <string name="dialog_group_by_type">Räume nach Typ</string>
     <string name="dialog_group_favourites">Räume nach Favoriten</string>
-    <string name="dialog_button_done">Done</string><!-- TODO Add translation -->
+    <string name="dialog_button_done">Erledigt</string>
     <string name="chatroom_header">Kopf</string>
 
     <!--ChatRooms Headers-->
@@ -331,16 +331,15 @@
     <string name="notif_success_sending">Nachricht gesendet nach %1$s!</string>
     <string name="read_by">Gelesen von</string>
     <string name="message_information_title">Nachricht Information</string>
-    <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string> <!--TODO - Add proper translation-->
-
+    <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
     <!-- User Details -->
-    <string name="message">Message</string> <!--TODO - Add proper translation-->
-    <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
-    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
-    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
+    <string name="message">Botschaft</string>
+    <string name="timezone">Zeitzone</string>
+    <string name="error_opening_dm">Etwas ist schiefgegangen, als wir dieses Gespräch erstellt haben…</string>
+    <string name="retry">Wiederholen</string>
 
     <!-- Report -->
-    <string name="submit">Submit</string> <!--TODO - Add proper translation-->
-    <string name="required">*required</string> <!--TODO - Add proper translation-->
-    <string name="report_sent">Your report has been sent!</string> <!--TODO - Add proper translation-->
+    <string name="submit">einreichen</string>
+    <string name="required">*erforderlich</string>
+    <string name="report_sent">Ihr Bericht wurde gesendet!</string>
 </resources>

From 577c2af8f819397854e6a997e6396f1ecbc7104d Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Thu, 13 Dec 2018 17:25:24 +0530
Subject: [PATCH 093/149] update (IT) strings.xml

---
 app/src/main/res/values-it/strings.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 1e75addb0b..c5d5cc5a4b 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -332,13 +332,13 @@
     <string name="message_room_changed_privacy">Il tipo di stanza è cambiato in: %1$s da %2$s</string>
 
     <!-- User Details -->
-    <string name="message">Message</string> <!-- TODO - Add proper translation -->
-    <string name="timezone">Timezone</string> <!-- TODO - Add proper translation -->
-    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
-    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
+    <string name="message">Messaggio</string>
+    <string name="timezone">Fuso orario</string>
+    <string name="error_opening_dm">Qualcosa è andato storto mentre stavamo creando questa conversazione ...</string> <!-- TODO - Add proper translation -->
+    <string name="retry">Riprova</string>
 
     <!-- Report -->
-    <string name="submit">Submit</string> <!-- TODO - Add proper translation -->
-    <string name="required">*required</string> <!-- TODO - Add proper translation -->
-    <string name="report_sent">Your report has been sent!</string> <!-- TODO - Add proper translation -->
+    <string name="submit">Sottoscrivi</string>
+    <string name="required">*necessario</string>
+    <string name="report_sent">Il tuo rapporto è stato inviato!</string>
 </resources>

From 0b7906f1a32e10bb904779798891ff0073419576 Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Thu, 13 Dec 2018 17:32:35 +0530
Subject: [PATCH 094/149] update (hi) strings.xml

---
 app/src/main/res/values-de/strings.xml     |  4 ----
 app/src/main/res/values-hi-rIN/strings.xml | 14 +++++++-------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 0bb7a33d4f..621776c3b8 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -157,12 +157,10 @@
     <string name="msg_continue_with_wordpress">Weitermachen mit <b>WordPress</b></string>
     <string name="msg_two_factor_authentication">Zwei-Faktor-Authentifizierung</string>
     <string name="msg__your_2fa_code">Wie lautet Ihr 2FA-Code?</string>
-    <!-- TODO - Add proper translation -->
     <string name="msg_muted_on_this_channel">Sie sind auf diesem Kanal stummgeschaltet</string>
     <string name="msg_no_topic">Kein Thema hinzugefügt</string>
     <string name="msg_no_announcement">Keine Ankündigung hinzugefügt</string>
     <string name="msg_no_description">Keine Beschreibung hinzugefügt</string>
-    <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
         <item quantity="one">% 1 $ s reagierte mit% 2 $ s</item>
         <item quantity="other">% 1 $ s reagierte mit% 2 $ s</item>
@@ -223,9 +221,7 @@
     <string name="action_msg_share">Teilen</string>
     <string name="action_title_editing">Nachricht bearbeiten</string>
     <string name="action_msg_add_reaction">Reaktion hinzufügen</string>
-    <!-- TODO - Add proper translation -->
     <string name="action_msg_copy_permalink">Permalink kopieren</string>
-    <!-- TODO - Add proper translation -->
     <string name="action_msg_report">Bericht</string>
 
     <!-- Permission messages -->
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index ee3a2dee26..2d24e344f5 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -337,13 +337,13 @@
     <string name="message_room_changed_privacy">%2$s ने रूम का प्रकार बदलकर %1$s किया </string>
 
     <!-- User Details -->
-    <string name="message">Message</string> <!-- TODO - Add proper translation -->
-    <string name="timezone">Timezone</string> <!-- TODO - Add proper translation -->
-    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
-    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
+    <string name="message">संदेश</string>
+    <string name="timezone">समय क्षेत्र</string>
+    <string name="error_opening_dm">जब हम इस बातचीत को बना रहे थे तो कुछ गड़बड़ हुई …</string>
+    <string name="retry">Retry</string>
 
     <!-- Report -->
-    <string name="submit">Submit</string> <!-- TODO - Add proper translation -->
-    <string name="required">*required</string> <!-- TODO - Add proper translation -->
-    <string name="report_sent">Your report has been sent!</string>
+    <string name="submit">जमा करें</string>
+    <string name="required">* आवश्यक</string>
+    <string name="report_sent">आपकी रिपोर्ट भेज दी गई है!</string>
 </resources>

From f80d78245cf65f949c00b3211cfa109f24a1909b Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Thu, 13 Dec 2018 17:36:48 +0530
Subject: [PATCH 095/149] update (IT) strings.xml

---
 app/src/main/res/values-it/strings.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index c5d5cc5a4b..db1f082c25 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -223,7 +223,6 @@
     <string name="action_title_editing">Modifica messaggio</string>
     <string name="action_msg_add_reaction">Aggiungi reazione</string>
     <string name="action_msg_copy_permalink">Copia permalink</string>
-    <!-- TODO - Add proper translation -->
     <string name="action_msg_report">Report</string>
 
     <!-- Permission messages -->
@@ -334,7 +333,7 @@
     <!-- User Details -->
     <string name="message">Messaggio</string>
     <string name="timezone">Fuso orario</string>
-    <string name="error_opening_dm">Qualcosa è andato storto mentre stavamo creando questa conversazione ...</string> <!-- TODO - Add proper translation -->
+    <string name="error_opening_dm">Qualcosa è andato storto mentre stavamo creando questa conversazione ...</string>
     <string name="retry">Riprova</string>
 
     <!-- Report -->

From f9336fd2c213fcb536cf6952a5ca1f461a9128cc Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Thu, 13 Dec 2018 17:53:42 +0530
Subject: [PATCH 096/149] update (hi) strings.xml

---
 app/src/main/res/values-hi-rIN/strings.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 2d24e344f5..2541b3fb3c 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -227,8 +227,7 @@
     <string name="action_title_editing">संपादन संदेश</string>
     <string name="action_msg_add_reaction">प्रतिक्रिया जोड़ें</string>
     <string name="action_msg_copy_permalink">परमालिंक कॉपी करें</string>
-    <!-- TODO - Add proper translation -->
-    <string name="action_msg_report">Report</string>
+    <string name="action_msg_report">रिपोर्ट</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">संपादन की अनुमति नहीं है</string>
@@ -340,7 +339,7 @@
     <string name="message">संदेश</string>
     <string name="timezone">समय क्षेत्र</string>
     <string name="error_opening_dm">जब हम इस बातचीत को बना रहे थे तो कुछ गड़बड़ हुई …</string>
-    <string name="retry">Retry</string>
+    <string name="retry">पुन: प्रयास करें</string>
 
     <!-- Report -->
     <string name="submit">जमा करें</string>

From 370751128d5def9a7e5ee7bfa3d57b55100cf159 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Thu, 13 Dec 2018 15:53:08 -0300
Subject: [PATCH 097/149] Merge branch 'develop' of
 github.com:RocketChat/Rocket.Chat.Android into
 fix/crash-when-creating-channel

---
 app/src/main/res/values-de/strings.xml | 133 ++++++++++++-------------
 1 file changed, 64 insertions(+), 69 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 46f6b25827..621776c3b8 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -14,20 +14,20 @@
     <string name="title_members">Benutzer</string>
     <string name="title_counted_members">Benutzer (%d)</string>
     <string name="title_settings">Einstellungen</string>
-    <string name="title_preferences">Preferences</string> <!-- TODO Add translation -->
+    <string name="title_preferences">Einstellungen</string>
     <string name="title_change_password">Ändere Passwort</string>
     <string name="title_rate_us">Bewerten Sie uns</string>
-    <string name="title_admin_panel">Admin panel</string> <!-- TODO Add translation -->
+    <string name="title_admin_panel">Administrationsmenü</string>
     <string name="title_password">Ändere Passwort</string>
     <string name="title_update_profile">Update Profil</string>
     <string name="title_about">Über</string>
     <string name="title_create_channel">Erstelle Raum</string>
-    <string name="title_are_you_sure">Are you sure?</string><!-- TODO Add translation -->
-    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_are_you_sure">Bist du sicher?</string>
+    <string name="title_channel_details">Channel-Details</string>
     <string name="title_topic">Thema</string>
     <string name="title_announcement">Ankündigung</string>
     <string name="title_description">Beschreibung</string>
-    <string name="title_licence">Licence</string> <!-- TODO Add translation -->
+    <string name="title_licence">Lizenz</string>
 
     <!-- Actions -->
     <string name="action_connect">Verbinde</string>
@@ -40,7 +40,7 @@
     <string name="action_create_channel">Erstelle Raum</string>
     <string name="action_create">Erstelle</string>
     <string name="action_logout">Abmelden</string>
-    <string name="action_attach_a_files">Attach a file</string> <!-- TODO Add translation -->
+    <string name="action_attach_a_files">Eine Datei anhängen</string>
     <string name="action_confirm_password">Bestätige Passwort Änderung</string>
     <string name="action_join_chat">Trete Chat bei</string>
     <string name="action_add_account">Erstelle Account</string>
@@ -50,25 +50,25 @@
     <string name="action_invisible">Unsichtbar</string>
     <string name="action_drawing">Zeichnung</string>
     <string name="action_save_to_gallery">Sichern in Gallerie</string>
-    <string name="action_select_photo_from_gallery">Select photo from gallery</string> <!-- TODO Add translation -->
-    <string name="action_take_a_photo">Take a photo from galery</string> <!-- TODO Add translation -->
-    <string name="action_reset_avatar">Reset avatar</string> <!-- TODO Add translation -->
-    <string name="action_connect_server">Connect with a server</string> <!-- TODO Add translation -->
-    <string name="action_join_community">Join in the community</string> <!-- TODO Add translation -->
-    <string name="action_create_server">Create a new server</string> <!-- TODO Add translation -->
-    <string name="action_register">Register</string> <!-- TODO Add translation -->
-    <string name="action_confirm">Confirm</string> <!-- TODO Add translation -->
-    <string name="action_delete_account">Delete account</string> <!-- TODO Add translation -->
+    <string name="action_select_photo_from_gallery">Foto aus der Galerie auswählen</string>
+    <string name="action_take_a_photo">Mach ein Foto</string>
+    <string name="action_reset_avatar">Avatar zurücksetzen</string>
+    <string name="action_connect_server">Verbinden Sie sich mit einem Server</string>
+    <string name="action_join_community">Trete der Community bei</string>
+    <string name="action_create_server">Erstellen Sie einen neuen Server</string>
+    <string name="action_register">Registrieren</string>
+    <string name="action_confirm">Bestätigen</string>
+    <string name="action_delete_account">Konto löschen</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
-        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
-        <item name="item_password">Change password</item> <!-- TODO Add translation -->
-        <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
-        <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
-        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
-        <item name="item_licence">Licence</item> <!-- TODO Add translation -->
-        <item name="item_about">About</item> <!-- TODO Add translation -->
+        <item name="item_preferences">Einstellungen</item>
+        <item name="item_password">Ändere das Passwort</item>
+        <item name="item_share_app">App teilen</item>
+        <item name="item_rate_us">Bewerten Sie uns</item>
+        <item name="item_contact_us">Kontaktiere uns</item>
+        <item name="item_licence">Lizenz</item>
+        <item name="item_about">Über</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -80,8 +80,8 @@
     <string name="msg_username">Benutzername</string>
     <string name="msg_username_or_email">Benutzername oder E-Mail</string>
     <string name="msg_password">Passwort</string>
-    <string name="msg_name">Name</string> <!-- TODO Add translation -->
-    <string name="msg_email">EMail</string> <!-- TODO Add translation -->
+    <string name="msg_name">Name</string>
+    <string name="msg_email">EMail</string>
     <string name="msg_avatar_url">Avatar URL</string>
     <string name="msg_or_continue_using_social_accounts">Oder weiter mit einem Social Account</string>
     <string name="msg_new_user">Neuer Benutzer? %1$s</string>
@@ -106,11 +106,11 @@
     <string name="msg_content_description_log_in_using_gitlab">Login mit Gitlab</string>
     <string name="msg_content_description_log_in_using_wordpress">Login mit WordPress</string>
     <string name="msg_content_description_send_message">Sende Nachricht</string>
-    <string name="msg_content_description_show_more_login_options">Show more login options</string> <!-- TODO Translate-->
+    <string name="msg_content_description_show_more_login_options">Show more login options</string>
     <string name="msg_content_description_show_attachment_options">Zeige Anhang Optionen</string>
     <string name="msg_you">Du</string>
     <string name="msg_unknown">Unbekannt</string>
-    <string name="msg_email_address">E-Mail Addresse</string>
+    <string name="msg_email_address">E-Mail Address</string>
     <string name="msg_utc_offset">UTC Offset</string>
     <string name="msg_new_password">Neues Passwort eingeben</string>
     <string name="msg_confirm_password">Bestätige neues Passwort</string>
@@ -145,27 +145,25 @@
     <string name="msg_file_description">Datei Beschreibung</string>
     <string name="msg_send">Sende</string>
     <string name="msg_sent_attachment">Sende Anhang</string>
-    <string name="msg_welcome_to_rocket_chat">Welcome to Rocket.Chat</string> <!-- TODO Add translation -->
-    <string name="msg_team_communication">Open Source Communication</string> <!-- TODO Add translation -->
-    <string name="msg_login_with_email">Login with <b>e-mail</b></string> <!-- TODO Add translation -->
-    <string name="msg_create_account">Create an account</string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_facebook">Continue with <b>Facebook</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_github">Continue with <b>Github</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_google">Continue with <b>Google</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_linkedin">Continue with <b>Linkedin</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_gitlab">Continue with <b>GitLab</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_wordpress">Continue with <b>WordPress</b></string> <!-- TODO Add translation -->
-    <string name="msg_two_factor_authentication">Two-factor Authentication</string> <!-- TODO Add translation -->
-    <string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
-    <string name="msg_muted_on_this_channel">You are muted on this channel</string>     <!-- TODO - Add proper translation -->
-    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
-    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
-    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
-    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
-    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
+    <string name="msg_welcome_to_rocket_chat">Willkommen bei Rocket.Chat</string>
+    <string name="msg_team_communication">Open Source-Kommunikation</string>
+    <string name="msg_login_with_email">Einloggen mit <b>e-mail</b></string>
+    <string name="msg_create_account">Ein Konto erstellen</string>
+    <string name="msg_continue_with_facebook">Weitermachen mit <b>Facebook</b></string>
+    <string name="msg_continue_with_github">Weitermachen mit <b>Github</b></string>
+    <string name="msg_continue_with_google">Weitermachen mit <b>Google</b></string>
+    <string name="msg_continue_with_linkedin">Weitermachen mit <b>Linkedin</b></string>
+    <string name="msg_continue_with_gitlab">Weitermachen mit <b>GitLab</b></string>
+    <string name="msg_continue_with_wordpress">Weitermachen mit <b>WordPress</b></string>
+    <string name="msg_two_factor_authentication">Zwei-Faktor-Authentifizierung</string>
+    <string name="msg__your_2fa_code">Wie lautet Ihr 2FA-Code?</string>
+    <string name="msg_muted_on_this_channel">Sie sind auf diesem Kanal stummgeschaltet</string>
+    <string name="msg_no_topic">Kein Thema hinzugefügt</string>
+    <string name="msg_no_announcement">Keine Ankündigung hinzugefügt</string>
+    <string name="msg_no_description">Keine Beschreibung hinzugefügt</string>
     <plurals name="msg_reacted_with_">
-        <item quantity="one">%1$s reacted with %2$s</item>     <!-- TODO - Add proper translation -->
-        <item quantity="other">%1$s reacted with %2$s</item>     <!-- TODO - Add proper translation -->
+        <item quantity="one">% 1 $ s reagierte mit% 2 $ s</item>
+        <item quantity="other">% 1 $ s reagierte mit% 2 $ s</item>
     </plurals>
 
     <!-- Create channel messages -->
@@ -182,17 +180,17 @@
     <string name="msg_message_copied">Nachricht kopiert</string>
     <string name="msg_delete_message">Lösche Nachricht</string>
     <string name="msg_delete_description">Sind Sie sicher, dass Sie diese Nachricht löschen wollen?</string>
-    <string name="msg_view_more">view more</string> <!-- TODO - Add proper translation -->
-    <string name="msg_view_less">view less</string> <!-- TODO - Add proper translation -->
-    <string name="msg_permalink_copied">Permalink copied</string> <!-- TODO - Add proper translation -->
-    <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
-    <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
+    <string name="msg_view_more">mehr sehen</string>
+    <string name="msg_view_less">weniger anzeigen</string>
+    <string name="msg_permalink_copied">Permalink kopiert</string>
+    <string name="msg_send_email">E-Mail senden</string>
+    <string name="msg_android_app_support">Android App-Unterstützung</string>
 
     <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">Analytics tracking</string> <!-- TODO Add translation -->
-    <string name="msg_send_analytics_tracking">Send anonymous statics to help improving this app</string> <!-- TODO Add translation -->
-    <string name="msg_do_not_send_analytics_tracking">Do not send anonymous statics to help improving this app</string> <!-- TODO Add translation -->
-    <string name="msg_not_applicable_since_it_is_a_foss_version">Not applicable since it is a FOSS version</string> <!-- TODO Add translation -->
+    <string name="msg_analytics_tracking">Analytics tracking</string>
+    <string name="msg_send_analytics_tracking">Send anonymous statics to help improving this app</string>
+    <string name="msg_do_not_send_analytics_tracking">Do not send anonymous statics to help improving this app</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">Not applicable since it is a FOSS version</string>
 
     <!-- System messages -->
     <string name="message_room_name_changed">Raum Namen geändert zu: %1$s von %2$s</string>
@@ -223,10 +221,8 @@
     <string name="action_msg_share">Teilen</string>
     <string name="action_title_editing">Nachricht bearbeiten</string>
     <string name="action_msg_add_reaction">Reaktion hinzufügen</string>
-    <!-- TODO - Add proper translation -->
-    <string name="action_msg_copy_permalink">Copy permalink</string>
-    <!-- TODO - Add proper translation -->
-    <string name="action_msg_report">Report</string>
+    <string name="action_msg_copy_permalink">Permalink kopieren</string>
+    <string name="action_msg_report">Bericht</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">Bearbeiten nicht erlaubt</string>
@@ -314,7 +310,7 @@
     <string name="dialog_sort_by_activity">Aktivität</string>
     <string name="dialog_group_by_type">Räume nach Typ</string>
     <string name="dialog_group_favourites">Räume nach Favoriten</string>
-    <string name="dialog_button_done">Done</string><!-- TODO Add translation -->
+    <string name="dialog_button_done">Erledigt</string>
     <string name="chatroom_header">Kopf</string>
 
     <!--ChatRooms Headers-->
@@ -331,16 +327,15 @@
     <string name="notif_success_sending">Nachricht gesendet nach %1$s!</string>
     <string name="read_by">Gelesen von</string>
     <string name="message_information_title">Nachricht Information</string>
-    <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string> <!--TODO - Add proper translation-->
-
+    <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
     <!-- User Details -->
-    <string name="message">Message</string> <!--TODO - Add proper translation-->
-    <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
-    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
-    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
+    <string name="message">Botschaft</string>
+    <string name="timezone">Zeitzone</string>
+    <string name="error_opening_dm">Etwas ist schiefgegangen, als wir dieses Gespräch erstellt haben…</string>
+    <string name="retry">Wiederholen</string>
 
     <!-- Report -->
-    <string name="submit">Submit</string> <!--TODO - Add proper translation-->
-    <string name="required">*required</string> <!--TODO - Add proper translation-->
-    <string name="report_sent">Your report has been sent!</string> <!--TODO - Add proper translation-->
+    <string name="submit">einreichen</string>
+    <string name="required">*erforderlich</string>
+    <string name="report_sent">Ihr Bericht wurde gesendet!</string>
 </resources>

From 6f5c3872c3dcb681a32a5a28e791c1973c1da9dc Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Fri, 14 Dec 2018 12:36:30 +0530
Subject: [PATCH 098/149] update (it) strings.xml

---
 app/src/main/res/values-it/strings.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index db1f082c25..2125646a99 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -223,6 +223,7 @@
     <string name="action_title_editing">Modifica messaggio</string>
     <string name="action_msg_add_reaction">Aggiungi reazione</string>
     <string name="action_msg_copy_permalink">Copia permalink</string>
+    <!-- TODO - Add proper translation -->
     <string name="action_msg_report">Report</string>
 
     <!-- Permission messages -->
@@ -331,13 +332,13 @@
     <string name="message_room_changed_privacy">Il tipo di stanza è cambiato in: %1$s da %2$s</string>
 
     <!-- User Details -->
-    <string name="message">Messaggio</string>
-    <string name="timezone">Fuso orario</string>
-    <string name="error_opening_dm">Qualcosa è andato storto mentre stavamo creando questa conversazione ...</string>
-    <string name="retry">Riprova</string>
+    <string name="message">Message</string> <!-- TODO - Add proper translation -->
+    <string name="timezone">Timezone</string> <!-- TODO - Add proper translation -->
+    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
+    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
 
     <!-- Report -->
-    <string name="submit">Sottoscrivi</string>
-    <string name="required">*necessario</string>
-    <string name="report_sent">Il tuo rapporto è stato inviato!</string>
-</resources>
+    <string name="submit">Submit</string> <!-- TODO - Add proper translation -->
+    <string name="required">*required</string> <!-- TODO - Add proper translation -->
+    <string name="report_sent">Your report has been sent!</string> <!-- TODO - Add proper translation -->
+</resources>
\ No newline at end of file

From 832a3a25654990f7726e3804e0af1bdffcd67e98 Mon Sep 17 00:00:00 2001
From: Claudio Massi <claudio.massi@sorint.it>
Date: Fri, 14 Dec 2018 11:21:32 +0100
Subject: [PATCH 099/149] [I18N] Add proper translation to italian strings

---
 app/src/main/res/values-it/strings.xml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 1e75addb0b..a26bb9fb76 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -223,8 +223,7 @@
     <string name="action_title_editing">Modifica messaggio</string>
     <string name="action_msg_add_reaction">Aggiungi reazione</string>
     <string name="action_msg_copy_permalink">Copia permalink</string>
-    <!-- TODO - Add proper translation -->
-    <string name="action_msg_report">Report</string>
+    <string name="action_msg_report">Resoconto</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">La modifica non è consentita</string>
@@ -332,13 +331,13 @@
     <string name="message_room_changed_privacy">Il tipo di stanza è cambiato in: %1$s da %2$s</string>
 
     <!-- User Details -->
-    <string name="message">Message</string> <!-- TODO - Add proper translation -->
-    <string name="timezone">Timezone</string> <!-- TODO - Add proper translation -->
-    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
-    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
+    <string name="message">Messaggio</string>
+    <string name="timezone">Fuso Orario</string>
+    <string name="error_opening_dm">È successo qualcosa di sbagliato durante la creazione di questa conversazione...</string>
+    <string name="retry">Riprova</string>
 
     <!-- Report -->
-    <string name="submit">Submit</string> <!-- TODO - Add proper translation -->
-    <string name="required">*required</string> <!-- TODO - Add proper translation -->
-    <string name="report_sent">Your report has been sent!</string> <!-- TODO - Add proper translation -->
+    <string name="submit">Invia</string>
+    <string name="required">*necessario</string>
+    <string name="report_sent">Il tuo resoconto è stato inviato!</string>
 </resources>

From 841bd2c8dd87a71803710522c3b8d371fded39b6 Mon Sep 17 00:00:00 2001
From: Akshat Jain <lit2016016@iiita.ac.in>
Date: Sat, 15 Dec 2018 01:03:12 +0530
Subject: [PATCH 100/149] fixes #1912

---
 .../presentation/UserDetailsPresenter.kt      | 32 +------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
index 3ff2d8c79f..a0b3ead508 100644
--- a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
@@ -39,37 +39,7 @@ class UserDetailsPresenter @Inject constructor(
                     val openedChatRooms = chatRoomByName(name = u.name)
                     val avatarUrl = u.username?.let { currentServer.avatarUrl(avatar = it) }
 
-                    val chatRoom: ChatRoom? = if (openedChatRooms.isEmpty()) {
-                        ChatRoom(
-                            id = "",
-                            type = roomTypeOf(RoomType.DIRECT_MESSAGE),
-                            name = u.username ?: u.name.orEmpty(),
-                            fullName = u.name,
-                            favorite = false,
-                            open = false,
-                            alert = false,
-                            status = userStatusOf(u.status),
-                            client = client,
-                            broadcast = false,
-                            archived = false,
-                            default = false,
-                            description = null,
-                            groupMentions = null,
-                            userMentions = null,
-                            lastMessage = null,
-                            lastSeen = null,
-                            topic = null,
-                            announcement = null,
-                            roles = null,
-                            unread = 0,
-                            readonly = false,
-                            muted = null,
-                            subscriptionId = "",
-                            timestamp = null,
-                            updatedAt = null,
-                            user = null
-                        )
-                    } else openedChatRooms.firstOrNull()
+                    val chatRoom: ChatRoom? = openedChatRooms.firstOrNull()
 
                     view.showUserDetails(
                         avatarUrl = avatarUrl,

From fa6f0b12d37ffb166dd6c629ed47815ab58a870c Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Fri, 14 Dec 2018 18:32:24 -0300
Subject: [PATCH 101/149] Renders all images formats on the chat room from an
 url link.

---
 .../chat/rocket/android/chatroom/uimodel/UiModelMapper.kt   | 5 ++---
 .../src/main/java/chat/rocket/android/util/extension/Url.kt | 6 ++++++
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 util/src/main/java/chat/rocket/android/util/extension/Url.kt

diff --git a/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt b/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt
index ff953b2ad1..0df75f12dc 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt
@@ -19,7 +19,6 @@ 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
@@ -32,7 +31,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.extension.isImage
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.ifNotNullNorEmpty
 import chat.rocket.android.util.extensions.isNotNullNorEmpty
@@ -127,7 +126,7 @@ class UiModelMapper @Inject constructor(
 
             getChatRoomAsync(message.roomId)?.let { chatRoom ->
                 message.urls?.forEach { url ->
-                    if (url.url.endsWith(".gif")) {
+                    if (url.url.isImage()) {
                         val attachment = Attachment(imageUrl = url.url)
                         mapAttachment(message, attachment, chatRoom)?.let { list.add(it) }
                     } else {
diff --git a/util/src/main/java/chat/rocket/android/util/extension/Url.kt b/util/src/main/java/chat/rocket/android/util/extension/Url.kt
new file mode 100644
index 0000000000..6959710059
--- /dev/null
+++ b/util/src/main/java/chat/rocket/android/util/extension/Url.kt
@@ -0,0 +1,6 @@
+package chat.rocket.android.util.extension
+
+/**
+ * This purely checks if an url link ends with a image format.
+ */
+fun String.isImage() = endsWith(".gif") || endsWith(".png") || endsWith(".jpg") || endsWith("jpeg")
\ No newline at end of file

From b9c6f5445329c65647499155286460ee6f6028bd Mon Sep 17 00:00:00 2001
From: Rafael Kellermann Streit <rafaelks@me.com>
Date: Fri, 14 Dec 2018 19:49:07 -0200
Subject: [PATCH 102/149] Update build.gradle

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index b2c2a5cbb2..199af3eb0e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,7 +16,7 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 2052
+        versionCode 2053
         versionName "3.2.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true

From 906fcb2722126a1fdeaec40c0aab65a256e1a704 Mon Sep 17 00:00:00 2001
From: Lucio Maciel <luciofm@gmail.com>
Date: Fri, 14 Dec 2018 20:23:45 -0300
Subject: [PATCH 103/149] Some improvements on autocomplete speed

---
 .../suggestions/ui/SuggestionsAdapter.kt      | 12 ++++--
 .../android/suggestions/ui/SuggestionsView.kt | 42 ++++++++++++-------
 2 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/suggestions/src/main/java/chat/rocket/android/suggestions/ui/SuggestionsAdapter.kt b/suggestions/src/main/java/chat/rocket/android/suggestions/ui/SuggestionsAdapter.kt
index 69c5601ba6..165e137bb0 100644
--- a/suggestions/src/main/java/chat/rocket/android/suggestions/ui/SuggestionsAdapter.kt
+++ b/suggestions/src/main/java/chat/rocket/android/suggestions/ui/SuggestionsAdapter.kt
@@ -29,6 +29,9 @@ abstract class SuggestionsAdapter<VH : BaseSuggestionViewHolder>(
         notifyDataSetChanged()
     }
 
+    private var currentCount = 0;
+    private var currentItems = listOf<SuggestionModel>()
+
     init {
         setHasStableIds(true)
     }
@@ -41,10 +44,10 @@ abstract class SuggestionsAdapter<VH : BaseSuggestionViewHolder>(
         holder.bind(getItem(position), itemClickListener)
     }
 
-    override fun getItemCount() = strategy.autocompleteItems(currentTerm).size
+    override fun getItemCount() = currentCount
 
     private fun getItem(position: Int): SuggestionModel {
-        return strategy.autocompleteItems(currentTerm)[position]
+        return currentItems[position]
     }
 
     /**
@@ -58,12 +61,15 @@ abstract class SuggestionsAdapter<VH : BaseSuggestionViewHolder>(
 
     fun autocomplete(newTerm: String) {
         this.currentTerm = newTerm.toLowerCase().trim()
+        currentItems = strategy.autocompleteItems(currentTerm)
+        currentCount = currentItems.size
     }
 
     fun addItems(list: List<SuggestionModel>) {
         strategy.addAll(list)
         // Since we've just added new items we should check for possible new completion suggestions.
-        strategy.autocompleteItems(currentTerm)
+        //strategy.autocompleteItems(currentTerm)
+        autocomplete(currentTerm)
         notifyDataSetChanged()
     }
 
diff --git a/suggestions/src/main/java/chat/rocket/android/suggestions/ui/SuggestionsView.kt b/suggestions/src/main/java/chat/rocket/android/suggestions/ui/SuggestionsView.kt
index eafa20f1f4..fcba88de3e 100644
--- a/suggestions/src/main/java/chat/rocket/android/suggestions/ui/SuggestionsView.kt
+++ b/suggestions/src/main/java/chat/rocket/android/suggestions/ui/SuggestionsView.kt
@@ -10,6 +10,7 @@ import android.text.TextWatcher
 import android.transition.Slide
 import android.transition.TransitionManager
 import android.util.AttributeSet
+import android.util.Log
 import android.view.Gravity
 import android.view.View
 import android.widget.EditText
@@ -24,6 +25,7 @@ import chat.rocket.android.suggestions.model.SuggestionModel
 import chat.rocket.android.suggestions.ui.SuggestionsAdapter.Companion.CONSTRAINT_BOUND_TO_START
 import java.lang.ref.WeakReference
 import java.util.concurrent.atomic.AtomicInteger
+import kotlin.system.measureTimeMillis
 
 //  This is a special index that means we're not at an autocompleting state.
 private const val NO_STATE_INDEX = 0
@@ -101,22 +103,32 @@ class SuggestionsView : FrameLayout, TextWatcher {
             return
         }
 
-        val prefixEndIndex = this.editor?.get()?.selectionStart ?: NO_STATE_INDEX
-        if (prefixEndIndex == NO_STATE_INDEX || prefixEndIndex < completionOffset.get()) return
-        val prefix = s.subSequence(completionOffset.get(), this.editor?.get()?.selectionStart
-            ?: completionOffset.get()).toString()
-        recyclerView.adapter?.let {
-            it as SuggestionsAdapter
-            // we need to look up only after the '@'
-            it.autocomplete(prefix)
-            val cacheMap = localProvidersByToken[it.token]
-            if (cacheMap != null && cacheMap[prefix] != null) {
-                it.addItems(cacheMap[prefix]!!)
-            } else {
-                // fetch more suggestions from an external source if any
-                externalProvidersByToken[it.token]?.invoke(prefix)
-            }
+        if (completionOffset.get() == NO_STATE_INDEX) {
+            return
         }
+
+        measureTimeMillis {
+            val prefixEndIndex = this.editor?.get()?.selectionStart ?: NO_STATE_INDEX
+            if (prefixEndIndex == NO_STATE_INDEX || prefixEndIndex < completionOffset.get()) return
+            val prefix = s.subSequence(completionOffset.get(), this.editor?.get()?.selectionStart
+                    ?: completionOffset.get()).toString()
+            recyclerView.adapter?.also {
+                it as SuggestionsAdapter
+                // we need to look up only after the '@'
+                measureTimeMillis { it.autocomplete(prefix) }.let { time ->
+                    Log.d("SuggestionsView", "autocomplete($prefix) in $time ms")
+                }
+                val cacheMap = localProvidersByToken[it.token]
+                if (cacheMap != null && cacheMap[prefix] != null) {
+                    if (it.itemCount == 0) {
+                        it.addItems(cacheMap[prefix]!!)
+                    }
+                } else {
+                    // fetch more suggestions from an external source if any
+                    externalProvidersByToken[it.token]?.invoke(prefix)
+                }
+            }
+        }.let { Log.d("SuggestionsView", "whole prefix in $it ms") }
     }
 
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {

From d656b1e53b9fd0bdd7fee08138edeacd3d543baa Mon Sep 17 00:00:00 2001
From: Rafael Kellermann Streit <rafaelks@me.com>
Date: Fri, 14 Dec 2018 22:27:18 -0200
Subject: [PATCH 104/149] Update build.gradle

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 199af3eb0e..3c2083027d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,7 +16,7 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 2053
+        versionCode 2054
         versionName "3.2.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true

From a7a85a7be6637a9bbe830fec6b77a445fbef518a Mon Sep 17 00:00:00 2001
From: Pitstopper <18574776+Pitstopper@users.noreply.github.com>
Date: Sat, 15 Dec 2018 11:05:00 +0300
Subject: [PATCH 105/149] Update strings.xml

---
 app/src/main/res/values-ru-rRU/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index daaa3d5084..a1023da2b7 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -169,8 +169,8 @@
     <string name="msg_send_email">Отправить e-mail</string>
     <string name="msg_android_app_support">Поддержка Android-приложения</string>
     <string name="msg_muted_on_this_channel">Вы лишены дара речи на этом канале</string>
-    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
-    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
+    <string name="msg_unable_to_update_password">Невозможно обновить пароль. Ошибка: %1$s</string>
+    <string name="msg_password_updated_successfully">Пароль успешно обновлен</string>
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s реагирует с %2$s</item>
         <item quantity="few">%1$s реагируют с %2$s</item>

From 910fa181423114f26ad4b54b4524f020077049c5 Mon Sep 17 00:00:00 2001
From: Akshat Jain <lit2016016@iiita.ac.in>
Date: Sun, 16 Dec 2018 00:16:44 +0530
Subject: [PATCH 106/149] refetch chat rooms

---
 .../android/userdetails/presentation/UserDetailsPresenter.kt  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
index a0b3ead508..09d3dd573b 100644
--- a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
@@ -1,5 +1,6 @@
 package chat.rocket.android.userdetails.presentation
 
+import chat.rocket.android.chatrooms.domain.FetchChatRoomsInteractor
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.server.domain.GetConnectingServerInteractor
@@ -27,6 +28,7 @@ class UserDetailsPresenter @Inject constructor(
     private var currentServer = serverInteractor.get()!!
     private val manager = factory.create(currentServer)
     private val client = manager.client
+    private val interactor = FetchChatRoomsInteractor(client,dbManager)
 
     fun loadUserDetails(userId: String) {
         launchUI(strategy) {
@@ -62,6 +64,8 @@ class UserDetailsPresenter @Inject constructor(
                 client.createDirectMessage(username = id)
             }
 
+            interactor.refreshChatRooms()
+
             val userEntity = withContext(CommonPool) {
                 dbManager.userDao().getUser(id = id)
             }

From 015b2bf97921ba7acff57b8094b9d4d3aa4a2375 Mon Sep 17 00:00:00 2001
From: Divyanshu Bhargava <divyanshub024@gmail.com>
Date: Sun, 16 Dec 2018 16:15:24 +0530
Subject: [PATCH 107/149] Add Hindi translations

---
 app/src/main/res/values-hi-rIN/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 3390bcb247..aad9d66e4f 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -184,8 +184,8 @@
     <string name="msg_no_topic">कोई विषय नहीं जोड़ा गया</string>
     <string name="msg_no_announcement">कोई घोषणा नहीं जोड़ा गया</string>
     <string name="msg_no_description">कोई विवरण नहीं जोड़ा गया</string>
-    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
-    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
+    <string name="msg_unable_to_update_password">पासवर्ड अपडेट करने में असमर्थ। त्रुटि संदेश:% 1$s</string>
+    <string name="msg_password_updated_successfully">पासवर्ड सफलतापूर्वक अपडेट किया गया</string>
     <plurals name="msg_reacted_with_">
         <item quantity="one">% 1 $ s ने% 2 $ %d s के साथ प्रतिक्रिया व्यक्त की</item>
         <item quantity="few">% 1 $ s ने% 2 $ s के साथ प्रतिक्रिया व्यक्त की</item>

From 2adbe1d54661b0f876032567d34f697889fdcc6b Mon Sep 17 00:00:00 2001
From: Vitor <droider.pc@gmail.com>
Date: Mon, 17 Dec 2018 03:08:43 +0100
Subject: [PATCH 108/149] Update strings.xml

Fixed some syntax typos, that, imho, didn't make sense in the way that they were translated
---
 app/src/main/res/values-pt-rBR/strings.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 1363ccc08d..b6df025c47 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -221,8 +221,8 @@
     <string name="action_msg_delete">Remover</string>
     <string name="action_msg_pin">Pinar mensagem</string>
     <string name="action_msg_unpin">Despinar mensagem</string>
-    <string name="action_msg_star">Favoritar mensagem</string>
-    <string name="action_msg_unstar">Desfavoritar messagem</string>
+    <string name="action_msg_star">Marcar como favorita</string>
+    <string name="action_msg_unstar">Desmarcar como favorita</string>
     <string name="action_msg_share">Compartilhar</string>
     <string name="action_title_editing">Editando mensagem</string>
     <string name="action_msg_add_reaction">Adicionar reação</string>
@@ -234,14 +234,14 @@
     <string name="permission_editing_not_allowed">Edição não permitida</string>
     <string name="permission_deleting_not_allowed">Remoção não permitida</string>
     <string name="permission_pinning_not_allowed">Pinagem não permitida</string>
-    <string name="permission_starring_not_allowed">Favoritar não permitido</string>
+    <string name="permission_starring_not_allowed">Marcar como favorita não permitido</string>
 
     <!-- Search message -->
     <string name="title_search_message">Procurar mensagem</string>
 
     <!-- Favorite/Unfavorite chat room -->
-    <string name="title_favorite_chat">Favoritar canal</string>
-    <string name="title_unfavorite_chat">Desfavoritar canal</string>
+    <string name="title_favorite_chat">Marcar canal como favorito</string>
+    <string name="title_unfavorite_chat">Desmarcar canal como favorito</string>
 
     <!-- Members List -->
     <string name="title_members_list">Membros</string>

From 5c971cf116c37fa847ff55adda795b4381803de9 Mon Sep 17 00:00:00 2001
From: Vitor <droider.pc@gmail.com>
Date: Mon, 17 Dec 2018 03:52:06 +0100
Subject: [PATCH 109/149] Update strings.xml

---
 app/src/main/res/values-pt-rBR/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index b6df025c47..fda2aae982 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -219,8 +219,8 @@
     <string name="action_msg_copy">Copiar</string>
     <string name="action_msg_quote">Citar</string>
     <string name="action_msg_delete">Remover</string>
-    <string name="action_msg_pin">Pinar mensagem</string>
-    <string name="action_msg_unpin">Despinar mensagem</string>
+    <string name="action_msg_pin">Afixar mensagem</string>
+    <string name="action_msg_unpin">Desafixar mensagem</string>
     <string name="action_msg_star">Marcar como favorita</string>
     <string name="action_msg_unstar">Desmarcar como favorita</string>
     <string name="action_msg_share">Compartilhar</string>

From 32588833f75a930f77ab6fa2514cdaf154fb2bee Mon Sep 17 00:00:00 2001
From: Akshat Jain <lit2016016@iiita.ac.in>
Date: Mon, 17 Dec 2018 22:33:38 +0530
Subject: [PATCH 110/149] requested changes

---
 .../chatroom/presentation/ChatRoomPresenter.kt       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
index 64aefc4c66..9e736a361a 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
@@ -172,11 +172,13 @@ class ChatRoomPresenter @Inject constructor(
     }
 
     private suspend fun subscribeRoomChanges() {
-        chatRoomId?.let {
-            manager.addRoomChannel(it, roomChangesChannel)
-            for (room in roomChangesChannel) {
-                dbManager.getRoom(room.id)?.let {
-                    view.onRoomUpdated(roomMapper.map(chatRoom = it, showLastMessage = true))
+        withContext(CommonPool + strategy.jobs) {
+            chatRoomId?.let {
+                manager.addRoomChannel(it, roomChangesChannel)
+                for (room in roomChangesChannel) {
+                    dbManager.getRoom(room.id)?.let {
+                        view.onRoomUpdated(roomMapper.map(chatRoom = it, showLastMessage = true))
+                    }
                 }
             }
         }

From 0e4c9ceee2eb6cd20766dc2d89ad213a5c13d649 Mon Sep 17 00:00:00 2001
From: Lucio Maciel <luciofm@gmail.com>
Date: Mon, 17 Dec 2018 16:03:13 -0300
Subject: [PATCH 111/149] Increase db retries

---
 app/src/main/java/chat/rocket/android/util/IO.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/util/IO.kt b/app/src/main/java/chat/rocket/android/util/IO.kt
index 7818f6db67..e1e17d3356 100644
--- a/app/src/main/java/chat/rocket/android/util/IO.kt
+++ b/app/src/main/java/chat/rocket/android/util/IO.kt
@@ -9,7 +9,7 @@ import timber.log.Timber
 import kotlin.coroutines.experimental.coroutineContext
 
 const val DEFAULT_RETRY = 3
-private const val DEFAULT_DB_RETRY = 5
+private const val DEFAULT_DB_RETRY = 15
 
 suspend fun <T> retryIO(
         description: String = "<missing description>",
@@ -42,7 +42,7 @@ suspend fun <T> retryDB(
         description: String = "<missing description>",
         times: Int = DEFAULT_DB_RETRY,
         initialDelay: Long = 100, // 0.1 second
-        maxDelay: Long = 500,    // 0.5 second
+        maxDelay: Long = 1500,    // 1.5 second
         factor: Double = 1.2,
         block: suspend () -> T): T
 {

From 073ca90fae7cc20267789aca9d8aeec722acc765 Mon Sep 17 00:00:00 2001
From: Leonardo Aramaki <leoaramaki@gmail.com>
Date: Mon, 17 Dec 2018 17:42:35 -0200
Subject: [PATCH 112/149] Insert ChatRoom on db for the direct message about to
 be displayed

---
 .../presentation/ChatRoomPresenter.kt         | 121 +++++++++---------
 .../android/chatroom/ui/ChatRoomFragment.kt   |   2 -
 .../android/chatroom/uimodel/UiModelMapper.kt |   2 +-
 .../presentation/UserDetailsPresenter.kt      |  74 ++++++-----
 4 files changed, 108 insertions(+), 91 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
index 64aefc4c66..55e135cc91 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
@@ -132,6 +132,8 @@ class ChatRoomPresenter @Inject constructor(
     ) {
         launch(CommonPool + strategy.jobs) {
             try {
+                chatRoomId = roomId
+                chatRoomType = roomType
                 chatRoles = if (roomTypeOf(roomType) !is RoomType.DirectMessage) {
                     client.chatRoomRoles(roomType = roomTypeOf(roomType), roomName = roomName)
                 } else emptyList()
@@ -172,18 +174,21 @@ class ChatRoomPresenter @Inject constructor(
     }
 
     private suspend fun subscribeRoomChanges() {
-        chatRoomId?.let {
-            manager.addRoomChannel(it, roomChangesChannel)
-            for (room in roomChangesChannel) {
-                dbManager.getRoom(room.id)?.let {
-                    view.onRoomUpdated(roomMapper.map(chatRoom = it, showLastMessage = true))
+        withContext(CommonPool + strategy.jobs) {
+            chatRoomId?.let {
+                manager.addRoomChannel(it, roomChangesChannel)
+                for (room in roomChangesChannel) {
+                    dbManager.getRoom(room.id)?.let {
+                        view.onRoomUpdated(roomMapper.map(chatRoom = it, showLastMessage = true))
+                    }
                 }
             }
+
         }
     }
 
     private fun unsubscribeRoomChanges() {
-        chatRoomId?.let { manager.removeRoomChannel(it)  }
+        chatRoomId?.let { manager.removeRoomChannel(it) }
     }
 
     private fun isOwnerOrMod(): Boolean {
@@ -939,32 +944,32 @@ class ChatRoomPresenter @Inject constructor(
             dbManager.chatRoomDao().getSync(roomId)?.let {
                 with(it.chatRoom) {
                     ChatRoom(
-                            id = id,
-                            subscriptionId = subscriptionId,
-                            type = roomTypeOf(type),
-                            unread = unread,
-                            broadcast = broadcast ?: false,
-                            alert = alert,
-                            fullName = fullname,
-                            name = name,
-                            favorite = favorite ?: false,
-                            default = isDefault ?: false,
-                            readonly = readonly,
-                            open = open,
-                            lastMessage = null,
-                            archived = false,
-                            status = null,
-                            user = null,
-                            userMentions = userMentions,
-                            client = client,
-                            announcement = null,
-                            description = null,
-                            groupMentions = groupMentions,
-                            roles = null,
-                            topic = null,
-                            lastSeen = this.lastSeen,
-                            timestamp = timestamp,
-                            updatedAt = updatedAt
+                        id = id,
+                        subscriptionId = subscriptionId,
+                        type = roomTypeOf(type),
+                        unread = unread,
+                        broadcast = broadcast ?: false,
+                        alert = alert,
+                        fullName = fullname,
+                        name = name,
+                        favorite = favorite ?: false,
+                        default = isDefault ?: false,
+                        readonly = readonly,
+                        open = open,
+                        lastMessage = null,
+                        archived = false,
+                        status = null,
+                        user = null,
+                        userMentions = userMentions,
+                        client = client,
+                        announcement = null,
+                        description = null,
+                        groupMentions = groupMentions,
+                        roles = null,
+                        topic = null,
+                        lastSeen = this.lastSeen,
+                        timestamp = timestamp,
+                        updatedAt = updatedAt
                     )
                 }
             }
@@ -982,32 +987,32 @@ class ChatRoomPresenter @Inject constructor(
             }.map {
                 with(it.chatRoom) {
                     ChatRoom(
-                            id = id,
-                            subscriptionId = subscriptionId,
-                            type = roomTypeOf(type),
-                            unread = unread,
-                            broadcast = broadcast ?: false,
-                            alert = alert,
-                            fullName = fullname,
-                            name = name ?: "",
-                            favorite = favorite ?: false,
-                            default = isDefault ?: false,
-                            readonly = readonly,
-                            open = open,
-                            lastMessage = null,
-                            archived = false,
-                            status = null,
-                            user = null,
-                            userMentions = userMentions,
-                            client = client,
-                            announcement = null,
-                            description = null,
-                            groupMentions = groupMentions,
-                            roles = null,
-                            topic = null,
-                            lastSeen = this.lastSeen,
-                            timestamp = timestamp,
-                            updatedAt = updatedAt
+                        id = id,
+                        subscriptionId = subscriptionId,
+                        type = roomTypeOf(type),
+                        unread = unread,
+                        broadcast = broadcast ?: false,
+                        alert = alert,
+                        fullName = fullname,
+                        name = name ?: "",
+                        favorite = favorite ?: false,
+                        default = isDefault ?: false,
+                        readonly = readonly,
+                        open = open,
+                        lastMessage = null,
+                        archived = false,
+                        status = null,
+                        user = null,
+                        userMentions = userMentions,
+                        client = client,
+                        announcement = null,
+                        description = null,
+                        groupMentions = groupMentions,
+                        roles = null,
+                        topic = null,
+                        lastSeen = this.lastSeen,
+                        timestamp = timestamp,
+                        updatedAt = updatedAt
                     )
                 }
             }
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index c4e61eab06..92000018dd 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -19,7 +19,6 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
 import android.widget.EditText
 import android.widget.FrameLayout
 import android.widget.ImageView
@@ -70,7 +69,6 @@ import chat.rocket.android.helper.MessageParser
 import chat.rocket.android.util.extension.asObservable
 import chat.rocket.android.util.extension.createImageFile
 import chat.rocket.android.util.extensions.circularRevealOrUnreveal
-import chat.rocket.android.util.extensions.content
 import chat.rocket.android.util.extensions.fadeIn
 import chat.rocket.android.util.extensions.fadeOut
 import chat.rocket.android.util.extensions.getBitmpap
diff --git a/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt b/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt
index 0df75f12dc..b8edea84a4 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt
@@ -168,7 +168,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().getSync(roomId)?.let {
+        return@withContext dbManager.getRoom(id = roomId)?.let {
             with(it.chatRoom) {
                 ChatRoom(
                     id = id,
diff --git a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
index 3ff2d8c79f..8e530aa1ac 100644
--- a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
@@ -2,6 +2,7 @@ package chat.rocket.android.userdetails.presentation
 
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManager
+import chat.rocket.android.db.model.ChatRoomEntity
 import chat.rocket.android.server.domain.GetConnectingServerInteractor
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
 import chat.rocket.android.util.extension.launchUI
@@ -97,43 +98,56 @@ class UserDetailsPresenter @Inject constructor(
             }
 
             if (userEntity != null) {
-                view.toDirectMessage(
-                    chatRoom = ChatRoom(
-                        id = result.id,
-                        type = roomTypeOf(RoomType.DIRECT_MESSAGE),
-                        name = userEntity.username ?: userEntity.name.orEmpty(),
-                        fullName = userEntity.name,
-                        favorite = false,
-                        open = false,
-                        alert = false,
-                        status = userStatusOf(userEntity.status),
-                        client = client,
-                        broadcast = false,
-                        archived = false,
-                        default = false,
-                        description = null,
-                        groupMentions = null,
-                        userMentions = null,
-                        lastMessage = null,
-                        lastSeen = null,
-                        topic = null,
-                        announcement = null,
-                        roles = null,
-                        unread = 0,
-                        readonly = false,
-                        muted = null,
-                        subscriptionId = "",
-                        timestamp = null,
-                        updatedAt = result.updatedAt,
-                        user = null
-                    )
+                val chatRoom = ChatRoom(
+                    id = result.id,
+                    type = roomTypeOf(RoomType.DIRECT_MESSAGE),
+                    name = userEntity.username ?: userEntity.name.orEmpty(),
+                    fullName = userEntity.name,
+                    favorite = false,
+                    open = false,
+                    alert = false,
+                    status = userStatusOf(userEntity.status),
+                    client = client,
+                    broadcast = false,
+                    archived = false,
+                    default = false,
+                    description = null,
+                    groupMentions = null,
+                    userMentions = null,
+                    lastMessage = null,
+                    lastSeen = null,
+                    topic = null,
+                    announcement = null,
+                    roles = null,
+                    unread = 0,
+                    readonly = false,
+                    muted = null,
+                    subscriptionId = "",
+                    timestamp = null,
+                    updatedAt = result.updatedAt,
+                    user = null
                 )
+
+                withContext(CommonPool + strategy.jobs) {
+                    dbManager.chatRoomDao().insertOrReplace(chatRoom = ChatRoomEntity(
+                        id = chatRoom.id,
+                        name = chatRoom.name,
+                        description = chatRoom.description,
+                        type = chatRoom.type.toString(),
+                        fullname = chatRoom.fullName,
+                        subscriptionId = chatRoom.subscriptionId,
+                        updatedAt = chatRoom.updatedAt
+                    ))
+                }
+
+                view.toDirectMessage(chatRoom = chatRoom)
             }
         } catch (ex: Exception) {
             Timber.e(ex)
             view.onOpenDirectMessageError()
         }
     }
+
     private suspend fun chatRoomByName(name: String? = null): List<ChatRoom> = withContext(CommonPool) {
         return@withContext dbManager.chatRoomDao().getAllSync().filter {
             if (name == null) {

From 531c5a0f559b140f0840f069a4eba9c916b1a6fd Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Mon, 17 Dec 2018 17:08:07 -0300
Subject: [PATCH 113/149] Draft messages improvements

---
 .../presentation/ChatRoomPresenter.kt         | 30 +++++++++----------
 .../android/chatroom/ui/ChatRoomFragment.kt   | 16 ++++------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
index 64aefc4c66..9a60423503 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
@@ -123,6 +123,7 @@ class ChatRoomPresenter @Inject constructor(
     private var lastState = manager.state
     private var typingStatusList = arrayListOf<String>()
     private val roomChangesChannel = Channel<Room>(Channel.CONFLATED)
+    private lateinit var unfinishedMessageKey: String
 
     fun setupChatRoom(
         roomId: String,
@@ -132,9 +133,12 @@ class ChatRoomPresenter @Inject constructor(
     ) {
         launch(CommonPool + strategy.jobs) {
             try {
+                unfinishedMessageKey = "${currentServer}_${LocalRepository.UNFINISHED_MSG_KEY}$roomId"
                 chatRoles = if (roomTypeOf(roomType) !is RoomType.DirectMessage) {
                     client.chatRoomRoles(roomType = roomTypeOf(roomType), roomName = roomName)
-                } else emptyList()
+                } else {
+                    emptyList()
+                }
             } catch (ex: RocketChatException) {
                 Timber.e(ex)
                 chatRoles = emptyList()
@@ -364,6 +368,7 @@ class ChatRoomPresenter @Inject constructor(
                     client.updateMessage(chatRoomId, messageId, text)
                 }
 
+                clearUnfinishedMessage()
                 view.enableSendMessageButton()
             } catch (ex: Exception) {
                 Timber.d(ex, "Error sending message...")
@@ -1281,31 +1286,26 @@ class ChatRoomPresenter @Inject constructor(
     }
 
     /**
-     * Save unfinished message, when user left chat room without sending a message. It also clears
-     * saved message from local repository when unfinishedMessage is blank.
+     * Save unfinished message, when user left chat room without sending a message.
      *
-     * @param chatRoomId Chat room Id.
      * @param unfinishedMessage The unfinished message to save.
      */
-    fun saveUnfinishedMessage(chatRoomId: String, unfinishedMessage: String) {
-        val key = "${currentServer}_${LocalRepository.UNFINISHED_MSG_KEY}$chatRoomId"
+    fun saveUnfinishedMessage(unfinishedMessage: String) {
         if (unfinishedMessage.isNotBlank()) {
-            localRepository.save(key, unfinishedMessage)
-        } else {
-            localRepository.clear(key)
+            localRepository.save(unfinishedMessageKey, unfinishedMessage)
         }
     }
 
+    fun clearUnfinishedMessage() {
+        localRepository.clear(unfinishedMessageKey)
+    }
     /**
      * Get unfinished message from local repository, when user left chat room without
      * sending a message and now the user is back.
      *
-     * @param chatRoomId Chat room Id.
-     *
-     * @return Returns the unfinished message.
+     * @return Returns the unfinished message, null otherwise.
      */
-    fun getUnfinishedMessage(chatRoomId: String): String {
-        val key = "${currentServer}_${LocalRepository.UNFINISHED_MSG_KEY}$chatRoomId"
-        return localRepository.get(key) ?: ""
+    fun getUnfinishedMessage(): String? {
+        return localRepository.get(unfinishedMessageKey)
     }
 }
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index c4e61eab06..3f376847c4 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -76,6 +76,7 @@ import chat.rocket.android.util.extensions.fadeOut
 import chat.rocket.android.util.extensions.getBitmpap
 import chat.rocket.android.util.extensions.hideKeyboard
 import chat.rocket.android.util.extensions.inflate
+import chat.rocket.android.util.extensions.isNotNullNorEmpty
 import chat.rocket.android.util.extensions.rotateBy
 import chat.rocket.android.util.extensions.showToast
 import chat.rocket.android.util.extensions.textContent
@@ -242,6 +243,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
 
         presenter.setupChatRoom(chatRoomId, chatRoomName, chatRoomType, chatRoomMessage)
         presenter.loadChatRooms()
+        getUnfinishedMessage()
         setupRecyclerView()
         setupFab()
         setupSuggestionsView()
@@ -264,9 +266,9 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         recycler_view.removeOnScrollListener(onScrollListener)
         recycler_view.removeOnLayoutChangeListener(layoutChangeListener)
 
-        presenter.disconnect()
-        presenter.saveUnfinishedMessage(chatRoomId, text_message.text.toString())
+        presenter.saveUnfinishedMessage(text_message.text.toString())
         handler.removeCallbacksAndMessages(null)
+        presenter.disconnect()
         unsubscribeComposeTextMessage()
 
         // Hides the keyboard (if it's opened) before going to any view.
@@ -953,15 +955,9 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     }
 
     private fun getUnfinishedMessage() {
-        val unfinishedMessage = presenter.getUnfinishedMessage(chatRoomId)
-        if (unfinishedMessage.isNotBlank()) {
+        val unfinishedMessage = presenter.getUnfinishedMessage()
+        if (unfinishedMessage.isNotNullNorEmpty()) {
             text_message.setText(unfinishedMessage)
-            val orientation = resources.configuration.orientation
-            if (orientation == Configuration.ORIENTATION_PORTRAIT) {
-                KeyboardHelper.showSoftKeyboard(text_message)
-            } else {
-                //TODO show keyboard in full screen mode when landscape orientation
-            }
         }
     }
 

From 7259fe61092a0102ccf0c071e638b6b5053fb597 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Tue, 18 Dec 2018 11:04:28 -0300
Subject: [PATCH 114/149] Update translations.

---
 app/src/main/res/values-pt-rBR/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index fda2aae982..b5659dc8b3 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -219,8 +219,8 @@
     <string name="action_msg_copy">Copiar</string>
     <string name="action_msg_quote">Citar</string>
     <string name="action_msg_delete">Remover</string>
-    <string name="action_msg_pin">Afixar mensagem</string>
-    <string name="action_msg_unpin">Desafixar mensagem</string>
+    <string name="action_msg_pin">Fixar mensagem</string>
+    <string name="action_msg_unpin">Desfixar mensagem</string>
     <string name="action_msg_star">Marcar como favorita</string>
     <string name="action_msg_unstar">Desmarcar como favorita</string>
     <string name="action_msg_share">Compartilhar</string>

From 3c7ab6623015f648856ec346cf94950b148f1d8d Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Tue, 18 Dec 2018 11:54:15 -0300
Subject: [PATCH 115/149] Update string and fix CI failing status.

---
 .../android/chatrooms/ui/ChatRoomsFragment.kt |  2 +-
 .../presentation/PasswordPresenter.kt         |  5 ++-
 .../password/presentation/PasswordView.kt     |  2 +-
 .../settings/password/ui/PasswordFragment.kt  |  2 +-
 app/src/main/res/menu/chatrooms.xml           |  2 +-
 app/src/main/res/values-de/strings.xml        |  3 +-
 app/src/main/res/values-es/strings.xml        |  3 +-
 app/src/main/res/values-fr/strings.xml        |  3 +-
 app/src/main/res/values-hi-rIN/strings.xml    |  5 +--
 app/src/main/res/values-it/strings.xml        |  2 +-
 app/src/main/res/values-ja/strings.xml        |  3 +-
 app/src/main/res/values-pt-rBR/strings.xml    | 40 +++++++++----------
 app/src/main/res/values-ru-rRU/strings.xml    |  3 +-
 app/src/main/res/values-tr/strings.xml        |  3 +-
 app/src/main/res/values-uk/strings.xml        |  3 +-
 app/src/main/res/values/strings.xml           |  3 +-
 16 files changed, 38 insertions(+), 46 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt b/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
index ffb5d23616..f7d1dbd786 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
@@ -239,7 +239,7 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
                 AlertDialog.Builder(context)
                     .setTitle(R.string.dialog_sort_title)
                     .setView(dialogLayout)
-                    .setPositiveButton(R.string.dialog_button_done) { dialog, _ ->
+                    .setPositiveButton(R.string.msg_sort) { dialog, _ ->
                         invalidateQueryOnSearch()
                         updateSort()
                         dialog.dismiss()
diff --git a/app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordPresenter.kt b/app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordPresenter.kt
index 1436a70235..2731855a45 100644
--- a/app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordPresenter.kt
@@ -8,6 +8,7 @@ import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
+import chat.rocket.common.util.ifNull
 import chat.rocket.core.RocketChatClient
 import chat.rocket.core.internal.rest.updateProfile
 import javax.inject.Inject
@@ -36,7 +37,9 @@ class PasswordPresenter @Inject constructor(
                 }
             } catch (exception: RocketChatException) {
                 analyticsManager.logResetPassword(false)
-                view.showPasswordFailsUpdateMessage(exception.message)
+                exception.message?.let { errorMessage ->
+                    view.showPasswordFailsUpdateMessage(errorMessage)
+                }
             } finally {
                 view.hideLoading()
             }
diff --git a/app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordView.kt b/app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordView.kt
index 10b185c14b..81d086f8ec 100644
--- a/app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordView.kt
+++ b/app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordView.kt
@@ -12,5 +12,5 @@ interface PasswordView: LoadingView {
      * Shows a message when the user's password fails to update
      * @param error is a String containing the failure message
      */
-    fun showPasswordFailsUpdateMessage(error : String?)
+    fun showPasswordFailsUpdateMessage(error : String)
 }
diff --git a/app/src/main/java/chat/rocket/android/settings/password/ui/PasswordFragment.kt b/app/src/main/java/chat/rocket/android/settings/password/ui/PasswordFragment.kt
index 951fbf76b1..22783280c3 100644
--- a/app/src/main/java/chat/rocket/android/settings/password/ui/PasswordFragment.kt
+++ b/app/src/main/java/chat/rocket/android/settings/password/ui/PasswordFragment.kt
@@ -96,7 +96,7 @@ class PasswordFragment : Fragment(), PasswordView, ActionMode.Callback {
         }
     }
 
-    override fun showPasswordFailsUpdateMessage(error: String?) {
+    override fun showPasswordFailsUpdateMessage(error: String) {
         showToast(getString(R.string.msg_unable_to_update_password, error))
     }
 
diff --git a/app/src/main/res/menu/chatrooms.xml b/app/src/main/res/menu/chatrooms.xml
index 215f1484d7..c40c4ef270 100644
--- a/app/src/main/res/menu/chatrooms.xml
+++ b/app/src/main/res/menu/chatrooms.xml
@@ -14,7 +14,7 @@
     <item
         android:id="@+id/action_sort"
         android:icon="@drawable/ic_sort"
-        android:title="@string/menu_chatroom_sort"
+        android:title="@string/msg_sort"
         app:showAsAction="ifRoom" />
 
 </menu>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e1088f00eb..baf5f28743 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -306,13 +306,12 @@
     <string name="alert_title_default_skin_tone">Standart Hautton</string>
 
     <!-- Sorting and grouping-->
-    <string name="menu_chatroom_sort">Sortiere</string>
+    <string name="msg_sort">Sortiere</string>
     <string name="dialog_sort_title">Sortieren nach</string>
     <string name="dialog_sort_by_alphabet">Alphabetisch</string>
     <string name="dialog_sort_by_activity">Aktivität</string>
     <string name="dialog_group_by_type">Räume nach Typ</string>
     <string name="dialog_group_favourites">Räume nach Favoriten</string>
-    <string name="dialog_button_done">Erledigt</string>
     <string name="chatroom_header">Kopf</string>
 
     <!--ChatRooms Headers-->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 4c0ab28ac4..2f31019021 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -305,13 +305,12 @@
     <string name="alert_title_default_skin_tone">Tono de piel predeterminado</string>
 
     <!-- Sorting and grouping-->
-    <string name="menu_chatroom_sort">Ordenar</string>
+    <string name="msg_sort">Ordenar</string>
     <string name="dialog_sort_title">Ordenar por</string>
     <string name="dialog_sort_by_alphabet">Alfabético</string>
     <string name="dialog_sort_by_activity">Actividad</string>
     <string name="dialog_group_by_type">Agrupar por tipo</string>
     <string name="dialog_group_favourites">Agrupar favoritos</string>
-    <string name="dialog_button_done">Done</string><!-- TODO Add translation -->
     <string name="chatroom_header">Cabezazo</string>
 
     <!--ChatRooms Headers-->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4bb6a2403f..4201e75d5f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -310,13 +310,12 @@
     <string name="alert_title_default_skin_tone">Tonalité de peau par défaut</string>
 
     <!-- Sorting and grouping-->
-    <string name="menu_chatroom_sort">Trier</string>
+    <string name="msg_sort">Trier</string>
     <string name="dialog_sort_title">Trier par</string>
     <string name="dialog_sort_by_alphabet">Alphabétique</string>
     <string name="dialog_sort_by_activity">Activité</string>
     <string name="dialog_group_by_type">Grouper par type</string>
     <string name="dialog_group_favourites">Grouper favoris</string>
-    <string name="dialog_button_done">Ok</string>
     <string name="chatroom_header">Entête</string>
 
     <!--ChatRooms Headers-->
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index aad9d66e4f..8b2d8590b6 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -184,7 +184,7 @@
     <string name="msg_no_topic">कोई विषय नहीं जोड़ा गया</string>
     <string name="msg_no_announcement">कोई घोषणा नहीं जोड़ा गया</string>
     <string name="msg_no_description">कोई विवरण नहीं जोड़ा गया</string>
-    <string name="msg_unable_to_update_password">पासवर्ड अपडेट करने में असमर्थ। त्रुटि संदेश:% 1$s</string>
+    <string name="msg_unable_to_update_password">पासवर्ड अपडेट करने में असमर्थ। त्रुटि संदेश: %1$s</string>
     <string name="msg_password_updated_successfully">पासवर्ड सफलतापूर्वक अपडेट किया गया</string>
     <plurals name="msg_reacted_with_">
         <item quantity="one">% 1 $ s ने% 2 $ %d s के साथ प्रतिक्रिया व्यक्त की</item>
@@ -310,13 +310,12 @@
     <string name="alert_title_default_skin_tone">डिफ़ॉल्ट त्वचा टोन</string>
 
     <!-- Sorting and grouping-->
-    <string name="menu_chatroom_sort">क्रम</string>
+    <string name="msg_sort">क्रम</string>
     <string name="dialog_sort_title">द्वारा सॉर्ट करें</string>
     <string name="dialog_sort_by_alphabet">वर्णानुक्रम</string>
     <string name="dialog_sort_by_activity">गतिविधि</string>
     <string name="dialog_group_by_type">प्रकार के आधार पर समूह</string>
     <string name="dialog_group_favourites">पसंदीदा समूह</string>
-    <string name="dialog_button_done">पूर्ण</string>
     <string name="chatroom_header">हैडर</string>
 
     <!--ChatRooms Headers-->
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 1ebce3aa1c..7d6599c800 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -306,7 +306,7 @@
     <string name="alert_title_default_skin_tone">Default skin tone</string>
 
     <!-- Sorting and grouping-->
-    <string name="menu_chatroom_sort">Ordinare</string>
+    <string name="msg_sort">Ordinare</string>
     <string name="dialog_sort_title">Ordinare per</string>
     <string name="dialog_sort_by_alphabet">Alfabeto</string>
     <string name="dialog_sort_by_activity">Attività</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index e0813fa0c9..9c5d8fa924 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -312,14 +312,13 @@
     <string name="alert_title_default_skin_tone">デフォルトスキントークン</string>
 
     <!-- Sorting and grouping-->
-    <string name="menu_chatroom_sort">ソート</string>
+    <string name="msg_sort">ソート</string>
     <string name="dialog_sort_title">ソート</string>
     <string name="dialog_sort_by_alphabet">アルファベット順</string>
     <string name="dialog_sort_by_activity">アクティビティ順</string>
     <string name="dialog_group_by_type">グループ別</string>
     <string name="dialog_group_favourites">お気に入りのグループ</string>
     <string name="chatroom_header">ヘッダ</string>
-    <string name="dialog_button_done">完了</string>
 
 
     <!--ChatRooms Headers-->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index b5659dc8b3..41a5baaceb 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -22,9 +22,9 @@
     <string name="title_update_profile">Editar perfil</string>
     <string name="title_about">Sobre</string>
     <string name="title_create_channel">Criar chat</string>
-    <string name="title_licence">Licença</string> <!-- TODO Add translation -->
+    <string name="title_licence">Licença</string>
     <string name="title_are_you_sure">Você tem certeza?</string>
-    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_channel_details">Detalhes do canal</string>
     <string name="title_topic">Tópico</string>
     <string name="title_announcement">Anúncio</string>
     <string name="title_description">Descrição</string>
@@ -150,29 +150,30 @@
     <string name="msg_send">Enviar</string>
     <string name="msg_delete_message">Remove mensagem</string>
     <string name="msg_delete_description">Tem certeza que quer apagar esta mensagem?</string>
-    <string name="msg_welcome_to_rocket_chat">Welcome to Rocket.Chat</string> <!-- TODO Add translation -->
-    <string name="msg_team_communication">Open Source Communication</string> <!-- TODO Add translation -->
-    <string name="msg_login_with_email">Login with <b>e-mail</b></string> <!-- TODO Add translation -->
-    <string name="msg_create_account">Create an account</string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_facebook">Continue with <b>Facebook</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_github">Continue with <b>Github</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_google">Continue with <b>Google</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_linkedin">Continue with <b>Linkedin</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_gitlab">Continue with <b>GitLab</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_wordpress">Continue with <b>WordPress</b></string> <!-- TODO Add translation -->
-    <string name="msg_two_factor_authentication">Two-factor Authentication</string> <!-- TODO Add translation -->
-    <string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
+    <string name="msg_welcome_to_rocket_chat">Bem-vindo ao Rocket.Chat</string>
+    <string name="msg_team_communication">Comunicação Open Source</string>
+    <string name="msg_login_with_email">Fazer login com <b>e-mail</b></string>
+    <string name="msg_create_account">Criar conta</string>
+    <string name="msg_continue_with_facebook">Continuar com <b>Facebook</b></string>
+    <string name="msg_continue_with_github">Continuar com <b>Github</b></string>
+    <string name="msg_continue_with_google">Continuar com <b>Google</b></string>
+    <string name="msg_continue_with_linkedin">Continuar com <b>Linkedin</b></string>
+    <string name="msg_continue_with_gitlab">Continuar com <b>GitLab</b></string>
+    <string name="msg_continue_with_wordpress">Continuar com <b>WordPress</b></string>
+    <string name="msg_two_factor_authentication">Autenticação de dois fatores</string>
+    <string name="msg__your_2fa_code">Qual é o seu código da autenticação de dois fatores?</string>
     <string name="msg_view_more">visualizar mais</string>
     <string name="msg_view_less">visualizar menos</string>
     <string name="msg_permalink_copied">Permalink copiado</string>
     <string name="msg_send_email">Enviar e-mail</string>
     <string name="msg_android_app_support">Suporte ao aplicativo Android</string>
     <string name="msg_muted_on_this_channel">Você está silenciado neste canal</string>
-    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
-    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
-    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
+    <string name="msg_no_topic">Nenhum tópico adicionado</string>
+    <string name="msg_no_announcement">Nenhum anúncio adicionado</string>
+    <string name="msg_no_description">Nenhuma descrição adicionada</string>
     <string name="msg_unable_to_update_password">Não foi possível atualizar a senha. Mensagem de erro: %1$s</string>
     <string name="msg_password_updated_successfully">Senha alterada com sucesso</string>
+    <string name="msg_sort">Ordenar</string>
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s reagiu com %2$s</item>
         <item quantity="other">%1$s reagiram com %2$s</item>
@@ -194,7 +195,7 @@
     <string name="msg_analytics_tracking">Rastreamento de análises</string>
     <string name="msg_send_analytics_tracking">Envie estatísticas anônimas para ajudar a melhorar este app</string>
     <string name="msg_do_not_send_analytics_tracking">Não envie estatísticas anônimas para ajudar a melhorar este app</string>
-    <string name="msg_not_applicable_since_it_is_a_foss_version">Not aplicável devido a versão do aplicativo ser FOSS</string> <!-- TODO Add translation -->
+    <string name="msg_not_applicable_since_it_is_a_foss_version">Não aplicável devido a versão do aplicativo ser FOSS</string>
 
     <!-- System messages -->
     <string name="message_room_name_changed">Nome da sala alterado para: %1$s por %2$s</string>
@@ -227,7 +228,6 @@
     <string name="action_title_editing">Editando mensagem</string>
     <string name="action_msg_add_reaction">Adicionar reação</string>
     <string name="action_msg_copy_permalink">Copiar permalink</string>
-    <!-- TODO - Add proper translation -->
     <string name="action_msg_report">Reportar</string>
 
     <!-- Permission messages -->
@@ -310,13 +310,11 @@
     <string name="alert_title_default_skin_tone">Tom de pele padrão</string>
 
     <!-- Sorting and grouping-->
-    <string name="menu_chatroom_sort">Ordenar</string>
     <string name="dialog_sort_title">Ordenar por</string>
     <string name="dialog_sort_by_alphabet">Alfabeticamente</string>
     <string name="dialog_sort_by_activity">Atividade</string>
     <string name="dialog_group_by_type">Agrupar por tipo</string>
     <string name="dialog_group_favourites">Grupos favoritos</string>
-    <string name="dialog_button_done">Done</string><!-- TODO Add translation -->
     <string name="chatroom_header">Cabeçalho</string>
 
     <!--ChatRooms Headers-->
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index a1023da2b7..ba5a1ac3e2 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -307,13 +307,12 @@
     <string name="alert_title_default_skin_tone">Тон кожи по умолчанию</string>
 
     <!-- Sorting and grouping-->
-    <string name="menu_chatroom_sort">Сортировать</string>
+    <string name="msg_sort">Сортировать</string>
     <string name="dialog_sort_title">Сортировать по</string>
     <string name="dialog_sort_by_alphabet">По алфавиту</string>
     <string name="dialog_sort_by_activity">По активности</string>
     <string name="dialog_group_by_type">Группировать по типу</string>
     <string name="dialog_group_favourites">Группировать избранное</string>
-    <string name="dialog_button_done">Ок</string>
     <string name="chatroom_header">Заголовок</string>
 
     <!--ChatRooms Headers-->
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index a99f23bebb..d00489257a 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -312,13 +312,12 @@
     <string name="alert_title_default_skin_tone">Varsayılan tasarım tonu</string>
 
     <!-- Sorting and grouping-->
-    <string name="menu_chatroom_sort">Sırala</string>
+    <string name="msg_sort">Sırala</string>
     <string name="dialog_sort_title">Sırala</string>
     <string name="dialog_sort_by_alphabet">Alfabetik</string>
     <string name="dialog_sort_by_activity">Aktiviteye Göre</string>
     <string name="dialog_group_by_type">Türüne göre grupla</string>
     <string name="dialog_group_favourites">Favorileri grupla</string>
-    <string name="dialog_button_done">Tamam</string>
     <string name="chatroom_header">Başlık</string>
 
     <!--ChatRooms Headers-->
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index a48e914728..19881aafe6 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -308,13 +308,12 @@
     <string name="alert_title_default_skin_tone">Тон шкіри за замовчуванням</string>
 
     <!-- Sorting and grouping-->
-    <string name="menu_chatroom_sort">Сортувати</string>
+    <string name="msg_sort">Сортувати</string>
     <string name="dialog_sort_title">Сортувати за</string>
     <string name="dialog_sort_by_alphabet">За алфавітом</string>
     <string name="dialog_sort_by_activity">За активністю</string>
     <string name="dialog_group_by_type">Групувати за типом</string>
     <string name="dialog_group_favourites">Групувати обране</string>
-    <string name="dialog_button_done">Ок</string>
     <string name="chatroom_header">Заголовок</string>
 
     <!--ChatRooms Headers-->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dae30aea22..ad457877fd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -323,13 +323,12 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="alert_title_default_skin_tone">Default skin tone</string>
 
     <!-- Sorting and grouping-->
-    <string name="menu_chatroom_sort">Sort</string>
+    <string name="msg_sort">Sort</string>
     <string name="dialog_sort_title">Sort by</string>
     <string name="dialog_sort_by_alphabet">Alphabetical</string>
     <string name="dialog_sort_by_activity">Activity</string>
     <string name="dialog_group_by_type">Group by type</string>
     <string name="dialog_group_favourites">Group favourites</string>
-    <string name="dialog_button_done">Done</string>
     <string name="chatroom_header">Header</string>
 
     <!--ChatRooms Headers-->

From ced32ca941038708c70082f7befb0517b6d5b464 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Tue, 18 Dec 2018 12:10:02 -0300
Subject: [PATCH 116/149] Remove unneeded string and fix some wrong formatting
 for placeholders.

---
 app/src/main/res/values-de/strings.xml     | 4 ++--
 app/src/main/res/values-hi-rIN/strings.xml | 6 +++---
 app/src/main/res/values-it/strings.xml     | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index baf5f28743..fc2dac0ebf 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -164,8 +164,8 @@
     <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
     <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
-        <item quantity="one">% 1 $ s reagierte mit% 2 $ s</item>
-        <item quantity="other">% 1 $ s reagierte mit% 2 $ s</item>
+        <item quantity="one">%1$ s reagierte mit %2$s</item>
+        <item quantity="other">%1$s reagierte mit %2$s</item>
     </plurals>
 
     <!-- Create channel messages -->
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 8b2d8590b6..4a2a98fc77 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -187,9 +187,9 @@
     <string name="msg_unable_to_update_password">पासवर्ड अपडेट करने में असमर्थ। त्रुटि संदेश: %1$s</string>
     <string name="msg_password_updated_successfully">पासवर्ड सफलतापूर्वक अपडेट किया गया</string>
     <plurals name="msg_reacted_with_">
-        <item quantity="one">% 1 $ s ने% 2 $ %d s के साथ प्रतिक्रिया व्यक्त की</item>
-        <item quantity="few">% 1 $ s ने% 2 $ s के साथ प्रतिक्रिया व्यक्त की</item>
-        <item quantity="many">% 1 $ s ने% 2 $ s के साथ प्रतिक्रिया व्यक्त की</item>
+        <item quantity="one">%1$s ने %2$s के साथ प्रतिक्रिया व्यक्त की</item>
+        <item quantity="few">%1$s ने %2$s के साथ प्रतिक्रिया व्यक्त की</item>
+        <item quantity="many">%1$s ने %2$s के साथ प्रतिक्रिया व्यक्त की</item>
     </plurals>
 
     <!-- Preferences messages -->
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 7d6599c800..62de479301 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -312,7 +312,6 @@
     <string name="dialog_sort_by_activity">Attività</string>
     <string name="dialog_group_by_type">Raggruppa per tipo</string>
     <string name="dialog_group_favourites">Raggruppa preferiti</string>
-    <string name="dialog_button_done">Fatto</string>
     <string name="chatroom_header">Intestazione</string>
 
     <!--ChatRooms Headers-->

From 826d21e674adcd04d2fd9541742e8c42b1d15629 Mon Sep 17 00:00:00 2001
From: Pitstopper <18574776+Pitstopper@users.noreply.github.com>
Date: Tue, 18 Dec 2018 19:57:19 +0300
Subject: [PATCH 117/149] Update strings.xml

---
 app/src/main/res/values-ru-rRU/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index ba5a1ac3e2..81d6c0adc6 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -190,7 +190,7 @@
     <string name="msg_channel_created_successfully">Канал создан успешно</string>
 
     <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">Отслеживание Analytics</string>
+    <string name="msg_analytics_tracking">Отслеживание аналитики</string>
     <string name="msg_send_analytics_tracking">Отправлять анонимную статистику для улучшения приложения.</string>
     <string name="msg_do_not_send_analytics_tracking">Не отправлять анонимную статистику для улучшения приложения</string>
     <string name="msg_not_applicable_since_it_is_a_foss_version">Не применимо, так как это FOSS версия</string>

From a3830e75ec329306ea9ac85037466305029828e8 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Wed, 19 Dec 2018 13:49:11 -0300
Subject: [PATCH 118/149] Fix bug with lateinit property being not initialized.

---
 .../presentation/ChatRoomPresenter.kt         |  19 +-
 .../android/chatroom/ui/ChatRoomFragment.kt   | 171 +++++++++---------
 .../android/infrastructure/LocalRepository.kt |   2 +-
 app/src/main/res/values-de/strings.xml        |   2 +-
 app/src/main/res/values-es/strings.xml        |   2 +-
 app/src/main/res/values-fr/strings.xml        |   2 +-
 app/src/main/res/values-hi-rIN/strings.xml    |   2 +-
 app/src/main/res/values-it/strings.xml        |   2 +-
 app/src/main/res/values-ja/strings.xml        |   2 +-
 app/src/main/res/values-pt-rBR/strings.xml    |   2 +-
 app/src/main/res/values-ru-rRU/strings.xml    |   2 +-
 app/src/main/res/values-tr/strings.xml        |   2 +-
 12 files changed, 100 insertions(+), 110 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
index 3a37dbc8fa..0258ddd0f7 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
@@ -123,7 +123,7 @@ class ChatRoomPresenter @Inject constructor(
     private var lastState = manager.state
     private var typingStatusList = arrayListOf<String>()
     private val roomChangesChannel = Channel<Room>(Channel.CONFLATED)
-    private lateinit var unfinishedMessageKey: String
+    private lateinit var draftKey: String
 
     fun setupChatRoom(
         roomId: String,
@@ -131,17 +131,17 @@ class ChatRoomPresenter @Inject constructor(
         roomType: String,
         chatRoomMessage: String? = null
     ) {
+        draftKey = "${currentServer}_${LocalRepository.DRAFT_KEY}$roomId"
+        chatRoomId = roomId
+        chatRoomType = roomType
         launch(CommonPool + strategy.jobs) {
             try {
-                unfinishedMessageKey = "${currentServer}_${LocalRepository.UNFINISHED_MSG_KEY}$roomId"
-                chatRoomId = roomId
-                chatRoomType = roomType
                 chatRoles = if (roomTypeOf(roomType) !is RoomType.DirectMessage) {
                     client.chatRoomRoles(roomType = roomTypeOf(roomType), roomName = roomName)
                 } else {
                     emptyList()
                 }
-            } catch (ex: RocketChatException) {
+            } catch (ex: Exception) {
                 Timber.e(ex)
                 chatRoles = emptyList()
             } finally {
@@ -187,7 +187,6 @@ class ChatRoomPresenter @Inject constructor(
                     }
                 }
             }
-
         }
     }
 
@@ -919,7 +918,7 @@ class ChatRoomPresenter @Inject constructor(
         navigator.toChatDetails(chatRoomId, chatRoomType, isSubscribed, isMenuDisabled)
     }
 
-    fun loadChatRooms() {
+    fun loadChatRoomsSuggestions() {
         launchUI(strategy) {
             try {
                 val chatRooms = getChatRoomsAsync()
@@ -1297,12 +1296,12 @@ class ChatRoomPresenter @Inject constructor(
      */
     fun saveUnfinishedMessage(unfinishedMessage: String) {
         if (unfinishedMessage.isNotBlank()) {
-            localRepository.save(unfinishedMessageKey, unfinishedMessage)
+            localRepository.save(draftKey, unfinishedMessage)
         }
     }
 
     fun clearUnfinishedMessage() {
-        localRepository.clear(unfinishedMessageKey)
+        localRepository.clear(draftKey)
     }
     /**
      * Get unfinished message from local repository, when user left chat room without
@@ -1311,6 +1310,6 @@ class ChatRoomPresenter @Inject constructor(
      * @return Returns the unfinished message, null otherwise.
      */
     fun getUnfinishedMessage(): String? {
-        return localRepository.get(unfinishedMessageKey)
+        return localRepository.get(draftKey)
     }
 }
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index e9b95141a8..f8c851fd37 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -176,6 +176,8 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
 
     internal var isSearchTermQueried = false
 
+    private val dismissStatus = { text_connection_status.fadeOut() }
+
     // For reveal and unreveal anim.
     private val hypotenuse by lazy {
         Math.hypot(
@@ -204,6 +206,65 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     internal val textFile by lazy { dialogView.findViewById<TextView>(R.id.text_file_name) }
     private var takenPhotoUri: Uri? = null
 
+    private val layoutChangeListener =
+        View.OnLayoutChangeListener { _, _, _, _, bottom, _, _, _, oldBottom ->
+            val y = oldBottom - bottom
+            if (Math.abs(y) > 0 && isAdded) {
+                // if y is positive the keyboard is up else it's down
+                recycler_view.post {
+                    if (y > 0 || Math.abs(verticalScrollOffset.get()) >= Math.abs(y)) {
+                        ui { recycler_view.scrollBy(0, y) }
+                    } else {
+                        ui { recycler_view.scrollBy(0, verticalScrollOffset.get()) }
+                    }
+                }
+            }
+        }
+
+    private lateinit var endlessRecyclerViewScrollListener: EndlessRecyclerViewScrollListener
+
+    private val onScrollListener = object : RecyclerView.OnScrollListener() {
+        var state = AtomicInteger(RecyclerView.SCROLL_STATE_IDLE)
+
+        override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+            state.compareAndSet(RecyclerView.SCROLL_STATE_IDLE, newState)
+            when (newState) {
+                RecyclerView.SCROLL_STATE_IDLE -> {
+                    if (!state.compareAndSet(RecyclerView.SCROLL_STATE_SETTLING, newState)) {
+                        state.compareAndSet(RecyclerView.SCROLL_STATE_DRAGGING, newState)
+                    }
+                }
+                RecyclerView.SCROLL_STATE_DRAGGING -> {
+                    state.compareAndSet(RecyclerView.SCROLL_STATE_IDLE, newState)
+                }
+                RecyclerView.SCROLL_STATE_SETTLING -> {
+                    state.compareAndSet(RecyclerView.SCROLL_STATE_DRAGGING, newState)
+                }
+            }
+        }
+
+        override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+            if (state.get() != RecyclerView.SCROLL_STATE_IDLE) {
+                verticalScrollOffset.getAndAdd(dy)
+            }
+        }
+    }
+
+    private val fabScrollListener = object : RecyclerView.OnScrollListener() {
+        override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+            if (!recyclerView.canScrollVertically(1)) {
+                text_count.isVisible = false
+                button_fab.hide()
+                newMessageCount = 0
+            } else {
+                if (dy < 0 && !button_fab.isVisible) {
+                    button_fab.show()
+                    if (newMessageCount != 0) text_count.isVisible = true
+                }
+            }
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         AndroidSupportInjection.inject(this)
@@ -231,25 +292,23 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return container?.inflate(R.layout.fragment_chat_room)
-    }
+    ): View? = container?.inflate(R.layout.fragment_chat_room)
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setupToolbar(chatRoomName)
 
         presenter.setupChatRoom(chatRoomId, chatRoomName, chatRoomType, chatRoomMessage)
-        presenter.loadChatRooms()
-        getUnfinishedMessage()
+        presenter.loadChatRoomsSuggestions()
         setupRecyclerView()
         setupFab()
         setupSuggestionsView()
         setupActionSnackbar()
-        (activity as ChatRoomActivity).let {
-            it.showToolbarTitle(chatRoomName)
-            it.showToolbarChatRoomIcon(chatRoomType)
+        with(activity as ChatRoomActivity) {
+            showToolbarTitle(chatRoomName)
+            showToolbarChatRoomIcon(chatRoomType)
         }
+        getUnfinishedMessage()
 
         analyticsManager.logScreenView(ScreenViewEvent.ChatRoom)
     }
@@ -266,13 +325,11 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
 
         presenter.saveUnfinishedMessage(text_message.text.toString())
         handler.removeCallbacksAndMessages(null)
-        presenter.disconnect()
         unsubscribeComposeTextMessage()
+        presenter.disconnect()
 
         // Hides the keyboard (if it's opened) before going to any view.
-        activity?.apply {
-            hideKeyboard()
-        }
+        activity?.apply { hideKeyboard() }
         super.onDestroyView()
     }
 
@@ -282,15 +339,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         activity?.invalidateOptionsMenu()
     }
 
-    fun dismissEmojiKeyboard() {
-        // Check if the keyboard was ever initialized.
-        // It may be the case when you are looking a not joined room
-        if (::emojiKeyboardPopup.isInitialized) {
-            emojiKeyboardPopup.dismiss()
-            setReactionButtonIcon(R.drawable.ic_reaction_24dp)
-        }
-    }
-
     override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
         if (resultCode == Activity.RESULT_OK) {
             when (requestCode) {
@@ -413,64 +461,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         }
     }
 
-    private val layoutChangeListener =
-        View.OnLayoutChangeListener { _, _, _, _, bottom, _, _, _, oldBottom ->
-            val y = oldBottom - bottom
-            if (Math.abs(y) > 0 && isAdded) {
-                // if y is positive the keyboard is up else it's down
-                recycler_view.post {
-                    if (y > 0 || Math.abs(verticalScrollOffset.get()) >= Math.abs(y)) {
-                        ui { recycler_view.scrollBy(0, y) }
-                    } else {
-                        ui { recycler_view.scrollBy(0, verticalScrollOffset.get()) }
-                    }
-                }
-            }
-        }
-
-    private lateinit var endlessRecyclerViewScrollListener: EndlessRecyclerViewScrollListener
-
-    private val onScrollListener = object : RecyclerView.OnScrollListener() {
-        var state = AtomicInteger(RecyclerView.SCROLL_STATE_IDLE)
-
-        override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
-            state.compareAndSet(RecyclerView.SCROLL_STATE_IDLE, newState)
-            when (newState) {
-                RecyclerView.SCROLL_STATE_IDLE -> {
-                    if (!state.compareAndSet(RecyclerView.SCROLL_STATE_SETTLING, newState)) {
-                        state.compareAndSet(RecyclerView.SCROLL_STATE_DRAGGING, newState)
-                    }
-                }
-                RecyclerView.SCROLL_STATE_DRAGGING -> {
-                    state.compareAndSet(RecyclerView.SCROLL_STATE_IDLE, newState)
-                }
-                RecyclerView.SCROLL_STATE_SETTLING -> {
-                    state.compareAndSet(RecyclerView.SCROLL_STATE_DRAGGING, newState)
-                }
-            }
-        }
-
-        override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-            if (state.get() != RecyclerView.SCROLL_STATE_IDLE) {
-                verticalScrollOffset.getAndAdd(dy)
-            }
-        }
-    }
-
-    private val fabScrollListener = object : RecyclerView.OnScrollListener() {
-        override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-            if (!recyclerView.canScrollVertically(1)) {
-                text_count.isVisible = false
-                button_fab.hide()
-                newMessageCount = 0
-            } else {
-                if (dy < 0 && !button_fab.isVisible) {
-                    button_fab.show()
-                    if (newMessageCount != 0) text_count.isVisible = true
-                }
-            }
-        }
-    }
 
     override fun sendMessage(text: String) {
         ui {
@@ -505,9 +495,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     }
 
     override fun hideTypingStatusView() {
-        ui {
-            text_typing_status.isVisible = false
-        }
+        ui { text_typing_status.isVisible = false }
     }
 
     override fun showInvalidFileMessage() {
@@ -534,9 +522,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     }
 
     override fun disableSendMessageButton() {
-        ui {
-            button_send.isEnabled = false
-        }
+        ui { button_send.isEnabled = false }
     }
 
     override fun enableSendMessageButton() {
@@ -792,10 +778,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         }
     }
 
-    private val dismissStatus = {
-        text_connection_status.fadeOut()
-    }
-
     private fun setupRecyclerView() {
         // Initialize the endlessRecyclerViewScrollListener so we don't NPE at onDestroyView
         val linearLayoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, true)
@@ -973,7 +955,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             }
             .addSuggestionProviderAction("#") { query ->
                 if (query.isNotEmpty()) {
-                    presenter.loadChatRooms()
+                    presenter.loadChatRoomsSuggestions()
                 }
             }
             .addSuggestionProviderAction("/") {
@@ -1166,4 +1148,13 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         presenter.reportMessage(messageId = id,
             description = "This message was reported by a user from the Android app")
     }
+
+    fun dismissEmojiKeyboard() {
+        // Check if the keyboard was ever initialized.
+        // It may be the case when you are looking a not joined room
+        if (::emojiKeyboardPopup.isInitialized) {
+            emojiKeyboardPopup.dismiss()
+            setReactionButtonIcon(R.drawable.ic_reaction_24dp)
+        }
+    }
 }
diff --git a/app/src/main/java/chat/rocket/android/infrastructure/LocalRepository.kt b/app/src/main/java/chat/rocket/android/infrastructure/LocalRepository.kt
index f849e8731a..2e178db56e 100644
--- a/app/src/main/java/chat/rocket/android/infrastructure/LocalRepository.kt
+++ b/app/src/main/java/chat/rocket/android/infrastructure/LocalRepository.kt
@@ -27,7 +27,7 @@ interface LocalRepository {
         const val SETTINGS_KEY = "settings_"
         const val PERMISSIONS_KEY = "permissions_"
         const val USER_KEY = "user_"
-        const val UNFINISHED_MSG_KEY = "unfinished_msg_"
+        const val DRAFT_KEY = "draft"
         const val CURRENT_USERNAME_KEY = "username_"
         const val LAST_CHATROOMS_REFRESH = "_chatrooms_refresh"
     }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index fc2dac0ebf..796aa664c9 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -146,7 +146,7 @@
     <string name="msg_send">Sende</string>
     <string name="msg_sent_attachment">Sende Anhang</string>
     <string name="msg_welcome_to_rocket_chat">Willkommen bei Rocket.Chat</string>
-    <string name="msg_team_communication">Open Source-Kommunikation</string>
+    <string name="msg_team_communication">Team Communication</string> <!-- TODO Translate -->
     <string name="msg_login_with_email">Einloggen mit <b>e-mail</b></string>
     <string name="msg_create_account">Ein Konto erstellen</string>
     <string name="msg_continue_with_facebook">Weitermachen mit <b>Facebook</b></string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 2f31019021..ee7c2b76e4 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -146,7 +146,7 @@
     <string name="msg_delete_description">Seguro que quieres borrar este mensaje</string>
     <string name="msg_no_search_found">No se han encontrado resultados</string>
     <string name="msg_welcome_to_rocket_chat">Welcome to Rocket.Chat</string> <!-- TODO Add translation -->
-    <string name="msg_team_communication">Open Source Communication</string> <!-- TODO Add translation -->
+    <string name="msg_team_communication">Team Communication</string> <!-- TODO Translate -->
     <string name="msg_login_with_email">Login with <b>e-mail</b></string> <!-- TODO Add translation -->
     <string name="msg_create_account">Create an account</string> <!-- TODO Add translation -->
     <string name="msg_continue_with_facebook">Continue with <b>Facebook</b></string> <!-- TODO Add translation -->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4201e75d5f..9e047cc769 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -150,7 +150,7 @@
     <string name="msg_delete_message">Supprimer Message</string>
     <string name="msg_delete_description">Êtes-vous sûr de vouloir supprimer ce message</string>
     <string name="msg_welcome_to_rocket_chat">Welcome to Rocket.Chat</string> <!-- TODO Add translation -->
-    <string name="msg_team_communication">Open Source Communication</string> <!-- TODO Add translation -->
+    <string name="msg_team_communication">Team Communication</string> <!-- TODO Translate -->
     <string name="msg_login_with_email">Login with <b>e-mail</b></string> <!-- TODO Add translation -->
     <string name="msg_create_account">Create an account</string> <!-- TODO Add translation -->
     <string name="msg_continue_with_facebook">Continue with <b>Facebook</b></string> <!-- TODO Add translation -->
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 4a2a98fc77..49dbfa40ee 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -152,7 +152,7 @@
     <string name="msg_delete_message">संदेश को हटाएं</string>
     <string name="msg_delete_description">क्या आप निश्चित रूप से यह संदेश हटाना चाहते हैं</string>
     <string name="msg_welcome_to_rocket_chat">Rocket.Chat में आपका स्वागत है</string>
-    <string name="msg_team_communication">ओपन सोर्स कम्युनिकेशन</string>
+    <string name="msg_team_communication">Team Communication</string> <!-- TODO Translate -->
     <string name="msg_login_with_email">ई-मेल के साथ लॉगिन करें</string>
     <string name="msg_create_account">खाता बनाएं</string>
     <string name="msg_continue_with_facebook"><b>Facebook</b> के साथ जारी रखें</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 62de479301..6ed5e180d7 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -146,7 +146,7 @@
     <string name="msg_send">Inviare</string>
     <string name="msg_sent_attachment">Inviato allegato</string>
     <string name="msg_welcome_to_rocket_chat">Benvenuto in Rocket.Chat </string>
-    <string name="msg_team_communication">Team Communication</string>
+    <string name="msg_team_communication">Team Communication</string> <!-- TODO Translate -->
     <string name="msg_login_with_email">Accedi con <b>e-mail</b></string>
     <string name="msg_create_account">Crea un utente</string>
     <string name="msg_continue_with_facebook">Continua con <b>Facebook</b></string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 9c5d8fa924..45d3333f19 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -151,7 +151,7 @@
     <string name="msg_send">送信</string>
     <string name="msg_sent_attachment">添付ファイルを送信しました</string>
     <string name="msg_welcome_to_rocket_chat">Rocket.Chatへようこそ</string>
-    <string name="msg_team_communication">チームコミュニケーション</string>
+    <string name="msg_team_communication">Team Communication</string> <!-- TODO Translate -->
     <string name="msg_login_with_email"><b>e-mail</b>でログイン</string>
     <string name="msg_create_account">アカウントを作成</string>
     <string name="msg_continue_with_facebook"><b>Facebook</b>でログイン</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 41a5baaceb..de57e7bcb3 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -151,7 +151,7 @@
     <string name="msg_delete_message">Remove mensagem</string>
     <string name="msg_delete_description">Tem certeza que quer apagar esta mensagem?</string>
     <string name="msg_welcome_to_rocket_chat">Bem-vindo ao Rocket.Chat</string>
-    <string name="msg_team_communication">Comunicação Open Source</string>
+    <string name="msg_team_communication">Comunicação para equipes</string>
     <string name="msg_login_with_email">Fazer login com <b>e-mail</b></string>
     <string name="msg_create_account">Criar conta</string>
     <string name="msg_continue_with_facebook">Continuar com <b>Facebook</b></string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index ba5a1ac3e2..9b2cc1c8dc 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -149,7 +149,7 @@
     <string name="msg_channel_name">Название канала</string>
     <string name="msg_search">Поиск</string>
     <string name="msg_welcome_to_rocket_chat">Rocket.Chat</string>
-    <string name="msg_team_communication">Чат с открытым исходным кодом</string>
+    <string name="msg_team_communication">Team Communication</string> <!-- TODO Translate -->
     <string name="msg_login_with_email">Войти с помощью <b>e-mail</b></string>
     <string name="msg_create_account">Создать аккаунт</string>
     <string name="msg_continue_with_facebook">Войти с помощью <b>Facebook</b></string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index d00489257a..2a0a4aed48 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -150,7 +150,7 @@
     <string name="msg_send">Gönder</string>
     <string name="msg_sent_attachment">Bir dosya eki gönderildi</string>
     <string name="msg_welcome_to_rocket_chat">Welcome to Rocket.Chat</string> <!-- TODO Add translation -->
-    <string name="msg_team_communication">Team Communication</string> <!-- TODO Add translation -->
+    <string name="msg_team_communication">Team Communication</string> <!-- TODO Translate -->
     <string name="msg_login_with_email">Login with <b>e-mail</b></string> <!-- TODO Add translation -->
     <string name="msg_create_account">Create an account</string> <!-- TODO Add translation -->
     <string name="msg_continue_with_facebook">Continue with <b>Facebook</b></string> <!-- TODO Add translation -->

From 49fecc78b593c400c840e6c1820db4c652208ca5 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Thu, 20 Dec 2018 17:06:26 -0300
Subject: [PATCH 119/149] Fix bug that keeps the emoji keyboard open when
 changing the screen while it is open.

---
 .../android/chatroom/ui/ChatRoomFragment.kt   | 44 +++++++++++--------
 .../res/drawable/ic_keyboard_black_24dp.xml   | 12 ++---
 app/src/main/res/layout/message_composer.xml  |  3 +-
 .../android/emoji/OverKeyboardPopupWindow.kt  |  1 -
 4 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index f8c851fd37..b8710934b1 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -6,7 +6,6 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
-import android.content.res.Configuration
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Bundle
@@ -723,8 +722,8 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     }
 
     private fun setReactionButtonIcon(@DrawableRes drawableId: Int) {
-        button_add_reaction.setImageResource(drawableId)
-        button_add_reaction.tag = drawableId
+        button_add_reaction_or_show_keyboard.setImageResource(drawableId)
+        button_add_reaction_or_show_keyboard.tag = drawableId
     }
 
     override fun showFileSelection(filter: Array<String>?) {
@@ -841,9 +840,13 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
 
             subscribeComposeTextMessage()
             emojiKeyboardPopup = EmojiKeyboardPopup(activity!!, activity!!.findViewById(R.id.fragment_container))
+
             emojiKeyboardPopup.listener = this
+
             text_message.listener = object : ComposerEditText.ComposerEditTextListener {
-                override fun onKeyboardOpened() {}
+                override fun onKeyboardOpened() {
+                    KeyboardHelper.showSoftKeyboard(text_message)
+                }
 
                 override fun onKeyboardClosed() {
                     activity?.let {
@@ -875,9 +878,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
                 hideAttachmentOptions()
             }
 
-            button_add_reaction.setOnClickListener { _ ->
-                openEmojiKeyboardPopup()
-            }
+            button_add_reaction_or_show_keyboard.setOnClickListener { toggleKeyboard() }
 
             button_take_a_photo.setOnClickListener {
                 dispatchTakePictureIntent()
@@ -969,19 +970,10 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         presenter.loadCommands()
     }
 
-    private fun openEmojiKeyboardPopup() {
+    // Shows the emoji or the system keyboard.
+    private fun toggleKeyboard() {
         if (!emojiKeyboardPopup.isShowing) {
-            // If keyboard is visible, simply show the  popup
-            if (emojiKeyboardPopup.isKeyboardOpen) {
-                emojiKeyboardPopup.showAtBottom()
-            } else {
-                // Open the text keyboard first and immediately after that show the emoji popup
-                text_message.isFocusableInTouchMode = true
-                text_message.requestFocus()
-                emojiKeyboardPopup.showAtBottomPending()
-                KeyboardHelper.showSoftKeyboard(text_message)
-            }
-            setReactionButtonIcon(R.drawable.ic_keyboard_black_24dp)
+            openEmojiKeyboard()
         } else {
             // If popup is showing, simply dismiss it to show the underlying text keyboard
             dismissEmojiKeyboard()
@@ -1149,6 +1141,20 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             description = "This message was reported by a user from the Android app")
     }
 
+    fun openEmojiKeyboard() {
+        // If keyboard is visible, simply show the  popup
+        if (emojiKeyboardPopup.isKeyboardOpen) {
+            emojiKeyboardPopup.showAtBottom()
+        } else {
+            // Open the text keyboard first and immediately after that show the emoji popup
+            text_message.isFocusableInTouchMode = true
+            text_message.requestFocus()
+            emojiKeyboardPopup.showAtBottomPending()
+            KeyboardHelper.showSoftKeyboard(text_message)
+        }
+        setReactionButtonIcon(R.drawable.ic_keyboard_black_24dp)
+    }
+
     fun dismissEmojiKeyboard() {
         // Check if the keyboard was ever initialized.
         // It may be the case when you are looking a not joined room
diff --git a/app/src/main/res/drawable/ic_keyboard_black_24dp.xml b/app/src/main/res/drawable/ic_keyboard_black_24dp.xml
index 5bd4c3e68c..21eed7c287 100644
--- a/app/src/main/res/drawable/ic_keyboard_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_keyboard_black_24dp.xml
@@ -7,13 +7,7 @@
 
     <path
         android:fillColor="#000000"
-        android:pathData="M20,5 L4,5 C2.9,5,2.01,5.9,2.01,7 L2,17 C2,18.1,2.9,19,4,19 L20,19
-C21.1,19,22,18.1,22,17 L22,7 C22,5.9,21.1,5,20,5 Z M11,8 L13,8 L13,10 L11,10
-L11,8 Z M11,11 L13,11 L13,13 L11,13 L11,11 Z M8,8 L10,8 L10,10 L8,10 L8,8 Z
-M8,11 L10,11 L10,13 L8,13 L8,11 Z M7,13 L5,13 L5,11 L7,11 L7,13 Z M7,10 L5,10
-L5,8 L7,8 L7,10 Z M16,17 L8,17 L8,15 L16,15 L16,17 Z M16,13 L14,13 L14,11 L16,11
-L16,13 Z M16,10 L14,10 L14,8 L16,8 L16,10 Z M19,13 L17,13 L17,11 L19,11 L19,13 Z
-M19,10 L17,10 L17,8 L19,8 L19,10 Z" />
-    <path
-        android:pathData="M0,0 L24,0 L24,24 L0,24 Z M-24,0 L0,0 L0,24 L0,24 Z" />
+        android:pathData="M20,5 L4,5 C2.9,5,2.01,5.9,2.01,7 L2,17 C2,18.1,2.9,19,4,19 L20,19 C21.1,19,22,18.1,22,17 L22,7 C22,5.9,21.1,5,20,5 Z M11,8 L13,8 L13,10 L11,10 L11,8 Z M11,11 L13,11 L13,13 L11,13 L11,11 Z M8,8 L10,8 L10,10 L8,10 L8,8 Z M8,11 L10,11 L10,13 L8,13 L8,11 Z M7,13 L5,13 L5,11 L7,11 L7,13 Z M7,10 L5,10 L5,8 L7,8 L7,10 Z M16,17 L8,17 L8,15 L16,15 L16,17 Z M16,13 L14,13 L14,11 L16,11 L16,13 Z M16,10 L14,10 L14,8 L16,8 L16,10 Z M19,13 L17,13 L17,11 L19,11 L19,13 Z M19,10 L17,10 L17,8 L19,8 L19,10 Z" />
+
+    <path android:pathData="M0,0 L24,0 L24,24 L0,24 Z M-24,0 L0,0 L0,24 L0,24 Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/message_composer.xml b/app/src/main/res/layout/message_composer.xml
index 79716a7983..6975c4ea2f 100644
--- a/app/src/main/res/layout/message_composer.xml
+++ b/app/src/main/res/layout/message_composer.xml
@@ -59,13 +59,12 @@
             app:layout_constraintTop_toBottomOf="@+id/divider">
 
             <ImageButton
-                android:id="@+id/button_add_reaction"
+                android:id="@+id/button_add_reaction_or_show_keyboard"
                 android:layout_width="32dp"
                 android:layout_height="32dp"
                 android:layout_gravity="bottom"
                 android:layout_marginEnd="16dp"
                 android:background="?attr/selectableItemBackgroundBorderless"
-                android:contentDescription="@string/msg_content_description_show_attachment_options"
                 android:src="@drawable/ic_reaction_24dp" />
 
             <chat.rocket.android.emoji.ComposerEditText
diff --git a/emoji/src/main/java/chat/rocket/android/emoji/OverKeyboardPopupWindow.kt b/emoji/src/main/java/chat/rocket/android/emoji/OverKeyboardPopupWindow.kt
index a58bd4e863..3afd41200e 100644
--- a/emoji/src/main/java/chat/rocket/android/emoji/OverKeyboardPopupWindow.kt
+++ b/emoji/src/main/java/chat/rocket/android/emoji/OverKeyboardPopupWindow.kt
@@ -21,7 +21,6 @@ package chat.rocket.android.emoji
 import android.content.Context
 import android.graphics.Point
 import android.graphics.Rect
-import android.os.Build
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View

From 593b38d884ebcd489dde9c478163e6b2ec7eca0f Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Thu, 20 Dec 2018 19:46:44 -0300
Subject: [PATCH 120/149] Fix a bug that keeps the emoji keyboard always opened
 after sendind a message with a emoji at the end.

---
 .../presentation/ChatRoomPresenter.kt         | 20 ++++---
 .../android/chatroom/ui/ChatRoomFragment.kt   | 53 ++++++++++---------
 .../android/emoji/EmojiKeyboardPopup.kt       | 12 ++---
 3 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
index 0258ddd0f7..ad9615e20a 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
@@ -317,8 +317,8 @@ class ChatRoomPresenter @Inject constructor(
         launchUI(strategy) {
             try {
                 // ignore message for now, will receive it on the stream
-                val id = UUID.randomUUID().toString()
                 if (messageId == null) {
+                    val id = UUID.randomUUID().toString()
                     val username = userHelper.username()
                     val newMessage = Message(
                         id = id,
@@ -371,13 +371,12 @@ class ChatRoomPresenter @Inject constructor(
                 } else {
                     client.updateMessage(chatRoomId, messageId, text)
                 }
-
-                clearUnfinishedMessage()
-                view.enableSendMessageButton()
+                clearDraftMessage()
             } catch (ex: Exception) {
-                Timber.d(ex, "Error sending message...")
+                Timber.e(ex, "Error sending message...")
                 jobSchedulerInteractor.scheduleSendingMessages()
             } finally {
+                view.clearMessageComposition(true)
                 view.enableSendMessageButton()
             }
         }
@@ -1265,10 +1264,9 @@ class ChatRoomPresenter @Inject constructor(
         launchUI(strategy) {
             val viewModelStreamedMessage = mapper.map(
                 streamedMessage, RoomUiModel(
-                roles = chatRoles, isBroadcast = chatIsBroadcast, isRoom = true
-            )
+                    roles = chatRoles, isBroadcast = chatIsBroadcast, isRoom = true
+                )
             )
-
             val roomMessages = messagesRepository.getByRoomId(streamedMessage.roomId)
             val index = roomMessages.indexOfFirst { msg -> msg.id == streamedMessage.id }
             if (index > -1) {
@@ -1294,13 +1292,13 @@ class ChatRoomPresenter @Inject constructor(
      *
      * @param unfinishedMessage The unfinished message to save.
      */
-    fun saveUnfinishedMessage(unfinishedMessage: String) {
+    fun saveDraftMessage(unfinishedMessage: String) {
         if (unfinishedMessage.isNotBlank()) {
             localRepository.save(draftKey, unfinishedMessage)
         }
     }
 
-    fun clearUnfinishedMessage() {
+    fun clearDraftMessage() {
         localRepository.clear(draftKey)
     }
     /**
@@ -1309,7 +1307,7 @@ class ChatRoomPresenter @Inject constructor(
      *
      * @return Returns the unfinished message, null otherwise.
      */
-    fun getUnfinishedMessage(): String? {
+    fun getDraftUnfinishedMessage(): String? {
         return localRepository.get(draftKey)
     }
 }
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index b8710934b1..246cc76705 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -307,7 +307,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             showToolbarTitle(chatRoomName)
             showToolbarChatRoomIcon(chatRoomType)
         }
-        getUnfinishedMessage()
+        getDraftMessage()
 
         analyticsManager.logScreenView(ScreenViewEvent.ChatRoom)
     }
@@ -322,7 +322,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         recycler_view.removeOnScrollListener(onScrollListener)
         recycler_view.removeOnLayoutChangeListener(layoutChangeListener)
 
-        presenter.saveUnfinishedMessage(text_message.text.toString())
+        presenter.saveDraftMessage(text_message.text.toString())
         handler.removeCallbacksAndMessages(null)
         unsubscribeComposeTextMessage()
         presenter.disconnect()
@@ -436,6 +436,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             }
             presenter.loadActiveMembers(chatRoomId, chatRoomType, filterSelfOut = true)
             empty_chat_view.isVisible = adapter.itemCount == 0
+            dismissEmojiKeyboard()
         }
     }
 
@@ -444,6 +445,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         adapter.clearData()
         adapter.prependData(dataSet)
         empty_chat_view.isVisible = adapter.itemCount == 0
+        dismissEmojiKeyboard()
     }
 
     override fun onRoomUpdated(roomUiModel: RoomUiModel) {
@@ -501,25 +503,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         showMessage(getString(R.string.msg_invalid_file))
     }
 
-    override fun showNewMessage(message: List<BaseUiModel<*>>, isMessageReceived: Boolean) {
-        ui {
-            adapter.prependData(message)
-            if (isMessageReceived && button_fab.isVisible) {
-                newMessageCount++
-
-                if (newMessageCount <= 99)
-                    text_count.text = newMessageCount.toString()
-                else
-                    text_count.text = "99+"
-
-                text_count.isVisible = true
-            } else if (!button_fab.isVisible)
-                recycler_view.scrollToPosition(0)
-            verticalScrollOffset.set(0)
-            empty_chat_view.isVisible = adapter.itemCount == 0
-        }
-    }
-
     override fun disableSendMessageButton() {
         ui { button_send.isEnabled = false }
     }
@@ -543,6 +526,28 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         }
     }
 
+    override fun showNewMessage(message: List<BaseUiModel<*>>, isMessageReceived: Boolean) {
+        ui {
+            adapter.prependData(message)
+            if (isMessageReceived && button_fab.isVisible) {
+                newMessageCount++
+                if (newMessageCount <= 99) {
+                    text_count.text = newMessageCount.toString()
+                } else {
+                    text_count.text = "99+"
+                }
+                text_count.isVisible = true
+            }
+
+            else if (!button_fab.isVisible) {
+                recycler_view.scrollToPosition(0)
+            }
+            verticalScrollOffset.set(0)
+            empty_chat_view.isVisible = adapter.itemCount == 0
+            dismissEmojiKeyboard()
+        }
+    }
+
     override fun dispatchUpdateMessage(index: Int, message: List<BaseUiModel<*>>) {
         ui {
             // TODO - investigate WHY we get a empty list here
@@ -555,6 +560,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             } else {
                 showNewMessage(message, true)
             }
+            dismissEmojiKeyboard()
         }
     }
 
@@ -863,7 +869,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
                 var textMessage = citation ?: ""
                 textMessage += text_message.textContent
                 sendMessage(textMessage)
-                clearMessageComposition(true)
             }
 
             button_show_attachment_options.setOnClickListener {
@@ -935,8 +940,8 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         }
     }
 
-    private fun getUnfinishedMessage() {
-        val unfinishedMessage = presenter.getUnfinishedMessage()
+    private fun getDraftMessage() {
+        val unfinishedMessage = presenter.getDraftUnfinishedMessage()
         if (unfinishedMessage.isNotNullNorEmpty()) {
             text_message.setText(unfinishedMessage)
         }
diff --git a/emoji/src/main/java/chat/rocket/android/emoji/EmojiKeyboardPopup.kt b/emoji/src/main/java/chat/rocket/android/emoji/EmojiKeyboardPopup.kt
index 74dc97f8e2..26ee0660e6 100644
--- a/emoji/src/main/java/chat/rocket/android/emoji/EmojiKeyboardPopup.kt
+++ b/emoji/src/main/java/chat/rocket/android/emoji/EmojiKeyboardPopup.kt
@@ -25,9 +25,7 @@ import kotlinx.android.synthetic.main.dialog_skin_tone_chooser.view.*
 import kotlinx.coroutines.experimental.android.UI
 import kotlinx.coroutines.experimental.launch
 
-
 class EmojiKeyboardPopup(context: Context, view: View) : OverKeyboardPopupWindow(context, view) {
-
     private lateinit var viewPager: ViewPager
     private lateinit var tabLayout: TabLayout
     private lateinit var searchView: View
@@ -84,7 +82,7 @@ class EmojiKeyboardPopup(context: Context, view: View) : OverKeyboardPopupWindow
             .setCancelable(true)
             .create()
 
-        with (view) {
+        with(view) {
             image_view_default_tone.setOnClickListener {
                 dialog.dismiss()
                 changeSkinTone(Fitzpatrick.Default)
@@ -138,7 +136,10 @@ class EmojiKeyboardPopup(context: Context, view: View) : OverKeyboardPopupWindow
         return when (tone) {
             Fitzpatrick.Default -> ContextCompat.getColor(context, R.color.tone_default)
             Fitzpatrick.LightTone -> ContextCompat.getColor(context, R.color.tone_light)
-            Fitzpatrick.MediumLightTone -> ContextCompat.getColor(context, R.color.tone_medium_light)
+            Fitzpatrick.MediumLightTone -> ContextCompat.getColor(
+                context,
+                R.color.tone_medium_light
+            )
             Fitzpatrick.MediumTone -> ContextCompat.getColor(context, R.color.tone_medium)
             Fitzpatrick.MediumDarkTone -> ContextCompat.getColor(context, R.color.tone_medium_dark)
             Fitzpatrick.DarkTone -> ContextCompat.getColor(context, R.color.tone_dark)
@@ -151,7 +152,7 @@ class EmojiKeyboardPopup(context: Context, view: View) : OverKeyboardPopupWindow
                 is EmojiKeyboardListener -> it
                 else -> {
                     val fragments = (it as AppCompatActivity).supportFragmentManager.fragments
-                    if (fragments.size == 0 || !(fragments[0] is EmojiKeyboardListener)) {
+                    if (fragments.size == 0 || fragments[0] !is EmojiKeyboardListener) {
                         // Since the app can arrive in an inconsistent state at this point, do not throw
 //                        throw IllegalStateException("activity/fragment should implement Listener interface")
                         null
@@ -190,7 +191,6 @@ class EmojiKeyboardPopup(context: Context, view: View) : OverKeyboardPopupWindow
     }
 
     class EmojiTextWatcher(private val editor: EditText) : TextWatcher {
-
         @Volatile
         private var emojiToRemove = mutableListOf<EmojiTypefaceSpan>()
 

From ac4ffd5382858b0e6dc31664462d28ad657376af Mon Sep 17 00:00:00 2001
From: Rafael Kellermann Streit <rafaelks@me.com>
Date: Fri, 21 Dec 2018 09:53:58 -0200
Subject: [PATCH 121/149] Update build.gradle

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3c2083027d..3eac882115 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,7 +16,7 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 2054
+        versionCode 2055
         versionName "3.2.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true

From c5981f1ca8deb52b152a55ae69602bbdcb63da25 Mon Sep 17 00:00:00 2001
From: Pitstopper <18574776+Pitstopper@users.noreply.github.com>
Date: Fri, 21 Dec 2018 16:25:47 +0300
Subject: [PATCH 122/149] Update strings.xml

---
 app/src/main/res/values-ru-rRU/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index aae058fe45..97c8b873da 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -149,7 +149,7 @@
     <string name="msg_channel_name">Название канала</string>
     <string name="msg_search">Поиск</string>
     <string name="msg_welcome_to_rocket_chat">Rocket.Chat</string>
-    <string name="msg_team_communication">Team Communication</string> <!-- TODO Translate -->
+    <string name="msg_team_communication">Командное общение</string>
     <string name="msg_login_with_email">Войти с помощью <b>e-mail</b></string>
     <string name="msg_create_account">Создать аккаунт</string>
     <string name="msg_continue_with_facebook">Войти с помощью <b>Facebook</b></string>

From 71a09fd4aa97eab8df3806fa50a46637ae162c64 Mon Sep 17 00:00:00 2001
From: Pitstopper <18574776+Pitstopper@users.noreply.github.com>
Date: Fri, 21 Dec 2018 19:26:06 +0300
Subject: [PATCH 123/149] Update strings.xml

---
 app/src/main/res/values-ru-rRU/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 97c8b873da..930fd2ff61 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -334,7 +334,7 @@
 
     <!-- User Details -->
     <string name="message">Сообщение</string>
-    <string name="timezone">Часовой поясe</string>
+    <string name="timezone">Часовой пояс</string>
     <string name="error_opening_dm">При создании этого диалога что-то пошло не так...</string>
     <string name="retry">Повторить</string>
 

From 4e86d4bc4ab84ab781d44269faf9df2d9b453474 Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Wed, 26 Dec 2018 20:08:50 +0530
Subject: [PATCH 124/149] chore: add Issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md      | 37 +++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/chore.md           | 17 +++++++++++
 .github/ISSUE_TEMPLATE/feature_request.md | 24 +++++++++++++++
 3 files changed, 78 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/chore.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..4016f207be
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,37 @@
+---
+name: Bug report
+about: Create a bug report to help us improve
+
+---
+
+## Describe the bug
+<!-- A clear and concise description of what the bug is. -->
+
+## To Reproduce
+<!--Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error -->
+
+## Expected behavior
+<!-- A clear and concise description of what you expected to happen. -->
+
+## Logs
+<!-- Please add logs in case of any crash or applicable error. -->
+
+## Screenshots
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+## Devices and Versions
+
+<!-- Version can be found by opening the side menu and then clicking on "Settings" and then "About" -->
+Your Rocket.Chat.Android version: (e.g. 2.1.0)
+Your Rocket.Chat Server version: (e.g. 0.63.1-develop)
+
+<!-- Found a bug? List all devices that reproduced it and all that doesn't -->
+Mobile device model and OS version: (e.g. "Nexus 7 - Android 6.0.1")
+
+## Additional context
+<!-- Add any other context about the problem here. -->
+
diff --git a/.github/ISSUE_TEMPLATE/chore.md b/.github/ISSUE_TEMPLATE/chore.md
new file mode 100644
index 0000000000..88aedc0846
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/chore.md
@@ -0,0 +1,17 @@
+---
+name: Chore
+about: Issues related to docs, workflow, dependency and others
+
+---
+
+## Describe the chore
+<!-- A clear and concise description of what you want to do. -->
+
+## Devices and Versions
+
+<!-- Version can be found by opening the side menu and then clicking on "Settings" and then "About" -->
+Your Rocket.Chat.Android version: (e.g. 2.1.0)
+Your Rocket.Chat Server version: (e.g. 0.63.1-develop)
+
+<!-- Found a bug? List all devices that reproduced it and all that doesn't -->
+Mobile device model and OS version: (e.g. "Nexus 7 - Android 6.0.1")
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..a96576ef46
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,24 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+## Describe the feature you'd like
+<!-- A clear and concise description of what you want to happen. -->
+
+## Devices and Versions
+
+<!-- Version can be found by opening the side menu and then clicking on "Settings" and then "About" -->
+Your Rocket.Chat.Android version: (e.g. 2.1.0)
+Your Rocket.Chat Server version: (e.g. 0.63.1-develop)
+
+<!-- Found a bug? List all devices that reproduced it and all that doesn't -->
+Mobile device model and OS version: (e.g. "Nexus 7 - Android 6.0.1")
+
+## Screenshots
+<!-- Add screenshots to provide context or UI mockup. -->
+
+## Additional context
+<!-- Add any other context about the problem here. -->
+

From 490ba9f22ec32fffabeef685ddf4f763da6232b7 Mon Sep 17 00:00:00 2001
From: Govind Dixit <lit2017018@iiita.ac.in>
Date: Wed, 26 Dec 2018 20:37:40 +0530
Subject: [PATCH 125/149] Update PULL_REQUEST_TEMPLATE.md

---
 .github/PULL_REQUEST_TEMPLATE.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

From c0a218d04baacddc39d3b2bea48ca47e4328f9b7 Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Wed, 26 Dec 2018 23:35:56 +0530
Subject: [PATCH 126/149] update strings

---
 app/src/main/res/values-hi-rIN/strings.xml |  3 +-
 app/src/main/res/values-it/strings.xml     |  3 +-
 app/src/main/res/values-ja/strings.xml     | 45 +++++++++++-----------
 app/src/main/res/values-ru-rRU/strings.xml |  1 +
 app/src/main/res/values/strings.xml        |  1 +
 5 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 49dbfa40ee..8d2940fd88 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -64,6 +64,7 @@
     <string-array name="settings_actions">
         <item name="item_preferences">पसंद</item>
         <item name="item_password">पासवर्ड बदलें</item>
+        <item name="change_language">भाषा बदलें</item>
         <item name="item_share_app">ऐप शेयर करें</item>
         <item name="item_rate_us">हमें रेटिंग दें</item>
         <item name="item_contact_us">हमसे संपर्क करें</item>
@@ -152,7 +153,7 @@
     <string name="msg_delete_message">संदेश को हटाएं</string>
     <string name="msg_delete_description">क्या आप निश्चित रूप से यह संदेश हटाना चाहते हैं</string>
     <string name="msg_welcome_to_rocket_chat">Rocket.Chat में आपका स्वागत है</string>
-    <string name="msg_team_communication">Team Communication</string> <!-- TODO Translate -->
+    <string name="msg_team_communication">टीम संचार</string>
     <string name="msg_login_with_email">ई-मेल के साथ लॉगिन करें</string>
     <string name="msg_create_account">खाता बनाएं</string>
     <string name="msg_continue_with_facebook"><b>Facebook</b> के साथ जारी रखें</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 6ed5e180d7..a1d33a71eb 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -64,6 +64,7 @@
     <string-array name="settings_actions">
         <item name="item_preferences">Preferenze</item>
         <item name="item_password">Cambia password</item>
+        <item name="change_language">Cambia lingua</item>
         <item name="item_share_app">Condividi app</item>
         <item name="item_rate_us">Votaci</item>
         <item name="item_contact_us">Contattaci</item>
@@ -146,7 +147,7 @@
     <string name="msg_send">Inviare</string>
     <string name="msg_sent_attachment">Inviato allegato</string>
     <string name="msg_welcome_to_rocket_chat">Benvenuto in Rocket.Chat </string>
-    <string name="msg_team_communication">Team Communication</string> <!-- TODO Translate -->
+    <string name="msg_team_communication">Comunicazione del team</string>
     <string name="msg_login_with_email">Accedi con <b>e-mail</b></string>
     <string name="msg_create_account">Crea un utente</string>
     <string name="msg_continue_with_facebook">Continua con <b>Facebook</b></string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 45d3333f19..125565388a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -22,11 +22,11 @@
     <string name="title_admin_panel">管理パネル</string>
     <string name="title_password">パスワードの変更</string>
     <string name="title_update_profile">プロフィールの更新</string>
-    <string name="title_about">About</string>
-    <string name="title_licence">Licence</string> <!-- TODO Add translation -->
+    <string name="title_about">約</string>
+    <string name="title_licence">ライセンス</string>
     <string name="title_create_channel">新しいチャネルを作成</string>
     <string name="title_are_you_sure">本気ですか？</string>
-    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_channel_details">チャンネルの詳細</string>
     <string name="title_topic">トピック</string>
     <string name="title_announcement">発表</string>
     <string name="title_description">説明</string>
@@ -64,13 +64,14 @@
 
     <!-- Settings List -->
     <string-array name="settings_actions">
-        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
-        <item name="item_password">Change password</item> <!-- TODO Add translation -->
-        <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
-        <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
-        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
-        <item name="item_licence">Licence</item> <!-- TODO Add translation -->
-        <item name="item_about">About</item> <!-- TODO Add translation -->
+        <item name="item_preferences">設定</item>
+        <item name="item_password">パスワードを変更する</item>
+        <item name="change_language">言語を変えてください</item>
+        <item name="item_share_app">アプリを共有する</item>
+        <item name="item_rate_us">私たちを評価してください</item>
+        <item name="item_contact_us">お問い合わせ</item>
+        <item name="item_licence">ライセンス</item>
+        <item name="item_about">約</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -165,9 +166,9 @@
     <string name="msg_view_more">更に表示</string>
     <string name="msg_view_less">隠す</string>
     <string name="msg_muted_on_this_channel">あなたはこのチャンネルでミュートされています</string>
-    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
-    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
-    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
+    <string name="msg_no_topic">トピックが追加されていない</string>
+    <string name="msg_no_announcement">お知らせが追加されていません</string>
+    <string name="msg_no_description">説明が追加されていない</string>
     <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
     <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
@@ -190,8 +191,8 @@
     <string name="msg_delete_message">メッセージを削除</string>
     <string name="msg_delete_description">このメッセージを削除してもよろしいですか?</string>
     <string name="msg_permalink_copied">パーマリンクのコピー</string>
-    <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
-    <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
+    <string name="msg_send_email">メールを送る</string>
+    <string name="msg_android_app_support">Androidアプリのサポート</string>
 
     <!-- Preferences messages -->
     <string name="msg_analytics_tracking">トラッキングの分析</string>
@@ -339,13 +340,13 @@
     <string name="message_room_changed_privacy">ルームタイプを %2$s から %1$s に変更しました</string>
 
     <!-- User Details -->
-    <string name="message">Message</string> <!--TODO - Add proper translation-->
-    <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
-    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
-    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
+    <string name="message">メッセージ</string>
+    <string name="timezone">タイムゾーン</string>
+    <string name="error_opening_dm">この会話を作成しているうちに何か問題が発生しました…</string>
+    <string name="retry">リトライ</string>
 
     <!-- Report -->
-    <string name="submit">Submit</string> <!--TODO - Add proper translation-->
-    <string name="required">*required</string> <!--TODO - Add proper translation-->
-    <string name="report_sent">Your report has been sent!</string> <!--TODO - Add proper translation-->
+    <string name="submit">提出する</string>
+    <string name="required">*必須</string>
+    <string name="report_sent">あなたのレポートが送信されました！</string>
 </resources>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 930fd2ff61..487867e478 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -64,6 +64,7 @@
     <string-array name="settings_actions">
         <item name="item_preferences">Персональные</item>
         <item name="item_password">Изменить пароль</item>
+        <item name="change_language">Изменить язык</item>
         <item name="item_share_app">Поделиться приложением</item>
         <item name="item_rate_us">Оцените нас</item>
         <item name="item_contact_us">Связаться с нами</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ad457877fd..ee039bcb3d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -76,6 +76,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string-array name="settings_actions">
         <item name="item_preferences">Preferences</item>
         <item name="item_password">Change password</item>
+        <item name="change_language">Change Language </item>
         <item name="item_share_app">Share app</item>
         <item name="item_rate_us">Rate us</item>
         <item name="item_contact_us">Contact us</item>

From f9a41c5f91032c7e93ebb21f617f84079d10e65b Mon Sep 17 00:00:00 2001
From: Vitor <droider.pc@gmail.com>
Date: Thu, 27 Dec 2018 14:49:41 +0100
Subject: [PATCH 127/149] Update strings.xml

Translated a newly added string and fixed some string positions
---
 app/src/main/res/values-pt-rBR/strings.xml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index de57e7bcb3..ba6c510472 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -205,13 +205,12 @@
     <string name="message_user_joined_channel">Entrou na sala</string>
     <string name="message_welcome">Bem-vindo, %s</string>
     <string name="message_removed">Mensagem removida</string>
-    <string name="message_pinned">Pinou uma mensagem:</string>
+    <string name="message_pinned">Fixou uma mensagem:</string>
     <string name="message_muted">Usuário %1$s foi silenciado por %2$s</string>
     <string name="message_unmuted">Usuário %1$s saiu do modo silenciado por %2$s</string>
-    <string name="message_role_add">%1$s foi definido %2$s por %3$s</string>
-    <string name="message_role_removed">%1$s não é mais %2$s por %3$s</string>
-    // TODO:Add proper translation.
-    <string name="message_credentials_saved_successfully">Credentials saved successfully</string>
+    <string name="message_role_add">%3$s colocou o estatuto de %2$s a %1$s</string>
+    <string name="message_role_removed">%3$s removeu o estatuto de %2$s de %1$s</string>
+    <string name="message_credentials_saved_successfully">Credenciais salvas com sucesso</string>
 
     <!-- Message actions -->
     <string name="action_msg_reply">Responder</string>
@@ -233,7 +232,7 @@
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">Edição não permitida</string>
     <string name="permission_deleting_not_allowed">Remoção não permitida</string>
-    <string name="permission_pinning_not_allowed">Pinagem não permitida</string>
+    <string name="permission_pinning_not_allowed">Fixagem não permitida</string>
     <string name="permission_starring_not_allowed">Marcar como favorita não permitido</string>
 
     <!-- Search message -->
@@ -252,9 +251,9 @@
     <string name="msg_all_the_mentions_appear_here">Todas menções\naparecerão aqui</string>
 
     <!-- Pinned Messages -->
-    <string name="title_pinned_messages">Mensagens Pinadas</string>
-    <string name="no_pinned_messages">Nenhuma mensagem pinada</string>
-    <string name="no_pinned_description">Todas mensagens pinadas\naparecerão aqui</string>
+    <string name="title_pinned_messages">Mensagens Fixadas</string>
+    <string name="no_pinned_messages">Nenhuma mensagem fixada</string>
+    <string name="no_pinned_description">Todas as mensagens fixadas\naparecerão aqui</string>
 
     <!-- Favorite Messages -->
     <string name="title_favorite_messages">Messagens Favoritas</string>

From 14d0d66ebdaf12d249f660f158e82657399f2954 Mon Sep 17 00:00:00 2001
From: Claudio Massi <claudio.massi@sorint.it>
Date: Thu, 27 Dec 2018 15:07:05 +0100
Subject: [PATCH 128/149] [I18N] Add proper translation to italian strings

Translation for strings related to password update
---
 app/src/main/res/values-it/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 6ed5e180d7..388f620065 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -146,7 +146,7 @@
     <string name="msg_send">Inviare</string>
     <string name="msg_sent_attachment">Inviato allegato</string>
     <string name="msg_welcome_to_rocket_chat">Benvenuto in Rocket.Chat </string>
-    <string name="msg_team_communication">Team Communication</string> <!-- TODO Translate -->
+    <string name="msg_team_communication">Comunicazione dei Gruppi</string>
     <string name="msg_login_with_email">Accedi con <b>e-mail</b></string>
     <string name="msg_create_account">Crea un utente</string>
     <string name="msg_continue_with_facebook">Continua con <b>Facebook</b></string>
@@ -163,8 +163,8 @@
     <string name="msg_no_description">Nessuna descrizione aggiunta</string>
     <string name="msg_send_email">Invia una email</string>
     <string name="msg_android_app_support">Supporto per le app Android</string>
-    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
-    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
+    <string name="msg_unable_to_update_password">Impossibile aggiornare la password. Messaggio di errore: %1$s</string>
+    <string name="msg_password_updated_successfully">Password aggiornata con successo</string>
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s ha reagito con %2$s</item>
         <item quantity="other">%1$s ha reagito con %2$s</item>

From ecec4968be2fac4c096a0dafa693c5cc1238c7a8 Mon Sep 17 00:00:00 2001
From: Divyanshu Bhargava <divyanshub024@gmail.com>
Date: Thu, 27 Dec 2018 23:57:49 +0530
Subject: [PATCH 129/149] Update readme to specify java version for project

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 2c40056b5e..08cbbfb59f 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,7 @@ This repository contains all the code related to the Android native application
 
 - This version requires the [Kotlin SDK](https://github.com/RocketChat/Rocket.Chat.Kotlin.SDK) for Rocket.Chat. Clone the Kotlin SDK in by running `git clone https://github.com/RocketChat/Rocket.Chat.Kotlin.SDK.git`.
 - First, a build is required for the SDK, so that required jar files are generated. Make sure that the android repository and the kotlin sdk have the same immediate parent directory. Change the current directory to `Rocket.Chat.Android/app` and run the `build-sdk.sh` which will result in creating of the required jar file `core*.jar` and `common*.jar` in `Rocket.Chat.Android/app/libs`,by the following steps in your terminal window:
+**Note:** *To have Java 8 as default java for the system(Project won't build for Java > 8).*
 
 ```
 cd Rocket.Chat.Android/app

From f357bf196d9e17ce4c2f3d11259521dd9f4400db Mon Sep 17 00:00:00 2001
From: Divyanshu Bhargava <divyanshub024@gmail.com>
Date: Fri, 28 Dec 2018 00:05:58 +0530
Subject: [PATCH 130/149] Update readme

To remove the use of latest AS preview for Jetpack as Jetpack is now in stable.
---
 README.md | 1 -
 1 file changed, 1 deletion(-)

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

From 1e5148ce37b0679b5c388f6a0fec55549718bce8 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Thu, 27 Dec 2018 17:10:52 -0300
Subject: [PATCH 131/149] Refactor user details.

 - Fix for #3408 bug (Fabric);
 - Changing from Activity to fragment;
 - Logs user details view;
 - Removes lots of needless code;
 - Follows desing for widgets;
 - UI still needs some tweaks.
---
 app/build.gradle                              |  22 +-
 app/src/main/AndroidManifest.xml              |  10 -
 .../analytics/event/ScreenViewEvent.kt        |   1 +
 .../twofactor/di/TwoFAFragmentProvider.kt     |   3 +-
 .../chatroom/adapter/ChatRoomAdapter.kt       |  46 +++-
 .../chatroom/adapter/MessageViewHolder.kt     |  21 +-
 .../chatroom/di/ChatRoomFragmentModule.kt     |  20 +-
 .../android/chatroom/di/ChatRoomModule.kt     |  18 ++
 .../chatroom/di/MessageServiceProvider.kt     |   1 +
 .../presentation/ChatRoomNavigator.kt         |  41 +++-
 .../android/chatroom/ui/ChatRoomFragment.kt   |  14 +-
 .../android/dagger/module/ActivityBuilder.kt  |  14 +-
 .../chat/rocket/android/db/DatabaseManager.kt |  12 ++
 .../members/di/MembersFragmentModule.kt       |   2 +-
 .../members/presentation/MembersNavigator.kt  |  11 +-
 .../android/mentions/ui/MentionsFragment.kt   |   5 +-
 .../di/UserDetailsFragmentModule.kt           |  20 ++
 .../di/UserDetailsFragmentProvider.kt         |  14 ++
 .../userdetails/di/UserDetailsModule.kt       |  32 ---
 .../presentation/UserDetailsPresenter.kt      | 189 +++++++----------
 .../presentation/UserDetailsView.kt           |  26 ++-
 .../userdetails/ui/UserDetailsActivity.kt     | 198 ------------------
 .../userdetails/ui/UserDetailsFragment.kt     | 117 +++++++++++
 app/src/main/res/drawable/ic_message_24dp.xml |   1 +
 .../main/res/layout/activity_user_details.xml | 174 ---------------
 .../main/res/layout/fragment_user_details.xml | 106 ++++++++++
 app/src/main/res/values-de/strings.xml        |   4 +-
 app/src/main/res/values-es/strings.xml        |   3 -
 app/src/main/res/values-fr/strings.xml        |   3 -
 app/src/main/res/values-hi-rIN/strings.xml    |   3 -
 app/src/main/res/values-it/strings.xml        |   3 -
 app/src/main/res/values-ja/strings.xml        |   3 -
 app/src/main/res/values-pt-rBR/strings.xml    |   3 -
 app/src/main/res/values-ru-rRU/strings.xml    |   3 -
 app/src/main/res/values-tr/strings.xml        |   3 -
 app/src/main/res/values-uk/strings.xml        |   3 -
 app/src/main/res/values/colors.xml            |   2 +
 app/src/main/res/values/strings.xml           |   3 -
 app/src/main/res/values/styles.xml            |  37 ++++
 39 files changed, 535 insertions(+), 656 deletions(-)
 create mode 100644 app/src/main/java/chat/rocket/android/userdetails/di/UserDetailsFragmentModule.kt
 create mode 100644 app/src/main/java/chat/rocket/android/userdetails/di/UserDetailsFragmentProvider.kt
 delete mode 100644 app/src/main/java/chat/rocket/android/userdetails/di/UserDetailsModule.kt
 delete mode 100644 app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt
 create mode 100644 app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsFragment.kt
 delete mode 100644 app/src/main/res/layout/activity_user_details.xml
 create mode 100644 app/src/main/res/layout/fragment_user_details.xml

diff --git a/app/build.gradle b/app/build.gradle
index 3eac882115..726e982721 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -87,84 +87,66 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-
     implementation project(':player')
     implementation project(':emoji')
     implementation project(':draw')
     implementation project(':util')
     implementation project(':core')
     implementation project(':suggestions')
-
     implementation libraries.kotlin
     implementation libraries.coroutines
     implementation libraries.coroutinesAndroid
-
     implementation libraries.appCompat
     implementation libraries.recyclerview
     implementation libraries.constraintlayout
     implementation libraries.cardview
     implementation libraries.browser
-
     implementation libraries.androidKtx
     implementation libraries.fragmentsKtx
-
     implementation libraries.dagger
     implementation libraries.daggerSupport
     kapt libraries.daggerProcessor
     kapt libraries.daggerAndroidApt
-
     implementation libraries.flexbox
     implementation libraries.material
-
     implementation libraries.room
     kapt libraries.roomProcessor
     implementation libraries.lifecycleExtensions
     kapt libraries.lifecycleCompiler
     implementation libraries.viewmodelKtx
     implementation libraries.workmanager
-
     implementation libraries.rxKotlin
     implementation libraries.rxAndroid
-
     implementation libraries.moshi
     implementation libraries.okhttp
     implementation libraries.okhttpLogger
-
     implementation libraries.timber
     implementation libraries.threeTenABP
-
     implementation libraries.fresco
     api libraries.frescoOkHttp
     implementation libraries.frescoAnimatedGif
     implementation libraries.frescoWebP
     implementation libraries.frescoAnimatedWebP
-
     implementation libraries.glide
-
     kapt libraries.kotshiCompiler
     implementation libraries.kotshiApi
-
     implementation libraries.frescoImageViewer
-
     implementation libraries.markwon
-
     implementation libraries.aVLoadingIndicatorView
-
     implementation libraries.livedataKtx
-
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
-
     // Proprietary libraries
     playImplementation libraries.fcm
     playImplementation libraries.firebaseAnalytics
     playImplementation libraries.playServicesAuth
     playImplementation('com.crashlytics.sdk.android:crashlytics:2.9.5@aar') { transitive = true }
     playImplementation('com.crashlytics.sdk.android:answers:1.4.3@aar') { transitive = true }
-
     testImplementation libraries.junit
     testImplementation libraries.truth
     androidTestImplementation libraries.espressoCore
     androidTestImplementation libraries.espressoIntents
+    implementation files('libs/common-54676f5.jar')
+    implementation files('libs/core-54676f5.jar')
 }
 
 kotlin {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a745cb319e..250fd8387a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -93,16 +93,6 @@
             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"
diff --git a/app/src/main/java/chat/rocket/android/analytics/event/ScreenViewEvent.kt b/app/src/main/java/chat/rocket/android/analytics/event/ScreenViewEvent.kt
index b2fe84d64f..3c8c0195b7 100644
--- a/app/src/main/java/chat/rocket/android/analytics/event/ScreenViewEvent.kt
+++ b/app/src/main/java/chat/rocket/android/analytics/event/ScreenViewEvent.kt
@@ -16,6 +16,7 @@ sealed class ScreenViewEvent(val screenName: String) {
     object ChatRoom : ScreenViewEvent("ChatRoomFragment")
     object ChatRooms : ScreenViewEvent("ChatRoomsFragment")
     object CreateChannel : ScreenViewEvent("CreateChannelFragment")
+    object UserDetails : ScreenViewEvent("UserDetailsFragment")
     object FavoriteMessages : ScreenViewEvent("FavoriteMessagesFragment")
     object Files : ScreenViewEvent("FilesFragment")
     object MemberBottomSheet : ScreenViewEvent("MemberBottomSheetFragment")
diff --git a/app/src/main/java/chat/rocket/android/authentication/twofactor/di/TwoFAFragmentProvider.kt b/app/src/main/java/chat/rocket/android/authentication/twofactor/di/TwoFAFragmentProvider.kt
index 2a7e097455..dd98abfb0e 100644
--- a/app/src/main/java/chat/rocket/android/authentication/twofactor/di/TwoFAFragmentProvider.kt
+++ b/app/src/main/java/chat/rocket/android/authentication/twofactor/di/TwoFAFragmentProvider.kt
@@ -5,7 +5,8 @@ import chat.rocket.android.dagger.scope.PerFragment
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
-@Module abstract class TwoFAFragmentProvider {
+@Module
+abstract class TwoFAFragmentProvider {
 
     @ContributesAndroidInjector(modules = [TwoFAFragmentModule::class])
     @PerFragment
diff --git a/app/src/main/java/chat/rocket/android/chatroom/adapter/ChatRoomAdapter.kt b/app/src/main/java/chat/rocket/android/chatroom/adapter/ChatRoomAdapter.kt
index b13174a6a6..1bd1efccae 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/adapter/ChatRoomAdapter.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/adapter/ChatRoomAdapter.kt
@@ -1,17 +1,23 @@
 package chat.rocket.android.chatroom.adapter
 
-import androidx.recyclerview.widget.RecyclerView
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
-import chat.rocket.android.chatroom.uimodel.*
-import chat.rocket.android.util.extensions.inflate
+import chat.rocket.android.chatroom.presentation.ChatRoomNavigator
+import chat.rocket.android.chatroom.uimodel.AttachmentUiModel
+import chat.rocket.android.chatroom.uimodel.BaseUiModel
+import chat.rocket.android.chatroom.uimodel.MessageReplyUiModel
+import chat.rocket.android.chatroom.uimodel.MessageUiModel
+import chat.rocket.android.chatroom.uimodel.UrlPreviewUiModel
+import chat.rocket.android.chatroom.uimodel.toViewType
 import chat.rocket.android.emoji.EmojiReactionListener
+import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.openTabbedUrl
+import chat.rocket.core.model.Message
 import chat.rocket.core.model.attachment.actions.Action
 import chat.rocket.core.model.attachment.actions.ButtonAction
-import chat.rocket.core.model.Message
 import chat.rocket.core.model.isSystemMessage
 import timber.log.Timber
 import java.security.InvalidParameterException
@@ -22,7 +28,8 @@ class ChatRoomAdapter(
     private val roomName: String? = null,
     private val actionSelectListener: OnActionSelected? = null,
     private val enableActions: Boolean = true,
-    private val reactionListener: EmojiReactionListener? = null
+    private val reactionListener: EmojiReactionListener? = null,
+    private val navigator: ChatRoomNavigator? = null
 ) : RecyclerView.Adapter<BaseViewHolder<*>>() {
     private val dataSet = ArrayList<BaseUiModel<*>>()
 
@@ -34,7 +41,11 @@ class ChatRoomAdapter(
         return when (viewType.toViewType()) {
             BaseUiModel.ViewType.MESSAGE -> {
                 val view = parent.inflate(R.layout.item_message)
-                MessageViewHolder(view, actionsListener, reactionListener)
+                MessageViewHolder(
+                    view,
+                    actionsListener,
+                    reactionListener
+                ) { userId -> navigator?.toUserDetails(userId) }
             }
             BaseUiModel.ViewType.URL_PREVIEW -> {
                 val view = parent.inflate(R.layout.message_url_preview)
@@ -42,11 +53,20 @@ class ChatRoomAdapter(
             }
             BaseUiModel.ViewType.ATTACHMENT -> {
                 val view = parent.inflate(R.layout.item_message_attachment)
-                AttachmentViewHolder(view, actionsListener, reactionListener, actionAttachmentOnClickListener)
+                AttachmentViewHolder(
+                    view,
+                    actionsListener,
+                    reactionListener,
+                    actionAttachmentOnClickListener
+                )
             }
             BaseUiModel.ViewType.MESSAGE_REPLY -> {
                 val view = parent.inflate(R.layout.item_message_reply)
-                MessageReplyViewHolder(view, actionsListener, reactionListener) { roomName, permalink ->
+                MessageReplyViewHolder(
+                    view,
+                    actionsListener,
+                    reactionListener
+                ) { roomName, permalink ->
                     actionSelectListener?.openDirectMessage(roomName, permalink)
                 }
             }
@@ -117,7 +137,8 @@ class ChatRoomAdapter(
     fun prependData(dataSet: List<BaseUiModel<*>>) {
         //---At first we will update all already saved elements with received updated ones
         val filteredDataSet = dataSet.filter { newItem ->
-            val matchedIndex = this.dataSet.indexOfFirst { it.messageId == newItem.messageId && it.viewType == newItem.viewType }
+            val matchedIndex =
+                this.dataSet.indexOfFirst { it.messageId == newItem.messageId && it.viewType == newItem.viewType }
             if (matchedIndex > -1) {
                 this.dataSet[matchedIndex] = newItem
                 notifyItemChanged(matchedIndex)
@@ -266,7 +287,12 @@ class ChatRoomAdapter(
 
         fun showMessageInfo(id: String)
 
-        fun citeMessage(roomName: String, roomType: String, messageId: String, mentionAuthor: Boolean)
+        fun citeMessage(
+            roomName: String,
+            roomType: String,
+            messageId: String,
+            mentionAuthor: Boolean
+        )
 
         fun copyMessage(id: String)
 
diff --git a/app/src/main/java/chat/rocket/android/chatroom/adapter/MessageViewHolder.kt b/app/src/main/java/chat/rocket/android/chatroom/adapter/MessageViewHolder.kt
index dee006e6ad..22a83afc43 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/adapter/MessageViewHolder.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/adapter/MessageViewHolder.kt
@@ -1,6 +1,5 @@
 package chat.rocket.android.chatroom.adapter
 
-import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.text.Spannable
@@ -11,7 +10,6 @@ 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.*
@@ -20,7 +18,8 @@ import kotlinx.android.synthetic.main.item_message.view.*
 class MessageViewHolder(
     itemView: View,
     listener: ActionsListener,
-    reactionListener: EmojiReactionListener? = null
+    reactionListener: EmojiReactionListener? = null,
+    private val avatarListener: (String) -> Unit
 ) : BaseViewHolder<MessageUiModel>(itemView, listener, reactionListener), Drawable.Callback {
 
     init {
@@ -73,24 +72,14 @@ 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)
+                data.message.sender?.id?.let { userId ->
+                    avatarListener(userId)
+                }
             }
-
         }
     }
 
-    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)
diff --git a/app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt b/app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt
index 6cbd5ddce2..260daba587 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt
@@ -5,7 +5,6 @@ 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
@@ -16,16 +15,11 @@ import chat.rocket.android.server.domain.SettingsRepository
 import chat.rocket.android.server.domain.TokenRepository
 import dagger.Module
 import dagger.Provides
-import kotlinx.coroutines.experimental.Job
 import javax.inject.Named
 
 @Module
 class ChatRoomFragmentModule {
 
-    @Provides
-    @PerFragment
-    fun provideJob() = Job()
-
     @Provides
     @PerFragment
     fun chatRoomView(frag: ChatRoomFragment): ChatRoomView {
@@ -38,12 +32,6 @@ class ChatRoomFragmentModule {
         return frag
     }
 
-    @Provides
-    @PerFragment
-    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
-        return CancelStrategy(owner, jobs)
-    }
-
     @Provides
     @PerFragment
     fun provideChatRoomDao(manager: DatabaseManager): ChatRoomDao = manager.chatRoomDao()
@@ -71,6 +59,12 @@ class ChatRoomFragmentModule {
         @Named("currentServer") serverUrl: String,
         permissionsInteractor: PermissionsInteractor
     ): RoomUiModelMapper {
-        return RoomUiModelMapper(context, repository.get(serverUrl), userInteractor, serverUrl, permissionsInteractor)
+        return RoomUiModelMapper(
+            context,
+            repository.get(serverUrl),
+            userInteractor,
+            serverUrl,
+            permissionsInteractor
+        )
     }
 }
diff --git a/app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomModule.kt b/app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomModule.kt
index cd641c3761..5c5cda6694 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomModule.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomModule.kt
@@ -1,14 +1,32 @@
 package chat.rocket.android.chatroom.di
 
+import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.chatroom.presentation.ChatRoomNavigator
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
+import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerActivity
 import dagger.Module
 import dagger.Provides
+import kotlinx.coroutines.experimental.Job
 
 @Module
 class ChatRoomModule {
+
     @Provides
     @PerActivity
     fun provideChatRoomNavigator(activity: ChatRoomActivity) = ChatRoomNavigator(activity)
+
+    @Provides
+    @PerActivity
+    fun provideJob() = Job()
+
+    @Provides
+    @PerActivity
+    fun provideLifecycleOwner(activity: ChatRoomActivity): LifecycleOwner = activity
+
+    @Provides
+    @PerActivity
+    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
+        return CancelStrategy(owner, jobs)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/chatroom/di/MessageServiceProvider.kt b/app/src/main/java/chat/rocket/android/chatroom/di/MessageServiceProvider.kt
index d1dd533a66..6f6f5410dc 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/di/MessageServiceProvider.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/di/MessageServiceProvider.kt
@@ -6,6 +6,7 @@ import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
 @Module abstract class MessageServiceProvider {
+
     @ContributesAndroidInjector(modules = [AppModule::class])
     abstract fun provideMessageService(): MessageService
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomNavigator.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomNavigator.kt
index 53ea424f56..f978b1e075 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomNavigator.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomNavigator.kt
@@ -5,15 +5,44 @@ 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
-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.server.ui.changeServerIntent
+import chat.rocket.android.userdetails.ui.TAG_USER_DETAILS_FRAGMENT
 import chat.rocket.android.util.extensions.addFragmentBackStack
+import javax.inject.Inject
+
+class ChatRoomNavigator @Inject constructor(internal val activity: ChatRoomActivity) {
+
+    fun toUserDetails(userId: String) {
+        activity.addFragmentBackStack(TAG_USER_DETAILS_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.userdetails.ui.newInstance(userId)
+        }
+    }
+
+    fun toChatRoom(
+        chatRoomId: String,
+        chatRoomName: String,
+        chatRoomType: String,
+        isReadOnly: Boolean,
+        chatRoomLastSeen: Long,
+        isSubscribed: Boolean,
+        isCreator: Boolean,
+        isFavorite: Boolean
+    ) {
+        activity.startActivity(
+            activity.chatRoomIntent(
+                chatRoomId,
+                chatRoomName,
+                chatRoomType,
+                isReadOnly,
+                chatRoomLastSeen,
+                isSubscribed,
+                isCreator,
+                isFavorite
+            )
+        )
+        activity.overridePendingTransition(R.anim.open_enter, R.anim.open_exit)
+    }
 
-class ChatRoomNavigator(internal val activity: ChatRoomActivity) {
     fun toChatDetails(
         chatRoomId: String,
         chatRoomType: String,
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index 246cc76705..5930ce0e01 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -40,6 +40,7 @@ import chat.rocket.android.chatroom.adapter.EmojiSuggestionsAdapter
 import chat.rocket.android.chatroom.adapter.PEOPLE
 import chat.rocket.android.chatroom.adapter.PeopleSuggestionsAdapter
 import chat.rocket.android.chatroom.adapter.RoomSuggestionsAdapter
+import chat.rocket.android.chatroom.presentation.ChatRoomNavigator
 import chat.rocket.android.chatroom.presentation.ChatRoomPresenter
 import chat.rocket.android.chatroom.presentation.ChatRoomView
 import chat.rocket.android.chatroom.ui.bottomsheet.MessageActionsBottomSheet
@@ -68,6 +69,7 @@ import chat.rocket.android.helper.MessageParser
 import chat.rocket.android.util.extension.asObservable
 import chat.rocket.android.util.extension.createImageFile
 import chat.rocket.android.util.extensions.circularRevealOrUnreveal
+import chat.rocket.android.util.extensions.clearLightStatusBar
 import chat.rocket.android.util.extensions.fadeIn
 import chat.rocket.android.util.extensions.fadeOut
 import chat.rocket.android.util.extensions.getBitmpap
@@ -85,6 +87,7 @@ import dagger.android.support.AndroidSupportInjection
 import io.reactivex.Observable
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
+import kotlinx.android.synthetic.main.app_bar_chat_room.*
 import kotlinx.android.synthetic.main.emoji_image_row_item.view.*
 import kotlinx.android.synthetic.main.emoji_row_item.view.*
 import kotlinx.android.synthetic.main.fragment_chat_room.*
@@ -145,13 +148,14 @@ internal const val MENU_ACTION_SHOW_DETAILS = 2
 
 class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiReactionListener,
     ChatRoomAdapter.OnActionSelected, Drawable.Callback {
-
     @Inject
     lateinit var presenter: ChatRoomPresenter
     @Inject
     lateinit var parser: MessageParser
     @Inject
     lateinit var analyticsManager: AnalyticsManager
+    @Inject
+    lateinit var navigator: ChatRoomNavigator
     private lateinit var adapter: ChatRoomAdapter
     internal lateinit var chatRoomId: String
     private lateinit var chatRoomName: String
@@ -284,7 +288,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             requireNotNull(bundle) { "no arguments supplied when the fragment was instantiated" }
         }
 
-        adapter = ChatRoomAdapter(chatRoomId, chatRoomType, chatRoomName, this, reactionListener = this)
+        adapter = ChatRoomAdapter(chatRoomId, chatRoomType, chatRoomName, this, reactionListener = this, navigator = navigator)
     }
 
     override fun onCreateView(
@@ -1057,7 +1061,11 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     }
 
     private fun setupToolbar(toolbarTitle: String) {
-        (activity as ChatRoomActivity).showToolbarTitle(toolbarTitle)
+        with(activity as ChatRoomActivity) {
+            this.clearLightStatusBar()
+            this.showToolbarTitle(toolbarTitle)
+            toolbar.isVisible = true
+        }
     }
 
     override fun unscheduleDrawable(who: Drawable?, what: Runnable?) {
diff --git a/app/src/main/java/chat/rocket/android/dagger/module/ActivityBuilder.kt b/app/src/main/java/chat/rocket/android/dagger/module/ActivityBuilder.kt
index 708309a9a7..546fc38586 100644
--- a/app/src/main/java/chat/rocket/android/dagger/module/ActivityBuilder.kt
+++ b/app/src/main/java/chat/rocket/android/dagger/module/ActivityBuilder.kt
@@ -38,14 +38,14 @@ 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.userdetails.di.UserDetailsFragmentProvider
 import chat.rocket.android.webview.adminpanel.di.AdminPanelWebViewFragmentProvider
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
 @Module
 abstract class ActivityBuilder {
+
     @PerActivity
     @ContributesAndroidInjector(
         modules = [AuthenticationModule::class,
@@ -77,9 +77,9 @@ abstract class ActivityBuilder {
 
     @PerActivity
     @ContributesAndroidInjector(
-        modules = [
-            ChatRoomModule::class,
-            ChatRoomFragmentProvider::class
+        modules = [ChatRoomModule::class,
+            ChatRoomFragmentProvider::class,
+            UserDetailsFragmentProvider::class
         ]
     )
     abstract fun bindChatRoomActivity(): ChatRoomActivity
@@ -113,8 +113,4 @@ abstract class ActivityBuilder {
     @PerActivity
     @ContributesAndroidInjector(modules = [DrawModule::class])
     abstract fun bindDrawingActivity(): DrawingActivity
-
-    @PerActivity
-    @ContributesAndroidInjector(modules = [UserDetailsModule::class])
-    abstract fun bindUserDetailsActivity(): UserDetailsActivity
 }
diff --git a/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt b/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
index e4d89377c7..79bd4c0df4 100644
--- a/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
+++ b/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
@@ -102,6 +102,18 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
         }
     }
 
+    suspend fun insertOrReplaceRoom(chatRoomEntity: ChatRoomEntity) {
+        retryDB("insertOrReplace($chatRoomEntity)") {
+            chatRoomDao().insertOrReplace(chatRoomEntity)
+        }
+    }
+
+    suspend fun getUser(id: String) = withContext(dbManagerContext) {
+        retryDB("getUser($id)") {
+            userDao().getUser(id)
+        }
+    }
+
     fun processUsersBatch(users: List<User>) {
         launch(dbManagerContext) {
             val list = ArrayList<BaseUserEntity>(users.size)
diff --git a/app/src/main/java/chat/rocket/android/members/di/MembersFragmentModule.kt b/app/src/main/java/chat/rocket/android/members/di/MembersFragmentModule.kt
index a9a5a556df..4fa0c2b631 100644
--- a/app/src/main/java/chat/rocket/android/members/di/MembersFragmentModule.kt
+++ b/app/src/main/java/chat/rocket/android/members/di/MembersFragmentModule.kt
@@ -22,7 +22,7 @@ class MembersFragmentModule {
 
     @Provides
     @PerFragment
-    fun provideChatRoomNavigator(activity: ChatDetailsActivity) = MembersNavigator(activity)
+    fun provideMembersNavigator(activity: ChatDetailsActivity) = MembersNavigator(activity)
 
     @Provides
     @PerFragment
diff --git a/app/src/main/java/chat/rocket/android/members/presentation/MembersNavigator.kt b/app/src/main/java/chat/rocket/android/members/presentation/MembersNavigator.kt
index ee1c293c0c..55c4748250 100644
--- a/app/src/main/java/chat/rocket/android/members/presentation/MembersNavigator.kt
+++ b/app/src/main/java/chat/rocket/android/members/presentation/MembersNavigator.kt
@@ -1,13 +1,16 @@
 package chat.rocket.android.members.presentation
 
+import chat.rocket.android.R
 import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
-import chat.rocket.android.userdetails.ui.userDetailsIntent
+import chat.rocket.android.userdetails.ui.TAG_USER_DETAILS_FRAGMENT
+import chat.rocket.android.util.extensions.addFragmentBackStack
 
 class MembersNavigator(internal val activity: ChatDetailsActivity) {
 
     fun toMemberDetails(userId: String) {
-        activity.apply {
-            startActivity(this.userDetailsIntent(userId, ""))
-        }
+        // TODO
+//        activity.addFragmentBackStack(TAG_USER_DETAILS_FRAGMENT, R.id.fragment_container) {
+//            chat.rocket.android.userdetails.ui.newInstance(userId)
+//        }
     }
 }
diff --git a/app/src/main/java/chat/rocket/android/mentions/ui/MentionsFragment.kt b/app/src/main/java/chat/rocket/android/mentions/ui/MentionsFragment.kt
index 3f756128e5..6eb6706dbe 100644
--- a/app/src/main/java/chat/rocket/android/mentions/ui/MentionsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/mentions/ui/MentionsFragment.kt
@@ -37,13 +37,12 @@ internal const val TAG_MENTIONS_FRAGMENT = "MentionsFragment"
 private const val BUNDLE_CHAT_ROOM_ID = "chat_room_id"
 
 class MentionsFragment : Fragment(), MentionsView {
-
-    private lateinit var chatRoomId: String
-    private val adapter = ChatRoomAdapter(enableActions = false)
     @Inject
     lateinit var presenter: MentionsPresenter
     @Inject
     lateinit var analyticsManager: AnalyticsManager
+    private lateinit var chatRoomId: String
+    private val adapter = ChatRoomAdapter(enableActions = false)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/chat/rocket/android/userdetails/di/UserDetailsFragmentModule.kt b/app/src/main/java/chat/rocket/android/userdetails/di/UserDetailsFragmentModule.kt
new file mode 100644
index 0000000000..88ec10a0b9
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/userdetails/di/UserDetailsFragmentModule.kt
@@ -0,0 +1,20 @@
+package chat.rocket.android.userdetails.di
+
+import androidx.lifecycle.LifecycleOwner
+import chat.rocket.android.dagger.scope.PerFragment
+import chat.rocket.android.userdetails.presentation.UserDetailsView
+import chat.rocket.android.userdetails.ui.UserDetailsFragment
+import dagger.Module
+import dagger.Provides
+
+@Module
+class UserDetailsFragmentModule {
+
+    @Provides
+    @PerFragment
+    fun provideUserDetailsView(frag: UserDetailsFragment): UserDetailsView = frag
+
+    @Provides
+    @PerFragment
+    fun provideLifecycleOwner(frag: UserDetailsFragment): LifecycleOwner = frag
+}
diff --git a/app/src/main/java/chat/rocket/android/userdetails/di/UserDetailsFragmentProvider.kt b/app/src/main/java/chat/rocket/android/userdetails/di/UserDetailsFragmentProvider.kt
new file mode 100644
index 0000000000..ca33468e62
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/userdetails/di/UserDetailsFragmentProvider.kt
@@ -0,0 +1,14 @@
+package chat.rocket.android.userdetails.di
+
+import chat.rocket.android.dagger.scope.PerFragment
+import chat.rocket.android.userdetails.ui.UserDetailsFragment
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module
+abstract class UserDetailsFragmentProvider {
+
+    @ContributesAndroidInjector(modules = [UserDetailsFragmentModule::class])
+    @PerFragment
+    abstract fun provideUserDetailsFragment(): UserDetailsFragment
+}
diff --git a/app/src/main/java/chat/rocket/android/userdetails/di/UserDetailsModule.kt b/app/src/main/java/chat/rocket/android/userdetails/di/UserDetailsModule.kt
deleted file mode 100644
index 6435abc70b..0000000000
--- a/app/src/main/java/chat/rocket/android/userdetails/di/UserDetailsModule.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package chat.rocket.android.userdetails.di
-
-import androidx.lifecycle.LifecycleOwner
-import chat.rocket.android.core.lifecycle.CancelStrategy
-import chat.rocket.android.dagger.scope.PerActivity
-import chat.rocket.android.userdetails.presentation.UserDetailsView
-import chat.rocket.android.userdetails.ui.UserDetailsActivity
-import dagger.Module
-import dagger.Provides
-import kotlinx.coroutines.experimental.Job
-
-@Module
-class UserDetailsModule {
-
-    @Provides
-    @PerActivity
-    fun provideJob() = Job()
-
-    @Provides
-    @PerActivity
-    fun provideUserDetailsView(activity: UserDetailsActivity): UserDetailsView = activity
-
-    @Provides
-    @PerActivity
-    fun provideLifecycleOwner(activity: UserDetailsActivity): LifecycleOwner = activity
-
-    @Provides
-    @PerActivity
-    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
-        return CancelStrategy(owner, jobs)
-    }
-}
diff --git a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
index 0221982103..004778e654 100644
--- a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
@@ -1,20 +1,20 @@
 package chat.rocket.android.userdetails.presentation
 
+import chat.rocket.android.chatroom.presentation.ChatRoomNavigator
 import chat.rocket.android.chatrooms.domain.FetchChatRoomsInteractor
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.db.model.ChatRoomEntity
+import chat.rocket.android.db.model.UserEntity
 import chat.rocket.android.server.domain.GetConnectingServerInteractor
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.model.RoomType
-import chat.rocket.common.model.roomTypeOf
-import chat.rocket.common.model.userStatusOf
+import chat.rocket.common.util.ifNull
 import chat.rocket.core.internal.rest.createDirectMessage
-import chat.rocket.core.model.ChatRoom
-import kotlinx.coroutines.experimental.CommonPool
+import kotlinx.coroutines.experimental.DefaultDispatcher
 import kotlinx.coroutines.experimental.withContext
 import timber.log.Timber
 import javax.inject.Inject
@@ -23,141 +23,98 @@ class UserDetailsPresenter @Inject constructor(
     private val view: UserDetailsView,
     private val dbManager: DatabaseManager,
     private val strategy: CancelStrategy,
+    private val navigator: ChatRoomNavigator,
     serverInteractor: GetConnectingServerInteractor,
     factory: ConnectionManagerFactory
 ) {
     private var currentServer = serverInteractor.get()!!
     private val manager = factory.create(currentServer)
     private val client = manager.client
-    private val interactor = FetchChatRoomsInteractor(client,dbManager)
+    private val interactor = FetchChatRoomsInteractor(client, dbManager)
+    private lateinit var userEntity: UserEntity
 
     fun loadUserDetails(userId: String) {
         launchUI(strategy) {
             try {
-                val user = withContext(CommonPool) {
-                    dbManager.userDao().getUser(id = userId)
-                }
-
-                user?.let { u ->
-                    val openedChatRooms = chatRoomByName(name = u.name)
-                    val avatarUrl = u.username?.let { currentServer.avatarUrl(avatar = it) }
-
-                    val chatRoom: ChatRoom? = openedChatRooms.firstOrNull()
+                view.showLoading()
+                dbManager.getUser(userId)?.let {
+                    userEntity = it
+                    val avatarUrl =
+                        userEntity.username?.let { currentServer.avatarUrl(avatar = it) }
+                    val username = userEntity.username
+                    val name = userEntity.name
+                    val utcOffset =
+                        userEntity.utcOffset // TODO Convert UTC and display like the mockup
 
-                    view.showUserDetails(
-                        avatarUrl = avatarUrl,
-                        username = u.username,
-                        name = u.name,
-                        utcOffset = u.utcOffset,
-                        status = u.status,
-                        chatRoom = chatRoom
-                    )
+                    if (avatarUrl != null && username != null && name != null && utcOffset != null) {
+                        view.showUserDetails(
+                            avatarUrl = avatarUrl,
+                            name = name,
+                            username = username,
+                            status = userEntity.status,
+                            utcOffset = utcOffset.toString()
+                        )
+                    } else {
+                        throw Exception()
+                    }
                 }
             } catch (ex: Exception) {
                 Timber.e(ex)
+                ex.message?.let {
+                    view.showMessage(it)
+                }.ifNull {
+                    view.showGenericErrorMessage()
+                }
+            } finally {
+                view.hideLoading()
             }
         }
     }
 
-    fun createDirectMessage(id: String) = launchUI(strategy) {
-        try {
-            val result = retryIO("createDirectMessage($id") {
-                client.createDirectMessage(username = id)
-            }
+    fun createDirectMessage(username: String) {
+        launchUI(strategy) {
+            try {
+                view.showLoading()
 
-            interactor.refreshChatRooms()
+                withContext(DefaultDispatcher) {
+                    val directMessage = retryIO("createDirectMessage($username") {
+                        client.createDirectMessage(username)
+                    }
 
-            val userEntity = withContext(CommonPool) {
-                dbManager.userDao().getUser(id = id)
-            }
+                    val chatRoomEntity = ChatRoomEntity(
+                        id = directMessage.id,
+                        name = userEntity.username ?: userEntity.name.orEmpty(),
+                        description = null,
+                        type = RoomType.DIRECT_MESSAGE,
+                        fullname = userEntity.name,
+                        subscriptionId = "",
+                        updatedAt = directMessage.updatedAt
+                    )
 
-            if (userEntity != null) {
-                val chatRoom = ChatRoom(
-                    id = result.id,
-                    type = roomTypeOf(RoomType.DIRECT_MESSAGE),
-                    name = userEntity.username ?: userEntity.name.orEmpty(),
-                    fullName = userEntity.name,
-                    favorite = false,
-                    open = false,
-                    alert = false,
-                    status = userStatusOf(userEntity.status),
-                    client = client,
-                    broadcast = false,
-                    archived = false,
-                    default = false,
-                    description = null,
-                    groupMentions = null,
-                    userMentions = null,
-                    lastMessage = null,
-                    lastSeen = null,
-                    topic = null,
-                    announcement = null,
-                    roles = null,
-                    unread = 0,
-                    readonly = false,
-                    muted = null,
-                    subscriptionId = "",
-                    timestamp = null,
-                    updatedAt = result.updatedAt,
-                    user = null
-                )
+                    dbManager.insertOrReplaceRoom(chatRoomEntity)
 
-                withContext(CommonPool + strategy.jobs) {
-                    dbManager.chatRoomDao().insertOrReplace(chatRoom = ChatRoomEntity(
-                        id = chatRoom.id,
-                        name = chatRoom.name,
-                        description = chatRoom.description,
-                        type = chatRoom.type.toString(),
-                        fullname = chatRoom.fullName,
-                        subscriptionId = chatRoom.subscriptionId,
-                        updatedAt = chatRoom.updatedAt
-                    ))
-                }
+                    interactor.refreshChatRooms()
 
-                view.toDirectMessage(chatRoom = chatRoom)
-            }
-        } catch (ex: Exception) {
-            Timber.e(ex)
-            view.onOpenDirectMessageError()
-        }
-    }
-
-    private suspend fun chatRoomByName(name: String? = null): List<ChatRoom> = withContext(CommonPool) {
-        return@withContext dbManager.chatRoomDao().getAllSync().filter {
-            if (name == null) {
-                return@filter true
-            }
-            it.chatRoom.name == name || it.chatRoom.fullname == name
-        }.map {
-            with(it.chatRoom) {
-                ChatRoom(
-                    id = id,
-                    subscriptionId = subscriptionId,
-                    type = roomTypeOf(type),
-                    unread = unread,
-                    broadcast = broadcast ?: false,
-                    alert = alert,
-                    fullName = fullname,
-                    name = name ?: "",
-                    favorite = favorite ?: false,
-                    default = isDefault ?: false,
-                    readonly = readonly,
-                    open = open,
-                    lastMessage = null,
-                    archived = false,
-                    status = null,
-                    user = null,
-                    userMentions = userMentions,
-                    client = client,
-                    announcement = null,
-                    description = null,
-                    groupMentions = groupMentions,
-                    roles = null,
-                    topic = null,
-                    lastSeen = this.lastSeen,
-                    timestamp = timestamp,
-                    updatedAt = updatedAt
-                )
+                    navigator.toChatRoom(
+                        chatRoomId = chatRoomEntity.id,
+                        chatRoomName = chatRoomEntity.name,
+                        chatRoomType = chatRoomEntity.type,
+                        isReadOnly = false,
+                        chatRoomLastSeen = -1,
+                        isSubscribed = chatRoomEntity.open,
+                        isCreator = true,
+                        isFavorite = false
+                    )
+                }
+            } catch (ex: Exception) {
+                Timber.e(ex)
+                ex.message?.let {
+                    view.showMessage(it)
+                }.ifNull {
+                    view.showGenericErrorMessage()
+                }
+            } finally {
+                view.hideLoading()
             }
         }
     }
diff --git a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsView.kt b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsView.kt
index 664812dcbc..1492c5152f 100644
--- a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsView.kt
+++ b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsView.kt
@@ -1,12 +1,24 @@
 package chat.rocket.android.userdetails.presentation
 
-import chat.rocket.core.model.ChatRoom
+import chat.rocket.android.core.behaviours.LoadingView
+import chat.rocket.android.core.behaviours.MessageView
 
-interface UserDetailsView {
+interface UserDetailsView : LoadingView, MessageView {
 
-    fun showUserDetails(avatarUrl: String?, username: String?, name: String?, utcOffset: Float?, status: String, chatRoom: ChatRoom?)
-
-    fun toDirectMessage(chatRoom: ChatRoom)
-
-    fun onOpenDirectMessageError()
+    /**
+     * Shows user detail.
+     *
+     * @param avatarUrl The user avatar URL.
+     * @param name The user's name.
+     * @param username The user's username.
+     * @param status The user's status.
+     * @param utcOffset The user's UTC offset.
+     */
+    fun showUserDetails(
+        avatarUrl: String,
+        name: String,
+        username: String,
+        status: String,
+        utcOffset: String
+    )
 }
diff --git a/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt b/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt
deleted file mode 100644
index c39d7b82bd..0000000000
--- a/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt
+++ /dev/null
@@ -1,198 +0,0 @@
-package chat.rocket.android.userdetails.ui
-
-import android.content.Context
-import android.content.Intent
-import android.graphics.drawable.BitmapDrawable
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
-import blurred
-import chat.rocket.android.R
-import chat.rocket.android.chatroom.ui.chatRoomIntent
-import chat.rocket.android.emoji.internal.GlideApp
-import chat.rocket.android.userdetails.presentation.UserDetailsPresenter
-import chat.rocket.android.userdetails.presentation.UserDetailsView
-import chat.rocket.android.util.extension.launchUI
-import chat.rocket.android.util.extension.orFalse
-import chat.rocket.android.util.extensions.showToast
-import chat.rocket.android.util.retryIO
-import chat.rocket.common.model.roomTypeOf
-import chat.rocket.core.internal.rest.createDirectMessage
-import chat.rocket.core.model.ChatRoom
-import chat.rocket.core.model.userId
-import com.bumptech.glide.Glide
-import com.bumptech.glide.Priority
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.load.resource.bitmap.CenterCrop
-import com.bumptech.glide.load.resource.bitmap.CenterInside
-import com.bumptech.glide.load.resource.bitmap.FitCenter
-import com.bumptech.glide.load.resource.bitmap.RoundedCorners
-import com.bumptech.glide.request.RequestOptions
-import com.google.android.material.snackbar.Snackbar
-import dagger.android.AndroidInjection
-import dagger.android.AndroidInjector
-import dagger.android.DispatchingAndroidInjector
-import dagger.android.support.HasSupportFragmentInjector
-import kotlinx.android.synthetic.main.activity_user_details.*
-import kotlinx.coroutines.experimental.CommonPool
-import kotlinx.coroutines.experimental.android.UI
-import kotlinx.coroutines.experimental.launch
-import kotlinx.coroutines.experimental.withContext
-import org.threeten.bp.OffsetDateTime
-import org.threeten.bp.ZoneId
-import org.threeten.bp.ZoneOffset
-import org.threeten.bp.ZonedDateTime
-import org.threeten.bp.format.DateTimeFormatter
-import timber.log.Timber
-import javax.inject.Inject
-import kotlin.math.roundToLong
-
-fun Context.userDetailsIntent(userId: String, subscriptionId: String): Intent {
-    return Intent(this, UserDetailsActivity::class.java).apply {
-        putExtra(EXTRA_USER_ID, userId)
-        putExtra(EXTRA_SUBSCRIPTION_ID, subscriptionId)
-    }
-}
-
-const val EXTRA_USER_ID = "EXTRA_USER_ID"
-const val EXTRA_SUBSCRIPTION_ID = "EXTRA_USERNAME"
-
-class UserDetailsActivity : AppCompatActivity(), UserDetailsView, HasSupportFragmentInjector {
-
-    @Inject
-    lateinit var fragmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
-    @Inject
-    lateinit var presenter: UserDetailsPresenter
-
-    private lateinit var subscriptionId: String
-    private lateinit var userId: String
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        AndroidInjection.inject(this)
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_user_details)
-        setupToolbar()
-
-        userId = intent.getStringExtra(EXTRA_USER_ID)
-        subscriptionId = intent.getStringExtra(EXTRA_SUBSCRIPTION_ID)
-        showLoadingView(true)
-        presenter.loadUserDetails(userId = userId)
-    }
-
-    override fun supportFragmentInjector(): AndroidInjector<Fragment> = fragmentDispatchingAndroidInjector
-
-    private fun setupToolbar() {
-        setSupportActionBar(toolbar)
-        supportActionBar?.setDisplayShowTitleEnabled(false)
-        toolbar.setNavigationOnClickListener { finish() }
-    }
-
-    override fun showUserDetails(
-        avatarUrl: String?,
-        username: String?,
-        name: String?,
-        utcOffset: Float?,
-        status: String,
-        chatRoom: ChatRoom?
-    ) {
-        text_view_name.text = name
-        text_view_username.text = username
-        text_view_status.text = status.capitalize()
-
-        try {
-            launch(UI) {
-                val image = withContext(CommonPool) {
-                    try {
-                        val requestOptions = RequestOptions()
-                            .priority(Priority.IMMEDIATE)
-                            .transforms(CenterInside(), FitCenter())
-
-                        return@withContext GlideApp.with(this@UserDetailsActivity)
-                            .asBitmap()
-                            .diskCacheStrategy(DiskCacheStrategy.ALL)
-                            .load(avatarUrl)
-                            .apply(requestOptions)
-                            .submit()
-                            .get()
-                    } catch (ex: Exception) {
-                        Timber.e(ex)
-                        return@withContext null
-                    } finally {
-                        showLoadingView(false)
-                    }
-                }
-
-                image?.let {
-                    val blurredBitmap = image.blurred(context = this@UserDetailsActivity,
-                        newWidth = toolbar.measuredWidth, newHeight = toolbar.measuredHeight)
-                    toolbar.background = BitmapDrawable(resources, blurredBitmap)
-                    GlideApp.with(this@UserDetailsActivity)
-                        .asBitmap()
-                        .transforms(RoundedCorners(25), CenterCrop())
-                        .load(image)
-                        .into(image_view_avatar)
-                }
-            }
-
-            utcOffset?.let {
-                val offsetLong = it.roundToLong()
-                val offset = if (it > 0) "+$offsetLong" else offsetLong.toString()
-                val formatter = DateTimeFormatter.ofPattern("'(GMT$offset)' hh:mm a")
-                val zoneId = ZoneId.systemDefault()
-                val timeNow = OffsetDateTime.now(ZoneOffset.UTC).plusHours(offsetLong).toLocalDateTime()
-                text_view_tz.text = formatter.format(ZonedDateTime.of(timeNow, zoneId))
-            }
-
-            text_view_message.setOnClickListener {
-                if (chatRoom == null) {
-                    presenter.createDirectMessage(id = userId)
-                } else {
-                    toDirectMessage(chatRoom)
-                }
-            }
-
-            image_view_message.setOnClickListener {
-                if (chatRoom == null) {
-                    presenter.createDirectMessage(id = userId)
-                } else {
-                    toDirectMessage(chatRoom)
-                }
-            }
-        } catch (ex: Exception) {
-            Timber.e(ex)
-        }
-    }
-
-    private fun showLoadingView(show: Boolean) {
-        runOnUiThread {
-            group_user_details.isVisible = !show
-            view_loading.isVisible = show
-        }
-    }
-
-    override fun onOpenDirectMessageError() {
-        Snackbar.make(root_layout, R.string.error_opening_dm, Snackbar.LENGTH_INDEFINITE)
-            .setAction(R.string.retry) {
-                presenter.createDirectMessage(userId)
-            }.show()
-    }
-
-    override fun toDirectMessage(chatRoom: ChatRoom) {
-        finish()
-        if (chatRoom.subscriptionId.isEmpty() || chatRoom.subscriptionId != subscriptionId) {
-            startActivity(
-                chatRoomIntent(
-                    chatRoomId = chatRoom.id,
-                    chatRoomName = chatRoom.name,
-                    chatRoomType = chatRoom.type.toString(),
-                    isReadOnly = chatRoom.readonly.orFalse(),
-                    chatRoomLastSeen = chatRoom.lastSeen ?: 0,
-                    isSubscribed = chatRoom.open,
-                    isCreator = false,
-                    isFavorite = chatRoom.favorite
-                )
-            )
-        }
-    }
-}
diff --git a/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsFragment.kt b/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsFragment.kt
new file mode 100644
index 0000000000..fe75775a0e
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsFragment.kt
@@ -0,0 +1,117 @@
+package chat.rocket.android.userdetails.ui
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import 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.userdetails.presentation.UserDetailsPresenter
+import chat.rocket.android.userdetails.presentation.UserDetailsView
+import chat.rocket.android.util.extensions.inflate
+import chat.rocket.android.util.extensions.setLightStatusBar
+import chat.rocket.android.util.extensions.showToast
+import chat.rocket.android.util.extensions.ui
+import com.bumptech.glide.Glide
+import dagger.android.support.AndroidSupportInjection
+import kotlinx.android.synthetic.main.app_bar_chat_room.*
+import kotlinx.android.synthetic.main.fragment_user_details.*
+import javax.inject.Inject
+
+fun newInstance(userId: String): Fragment {
+    return UserDetailsFragment().apply {
+        arguments = Bundle(1).apply {
+            putString(BUNDLE_USER_ID, userId)
+        }
+    }
+}
+
+internal const val TAG_USER_DETAILS_FRAGMENT = "UserDetailsFragment"
+private const val BUNDLE_USER_ID = "user_id"
+
+class UserDetailsFragment : Fragment(), UserDetailsView {
+    @Inject
+    lateinit var presenter: UserDetailsPresenter
+    @Inject
+    lateinit var analyticsManager: AnalyticsManager
+    private lateinit var userId: String
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        AndroidSupportInjection.inject(this)
+
+        val bundle = arguments
+        if (bundle != null) {
+            userId = bundle.getString(BUNDLE_USER_ID)
+        } else {
+            requireNotNull(bundle) { "no arguments supplied when the fragment was instantiated" }
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? = container?.inflate(R.layout.fragment_user_details)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        setupToolbar()
+        presenter.loadUserDetails(userId)
+
+        analyticsManager.logScreenView(ScreenViewEvent.UserDetails)
+    }
+
+    override fun showUserDetails(
+        avatarUrl: String,
+        name: String,
+        username: String,
+        status: String,
+        utcOffset: String
+    ) {
+        Glide.with(this)
+            .asBitmap()
+            .load(avatarUrl)
+            .into(image_avatar)
+
+        text_name.text = name
+        text_username.text = username
+        text_description_status.text = status
+        text_description_timezone.text = utcOffset
+
+        // We should also setup the user details listeners.
+        text_message.setOnClickListener { presenter.createDirectMessage(username) }
+    }
+
+    override fun showLoading() {
+        group_user_details.isVisible = false
+        view_loading.isVisible = true
+    }
+
+    override fun hideLoading() {
+        group_user_details.isVisible = true
+        view_loading.isVisible = false
+    }
+
+    override fun showMessage(resId: Int) {
+        ui { showToast(resId) }
+    }
+
+    override fun showMessage(message: String) {
+        ui { showToast(message) }
+    }
+
+    override fun showGenericErrorMessage() = showMessage(getString(R.string.msg_generic_error))
+
+    private fun setupToolbar() {
+        with(activity as ChatRoomActivity) {
+            view?.let { setLightStatusBar(it) }
+            toolbar.isVisible = false
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_message_24dp.xml b/app/src/main/res/drawable/ic_message_24dp.xml
index 2bb7785af1..8631256240 100644
--- a/app/src/main/res/drawable/ic_message_24dp.xml
+++ b/app/src/main/res/drawable/ic_message_24dp.xml
@@ -3,6 +3,7 @@
     android:height="24dp"
     android:viewportWidth="20"
     android:viewportHeight="20">
+
     <path
         android:fillColor="#1d74f5"
         android:fillType="evenOdd"
diff --git a/app/src/main/res/layout/activity_user_details.xml b/app/src/main/res/layout/activity_user_details.xml
deleted file mode 100644
index 9d71c1cff4..0000000000
--- a/app/src/main/res/layout/activity_user_details.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/root_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@android:color/white"
-    android:fitsSystemWindows="true">
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@android:color/white"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@android:color/white">
-
-            <com.wang.avi.AVLoadingIndicatorView
-                android:id="@+id/view_loading"
-                style="@style/Authentication.AVLoadingIndicatorView"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:visibility="visible" />
-
-            <ImageView
-                android:id="@+id/image_view_message"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginTop="24dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/text_view_username"
-                app:srcCompat="@drawable/ic_message_24dp" />
-
-            <TextView
-                android:id="@+id/text_view_message"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/message"
-                android:textColor="#1d74f5"
-                android:textSize="18sp"
-                app:layout_constraintEnd_toEndOf="@+id/image_view_message"
-                app:layout_constraintStart_toStartOf="@+id/image_view_message"
-                app:layout_constraintTop_toBottomOf="@+id/image_view_message" />
-
-            <TextView
-                android:id="@+id/text_view_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginEnd="16dp"
-                android:fontFamily="sans-serif-medium"
-                android:textColor="@android:color/black"
-                android:textSize="18sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:text="Karem Flusser" />
-
-            <TextView
-                android:id="@+id/text_view_username"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:textColor="@color/darkGray"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/text_view_name"
-                tools:text="karem.flusser" />
-
-            <TextView
-                android:id="@+id/textView3"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="24dp"
-                android:text="@string/status"
-                android:textColor="@color/darkGray"
-                android:textSize="14sp"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/text_view_message" />
-
-            <TextView
-                android:id="@+id/text_view_status"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:textColor="@android:color/black"
-                android:textSize="16sp"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/textView3"
-                tools:text="Online" />
-
-            <TextView
-                android:id="@+id/textView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="16dp"
-                android:text="@string/timezone"
-                android:textColor="@color/darkGray"
-                android:textSize="14sp"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/text_view_status" />
-
-            <TextView
-                android:id="@+id/text_view_tz"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:textColor="@android:color/black"
-                android:textSize="16sp"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/textView"
-                tools:text="(UTC-2) 11:08 AM" />
-
-            <androidx.constraintlayout.widget.Group
-                android:id="@+id/group_user_details"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:constraint_referenced_ids="text_view_tz,textView,text_view_status,text_view_message,textView3,text_view_name,text_view_username,image_view_message" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.core.widget.NestedScrollView>
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@android:color/white"
-        app:elevation="0dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <com.google.android.material.appbar.CollapsingToolbarLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:contentScrim="@android:color/white"
-            app:expandedTitleGravity="top"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
-
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:paddingBottom="?actionBarSize"
-                app:elevation="0dp"
-                app:layout_collapseMode="pin"
-                app:layout_scrollFlags="scroll|enterAlways"
-                app:navigationIcon="?android:attr/homeAsUpIndicator"
-                app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
-
-            <ImageView
-                android:id="@+id/image_view_avatar"
-                android:layout_width="98dp"
-                android:layout_height="98dp"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="?actionBarSize"
-                android:layout_marginEnd="16dp"
-                android:background="@drawable/bg_round_bounds_white"
-                tools:srcCompat="@tools:sample/avatars[6]" />
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
-    </com.google.android.material.appbar.AppBarLayout>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_user_details.xml b/app/src/main/res/layout/fragment_user_details.xml
new file mode 100644
index 0000000000..efafa05401
--- /dev/null
+++ b/app/src/main/res/layout/fragment_user_details.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/white"
+    android:padding="@dimen/screen_edge_left_and_right_margins">
+
+    <ImageView
+        android:id="@+id/image_avatar"
+        android:layout_width="98dp"
+        android:layout_height="98dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:srcCompat="@tools:sample/avatars[6]" />
+
+    <TextView
+        android:id="@+id/text_name"
+        style="@style/UserDetails.TextView.Name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/image_avatar"
+        tools:text="Karem Flusser" />
+
+    <TextView
+        android:id="@+id/text_username"
+        style="@style/UserDetails.TextView.Username"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_name"
+        tools:text="karem.flusser" />
+
+    <TextView
+        android:id="@+id/text_message"
+        style="@style/UserDetails.TextView.Actions"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:drawableTop="@drawable/ic_message_24dp"
+        android:text="@string/msg_message"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_username" />
+
+    <TextView
+        android:id="@+id/text_title_status"
+        style="@style/UserDetails.TextView.Title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
+        android:text="@string/status"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_message" />
+
+    <TextView
+        android:id="@+id/text_description_status"
+        style="@style/UserDetails.TextView.Description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_title_status"
+        tools:text="Online" />
+
+    <TextView
+        android:id="@+id/text_title_timezone"
+        style="@style/UserDetails.TextView.Title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="@string/timezone"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_description_status" />
+
+    <TextView
+        android:id="@+id/text_description_timezone"
+        style="@style/UserDetails.TextView.Description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_title_timezone"
+        tools:text="(UTC-2) 11:08 AM" />
+
+    <com.wang.avi.AVLoadingIndicatorView
+        android:id="@+id/view_loading"
+        style="@style/Authentication.AVLoadingIndicatorView"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/group_user_details"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:constraint_referenced_ids="image_avatar, text_name, text_username, text_message, text_title_status, text_description_status, text_title_timezone, text_description_timezone" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 796aa664c9..0460d8e928 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -329,11 +329,9 @@
     <string name="read_by">Gelesen von</string>
     <string name="message_information_title">Nachricht Information</string>
     <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
+
     <!-- User Details -->
-    <string name="message">Botschaft</string>
     <string name="timezone">Zeitzone</string>
-    <string name="error_opening_dm">Etwas ist schiefgegangen, als wir dieses Gespräch erstellt haben…</string>
-    <string name="retry">Wiederholen</string>
 
     <!-- Report -->
     <string name="submit">einreichen</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index ee7c2b76e4..1691ea8b62 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -335,10 +335,7 @@
     <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string> <!--TODO - Add proper translation-->
 
     <!-- User Details -->
-    <string name="message">Message</string> <!-- TODO - Add proper translation -->
     <string name="timezone">Timezone</string> <!-- TODO - Add proper translation -->
-    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
-    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
 
     <!-- Report -->
     <string name="submit">Submit</string> <!--TODO - Add proper translation-->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 9e047cc769..f7d5f40487 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -338,10 +338,7 @@
     <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
 
     <!-- User Details -->
-    <string name="message">Message</string> <!-- TODO - Add proper translation -->
     <string name="timezone">Timezone</string> <!-- TODO - Add proper translation -->
-    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
-    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
 
     <!-- Report -->
     <string name="submit">Submit</string> <!-- TODO - Add proper translation -->
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 49dbfa40ee..a69b76fcf9 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -336,10 +336,7 @@
     <string name="message_room_changed_privacy">%2$s ने रूम का प्रकार बदलकर %1$s किया </string>
 
     <!-- User Details -->
-    <string name="message">संदेश</string>
     <string name="timezone">समय क्षेत्र</string>
-    <string name="error_opening_dm">जब हम इस बातचीत को बना रहे थे तो कुछ गड़बड़ हुई …</string>
-    <string name="retry">पुन: प्रयास करें</string>
 
     <!-- Report -->
     <string name="submit">जमा करें</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 6ed5e180d7..1f8205e1dc 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -331,10 +331,7 @@
     <string name="message_room_changed_privacy">Il tipo di stanza è cambiato in: %1$s da %2$s</string>
 
     <!-- User Details -->
-    <string name="message">Messaggio</string>
     <string name="timezone">Fuso Orario</string>
-    <string name="error_opening_dm">È successo qualcosa di sbagliato durante la creazione di questa conversazione...</string>
-    <string name="retry">Riprova</string>
 
     <!-- Report -->
     <string name="submit">Invia</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 45d3333f19..a02aafcfc0 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -339,10 +339,7 @@
     <string name="message_room_changed_privacy">ルームタイプを %2$s から %1$s に変更しました</string>
 
     <!-- User Details -->
-    <string name="message">Message</string> <!--TODO - Add proper translation-->
     <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
-    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
-    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
 
     <!-- Report -->
     <string name="submit">Submit</string> <!--TODO - Add proper translation-->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index de57e7bcb3..2239cbed07 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -336,10 +336,7 @@
     <string name="message_room_changed_privacy">O tipo da sala mudou para: %1$s por %2$s</string>
 
     <!-- User Details -->
-    <string name="message">Mensagem</string>
     <string name="timezone">Fuso horário</string>
-    <string name="error_opening_dm">Algo deu errado quando tentamos abrir esta conversa…</string>
-    <string name="retry">Retentar</string>
 
     <!-- Report -->
     <string name="submit">Enviar</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index aae058fe45..c046d6716d 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -333,10 +333,7 @@
     <string name="message_room_changed_privacy">Тип канала изменен на: %1$s пользователем %2$s</string>
 
     <!-- User Details -->
-    <string name="message">Сообщение</string>
     <string name="timezone">Часовой поясe</string>
-    <string name="error_opening_dm">При создании этого диалога что-то пошло не так...</string>
-    <string name="retry">Повторить</string>
 
     <!-- Report -->
     <string name="submit">Отправить</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 2a0a4aed48..1e983e6bfe 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -337,10 +337,7 @@
     <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string> <!--TODO - Add proper translation-->
 
     <!-- User Details -->
-    <string name="message">Message</string> <!--TODO - Add proper translation-->
     <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
-    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
-    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
 
     <!-- Report -->
     <string name="submit">Submit</string> <!--TODO - Add proper translation-->
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 19881aafe6..94d842c08c 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -335,10 +335,7 @@
     <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string> <!-- TODO - Add proper translation -->
 
     <!-- User Details -->
-    <string name="message">Message</string>
     <string name="timezone">Timezone</string>
-    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
-    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
 
     <!-- Report -->
     <string name="submit">Submit</string> <!-- TODO - Add proper translation -->
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 488fbface1..cf64225425 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -13,6 +13,8 @@
     <color name="colorTimestampText">#FF9DA2A9</color>
     <color name="colorTimestampTextUnread">#FF5699FF</color>
     <color name="colorLastMessageText">#99000000</color>
+    <color name="colorUserDetailsNameText">#FF0C0D0F</color>
+    <color name="colorUserDetailsUsernameText">#8B000000</color>
 
     <!-- User status colors -->
     <color name="colorUserStatusOnline">#2FE1A8</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ad457877fd..c6b3343b89 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -350,11 +350,8 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="foss" translatable="false">(FOSS)</string>
 
     <!-- User Details -->
-    <string name="message">Message</string>
     <string name="timezone">Timezone</string>
     <string name="status" translatable="false">Status</string>
-    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string>
-    <string name="retry">Retry</string>
 
     <!-- Report -->
     <string name="submit">Submit</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 240effa5e9..088a9129df 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -155,6 +155,43 @@
     </style>
     <!-- End chat list -->
 
+    <!-- User details -->
+    <style name="UserDetails.TextView.Name" parent="TextAppearance.AppCompat">
+        <item name="android:textSize">18sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">@color/colorUserDetailsNameText</item>
+    </style>
+
+    <style name="UserDetails.TextView.Username" parent="TextAppearance.AppCompat">
+        <item name="android:textSize">14sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textColor">@color/colorUserDetailsUsernameText</item>
+    </style>
+
+    <style name="UserDetails.TextView.Actions" parent="TextAppearance.AppCompat">
+        <item name="android:textSize">16sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textColor">@color/colorAccent</item>
+    </style>
+
+    <style name="UserDetails.TextView.Title" parent="TextAppearance.AppCompat">
+        <item name="android:textSize">12sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textColor">@color/colorAuthenticationSecondaryText</item>
+    </style>
+
+    <style name="UserDetails.TextView.Description" parent="TextAppearance.AppCompat">
+        <item name="android:textSize">16sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textColor">@color/colorPrimary</item>
+    </style>
+    <!-- End user details-->
+
     <style name="EditText.Password" parent="TextAppearance.AppCompat">
         <!-- Hint color and label color in FALSE state -->
         <item name="android:textColorHint">@color/colorPrimaryDark</item>

From a2f38889dbcafd90db2ada8077665e0a40866aa7 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Thu, 27 Dec 2018 17:16:30 -0300
Subject: [PATCH 132/149] Revert build.gradle

---
 app/build.gradle | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 726e982721..3eac882115 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -87,66 +87,84 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
+
     implementation project(':player')
     implementation project(':emoji')
     implementation project(':draw')
     implementation project(':util')
     implementation project(':core')
     implementation project(':suggestions')
+
     implementation libraries.kotlin
     implementation libraries.coroutines
     implementation libraries.coroutinesAndroid
+
     implementation libraries.appCompat
     implementation libraries.recyclerview
     implementation libraries.constraintlayout
     implementation libraries.cardview
     implementation libraries.browser
+
     implementation libraries.androidKtx
     implementation libraries.fragmentsKtx
+
     implementation libraries.dagger
     implementation libraries.daggerSupport
     kapt libraries.daggerProcessor
     kapt libraries.daggerAndroidApt
+
     implementation libraries.flexbox
     implementation libraries.material
+
     implementation libraries.room
     kapt libraries.roomProcessor
     implementation libraries.lifecycleExtensions
     kapt libraries.lifecycleCompiler
     implementation libraries.viewmodelKtx
     implementation libraries.workmanager
+
     implementation libraries.rxKotlin
     implementation libraries.rxAndroid
+
     implementation libraries.moshi
     implementation libraries.okhttp
     implementation libraries.okhttpLogger
+
     implementation libraries.timber
     implementation libraries.threeTenABP
+
     implementation libraries.fresco
     api libraries.frescoOkHttp
     implementation libraries.frescoAnimatedGif
     implementation libraries.frescoWebP
     implementation libraries.frescoAnimatedWebP
+
     implementation libraries.glide
+
     kapt libraries.kotshiCompiler
     implementation libraries.kotshiApi
+
     implementation libraries.frescoImageViewer
+
     implementation libraries.markwon
+
     implementation libraries.aVLoadingIndicatorView
+
     implementation libraries.livedataKtx
+
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
+
     // Proprietary libraries
     playImplementation libraries.fcm
     playImplementation libraries.firebaseAnalytics
     playImplementation libraries.playServicesAuth
     playImplementation('com.crashlytics.sdk.android:crashlytics:2.9.5@aar') { transitive = true }
     playImplementation('com.crashlytics.sdk.android:answers:1.4.3@aar') { transitive = true }
+
     testImplementation libraries.junit
     testImplementation libraries.truth
     androidTestImplementation libraries.espressoCore
     androidTestImplementation libraries.espressoIntents
-    implementation files('libs/common-54676f5.jar')
-    implementation files('libs/core-54676f5.jar')
 }
 
 kotlin {

From 46422e280c208ee18ac96a5f33e8f8464844790a Mon Sep 17 00:00:00 2001
From: Jan-NiklasB <44967908+Jan-NiklasB@users.noreply.github.com>
Date: Fri, 28 Dec 2018 01:31:15 +0100
Subject: [PATCH 133/149] Updated strings.xml

Added multiple german translations
---
 app/src/main/res/values-de/strings.xml | 79 +++++++++++++-------------
 1 file changed, 38 insertions(+), 41 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5ff7c7f495..526c8f710e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -13,14 +13,14 @@
     <string name="title_members">Benutzer</string>
     <string name="title_counted_members">Benutzer (%d)</string>
     <string name="title_settings">Einstellungen</string>
-    <string name="title_preferences">Preferences</string> <!-- TODO Add translation -->
+    <string name="title_preferences">Eigenschaften</string>
     <string name="title_change_password">Ändere Passwort</string>
-    <string name="title_admin_panel">Admin panel</string> <!-- TODO Add translation -->
+    <string name="title_admin_panel">Administration</string>
     <string name="title_password">Ändere Passwort</string>
     <string name="title_update_profile">Update Profil</string>
     <string name="title_about">Über</string>
     <string name="title_create_channel">Erstelle Raum</string>
-    <string name="title_confirmation">Are You Sure you want to logout?</string><!-- TODO Add translation -->
+    <string name="title_confirmation">Sind Sie sicher, dass Sie sich ausloggen möchten?</string>
 
     <!-- Actions -->
     <string name="action_connect">Verbinde</string>
@@ -33,7 +33,7 @@
     <string name="action_create_channel">Erstelle Raum</string>
     <string name="action_create">Erstelle</string>
     <string name="action_logout">Abmelden</string>
-    <string name="action_stay">Stay</string> <!-- TODO Add translation -->
+    <string name="action_stay">Angemeldet bleiben</string>
     <string name="action_files">Dateien</string>
     <string name="action_confirm_password">Bestätige Passwort Änderung</string>
     <string name="action_join_chat">Trete Chat bei</string>
@@ -44,18 +44,18 @@
     <string name="action_invisible">Unsichtbar</string>
     <string name="action_drawing">Zeichnung</string>
     <string name="action_save_to_gallery">Sichern in Gallerie</string>
-    <string name="action_select_photo_from_gallery">Select photo from gallery</string> <!-- TODO Add translation -->
-    <string name="action_take_photo">Select photo from gallery</string> <!-- TODO Add translation -->
-    <string name="action_reset_avatar">Reset avatar</string> <!-- TODO Add translation -->
-    <string name="action_connect_server">Connect with a server</string> <!-- TODO Add translation -->
-    <string name="action_join_community">Join in the community</string> <!-- TODO Add translation -->
-    <string name="action_create_server">Create a new server</string> <!-- TODO Add translation -->
-    <string name="action_register">Register</string> <!-- TODO Add translation -->
-    <string name="action_confirm">Confirm</string> <!-- TODO Add translation -->
+    <string name="action_select_photo_from_gallery">Wählen Sie ein Foto aus der Gallerie</string>
+    <string name="action_take_photo">Foto aufnehmen</string>
+    <string name="action_reset_avatar">Avatar zurücksetzten</string>
+    <string name="action_connect_server">Mit einem Server verbinden</string>
+    <string name="action_join_community">Der Community beitreten</string>
+    <string name="action_create_server">Einen eigenen Server erstellen</string>
+    <string name="action_register">Registrieren</string>
+    <string name="action_confirm">Bestätigen</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
-        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
+        <item name="item_preferences">Eigenschaften</item>
         <item name="item_password">Ändere Passwort</item>
         <item name="item_password">Über</item>
     </string-array>
@@ -67,8 +67,8 @@
     <string name="msg_username">Benutzername</string>
     <string name="msg_username_or_email">Benutzername oder E-Mail</string>
     <string name="msg_password">Passwort</string>
-    <string name="msg_name">Name</string> <!-- TODO Add translation -->
-    <string name="msg_email">EMail</string> <!-- TODO Add translation -->
+    <string name="msg_name">Name</string>
+    <string name="msg_email">EMail</string>
     <string name="msg_avatar_url">Avatar URL</string>
     <string name="msg_or_continue_using_social_accounts">Oder weiter mit einem Social Account</string>
     <string name="msg_new_user">Neuer Benutzer? %1$s</string>
@@ -93,7 +93,7 @@
     <string name="msg_content_description_log_in_using_gitlab">Login mit Gitlab</string>
     <string name="msg_content_description_log_in_using_wordpress">Login mit WordPress</string>
     <string name="msg_content_description_send_message">Sende Nachricht</string>
-    <string name="msg_content_description_show_more_login_options">Show more login options</string> <!-- TODO Translate-->
+    <string name="msg_content_description_show_more_login_options">Zeige mehr Login-Optionen</string>
     <string name="msg_content_description_show_attachment_options">Zeige Anhang Optionen</string>
     <string name="msg_you">Du</string>
     <string name="msg_unknown">Unbekannt</string>
@@ -132,18 +132,18 @@
     <string name="msg_file_description">Datei Beschreibung</string>
     <string name="msg_send">Sende</string>
     <string name="msg_sent_attachment">Sende Anhang</string>
-    <string name="msg_welcome_to_rocket_chat">Welcome to Rocket.Chat</string> <!-- TODO Add translation -->
-    <string name="msg_team_communication">Open Source Communication</string> <!-- TODO Add translation -->
-    <string name="msg_login_with_email">Login with <b>e-mail</b></string> <!-- TODO Add translation -->
-    <string name="msg_create_account">Create an account</string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_facebook">Continue with <b>Facebook</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_github">Continue with <b>Github</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_google">Continue with <b>Google</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_linkedin">Continue with <b>Linkedin</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_gitlab">Continue with <b>GitLab</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_wordpress">Continue with <b>WordPress</b></string> <!-- TODO Add translation -->
-    <string name="msg_two_factor_authentication">Two-factor Authentication</string> <!-- TODO Add translation -->
-    <string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
+    <string name="msg_welcome_to_rocket_chat">Wilkommen bei Rocket.Chat</string>
+    <string name="msg_team_communication">Open Source Kommunikation</string>
+    <string name="msg_login_with_email">Mit <b>e-mail</b> einloggen</string>
+    <string name="msg_create_account">Einen Account erstellen</string>
+    <string name="msg_continue_with_facebook">Mit <b>Facebook</b> einloggen</string>
+    <string name="msg_continue_with_github">Mit <b>Github</b> einloggen</string>
+    <string name="msg_continue_with_google">Mit <b>Google</b> einloggen</string>
+    <string name="msg_continue_with_linkedin">Mit <b>Linkedin</b> einloggen</string>
+    <string name="msg_continue_with_gitlab">Mit <b>GitLab</b> einloggen</string>
+    <string name="msg_continue_with_wordpress">Mit <b>WordPress</b> einloggen</string>
+    <string name="msg_two_factor_authentication">Zwei-Faktor-Authentifizierung</string>
+    <string name="msg__your_2fa_code">Was ist Ihr F2A Code?</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Privat</string>
@@ -159,18 +159,15 @@
     <string name="msg_message_copied">Nachricht kopiert</string>
     <string name="msg_delete_message">Lösche Nachricht</string>
     <string name="msg_delete_description">Sind Sie sicher, dass Sie diese Nachricht löschen wollen?</string>
-    <!-- TODO - Add proper translation -->
-    <string name="msg_view_more">view more</string>
-    <!-- TODO - Add proper translation -->
-    <string name="msg_view_less">view less</string>
-    <!-- TODO - Add proper translation -->
-    <string name="msg_permalink_copied">Permalink copied</string>
+    <string name="msg_view_more">Zeige mehr</string>
+    <string name="msg_view_less">Zeige weniger</string>
+    <string name="msg_permalink_copied">Permanenter Link kopiert</string>
 
     <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">Analytics tracking</string> <!-- TODO Add translation -->
-    <string name="msg_send_analytics_tracking">Send anonymous statics to help improving this app</string> <!-- TODO Add translation -->
-    <string name="msg_do_not_send_analytics_tracking">Do not send anonymous statics to help improving this app</string> <!-- TODO Add translation -->
-    <string name="msg_not_applicable_since_it_is_a_foss_version">Not applicable since it is a FOSS version</string> <!-- TODO Add translation -->
+    <string name="msg_analytics_tracking">Google Analytics verfolgung</string>
+    <string name="msg_send_analytics_tracking">Anonyme Statistiken senden um diese App weiter zu verbessern</string>
+    <string name="msg_do_not_send_analytics_tracking">KEINE anonymen Statistiken senden um diese App weiter zu verbessern</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">Nicht anwendbar, da es sich um eine FOSS version handelt</string>
 
     <!-- System messages -->
     <string name="message_room_name_changed">Raum Namen geändert zu: %1$s von %2$s</string>
@@ -290,7 +287,7 @@
     <string name="dialog_sort_by_activity">Aktivität</string>
     <string name="dialog_group_by_type">Räume nach Typ</string>
     <string name="dialog_group_favourites">Räume nach Favoriten</string>
-    <string name="dialog_button_done">Done</string><!-- TODO Add translation -->
+    <string name="dialog_button_done">Fertig</string>
     <string name="chatroom_header">Kopf</string>
 
     <!--ChatRooms Headers-->
@@ -307,5 +304,5 @@
     <string name="notif_success_sending">Nachricht gesendet nach %1$s!</string>
     <string name="read_by">Gelesen von</string>
     <string name="message_information_title">Nachricht Information</string>
-    <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>     <!--TODO - Add proper translation-->
-</resources>
\ No newline at end of file
+    <string name="message_room_changed_privacy">Raumtyp geändert zu: %1$s durch %2$s</string>
+</resources>

From c878c7332f2c7ff8b51802249a2ff7634d5debfa Mon Sep 17 00:00:00 2001
From: Govind Dixit <32304546+GOVINDDIXIT@users.noreply.github.com>
Date: Fri, 28 Dec 2018 21:40:49 +0530
Subject: [PATCH 134/149] update strings

---
 app/src/main/res/values-it/strings.xml     | 10 ++---
 app/src/main/res/values-ja/strings.xml     | 48 +++++++++++-----------
 app/src/main/res/values-ru-rRU/strings.xml |  2 +-
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index a1d33a71eb..435a5fc32c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -64,7 +64,7 @@
     <string-array name="settings_actions">
         <item name="item_preferences">Preferenze</item>
         <item name="item_password">Cambia password</item>
-        <item name="change_language">Cambia lingua</item>
+        <item name="change_language">Change Language</item><!-- TODO Add translation -->
         <item name="item_share_app">Condividi app</item>
         <item name="item_rate_us">Votaci</item>
         <item name="item_contact_us">Contattaci</item>
@@ -147,7 +147,7 @@
     <string name="msg_send">Inviare</string>
     <string name="msg_sent_attachment">Inviato allegato</string>
     <string name="msg_welcome_to_rocket_chat">Benvenuto in Rocket.Chat </string>
-    <string name="msg_team_communication">Comunicazione del team</string>
+    <string name="msg_team_communication">Comunicazione dei Gruppi</string>
     <string name="msg_login_with_email">Accedi con <b>e-mail</b></string>
     <string name="msg_create_account">Crea un utente</string>
     <string name="msg_continue_with_facebook">Continua con <b>Facebook</b></string>
@@ -164,8 +164,8 @@
     <string name="msg_no_description">Nessuna descrizione aggiunta</string>
     <string name="msg_send_email">Invia una email</string>
     <string name="msg_android_app_support">Supporto per le app Android</string>
-    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
-    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
+    <string name="msg_unable_to_update_password">Impossibile aggiornare la password. Messaggio di errore: %1$s</string>
+    <string name="msg_password_updated_successfully">Password aggiornata con successo</string>
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s ha reagito con %2$s</item>
         <item quantity="other">%1$s ha reagito con %2$s</item>
@@ -341,4 +341,4 @@
     <string name="submit">Invia</string>
     <string name="required">*necessario</string>
     <string name="report_sent">Il tuo resoconto è stato inviato!</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 125565388a..ffe09229ab 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -22,11 +22,11 @@
     <string name="title_admin_panel">管理パネル</string>
     <string name="title_password">パスワードの変更</string>
     <string name="title_update_profile">プロフィールの更新</string>
-    <string name="title_about">約</string>
-    <string name="title_licence">ライセンス</string>
+    <string name="title_about">About</string><!-- TODO Add translation -->
+    <string name="title_licence">Licence</string> <!-- TODO Add translation -->
     <string name="title_create_channel">新しいチャネルを作成</string>
     <string name="title_are_you_sure">本気ですか？</string>
-    <string name="title_channel_details">チャンネルの詳細</string>
+    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
     <string name="title_topic">トピック</string>
     <string name="title_announcement">発表</string>
     <string name="title_description">説明</string>
@@ -64,14 +64,14 @@
 
     <!-- Settings List -->
     <string-array name="settings_actions">
-        <item name="item_preferences">設定</item>
-        <item name="item_password">パスワードを変更する</item>
-        <item name="change_language">言語を変えてください</item>
-        <item name="item_share_app">アプリを共有する</item>
-        <item name="item_rate_us">私たちを評価してください</item>
-        <item name="item_contact_us">お問い合わせ</item>
-        <item name="item_licence">ライセンス</item>
-        <item name="item_about">約</item>
+        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
+        <item name="item_password">Change password</item> <!-- TODO Add translation -->
+        <item name="change_language">Change Language </item><!-- TODO Add translation -->
+        <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
+        <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
+        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
+        <item name="item_licence">Licence</item> <!-- TODO Add translation -->
+        <item name="item_about">About</item> <!-- TODO Add translation -->
     </string-array>
 
     <!-- Regular information messages -->
@@ -166,9 +166,9 @@
     <string name="msg_view_more">更に表示</string>
     <string name="msg_view_less">隠す</string>
     <string name="msg_muted_on_this_channel">あなたはこのチャンネルでミュートされています</string>
-    <string name="msg_no_topic">トピックが追加されていない</string>
-    <string name="msg_no_announcement">お知らせが追加されていません</string>
-    <string name="msg_no_description">説明が追加されていない</string>
+    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
+    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
+    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
     <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
     <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
@@ -191,8 +191,8 @@
     <string name="msg_delete_message">メッセージを削除</string>
     <string name="msg_delete_description">このメッセージを削除してもよろしいですか?</string>
     <string name="msg_permalink_copied">パーマリンクのコピー</string>
-    <string name="msg_send_email">メールを送る</string>
-    <string name="msg_android_app_support">Androidアプリのサポート</string>
+    <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
+    <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
 
     <!-- Preferences messages -->
     <string name="msg_analytics_tracking">トラッキングの分析</string>
@@ -340,13 +340,13 @@
     <string name="message_room_changed_privacy">ルームタイプを %2$s から %1$s に変更しました</string>
 
     <!-- User Details -->
-    <string name="message">メッセージ</string>
-    <string name="timezone">タイムゾーン</string>
-    <string name="error_opening_dm">この会話を作成しているうちに何か問題が発生しました…</string>
-    <string name="retry">リトライ</string>
+    <string name="message">Message</string> <!--TODO - Add proper translation-->
+    <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
+    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
+    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
 
     <!-- Report -->
-    <string name="submit">提出する</string>
-    <string name="required">*必須</string>
-    <string name="report_sent">あなたのレポートが送信されました！</string>
-</resources>
+    <string name="submit">Submit</string> <!--TODO - Add proper translation-->
+    <string name="required">*required</string> <!--TODO - Add proper translation-->
+    <string name="report_sent">Your report has been sent!</string> <!--TODO - Add proper translation-->
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 487867e478..99418c4691 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -64,7 +64,7 @@
     <string-array name="settings_actions">
         <item name="item_preferences">Персональные</item>
         <item name="item_password">Изменить пароль</item>
-        <item name="change_language">Изменить язык</item>
+        <item name="change_language">Change Language </item><!-- TODO Add translation -->
         <item name="item_share_app">Поделиться приложением</item>
         <item name="item_rate_us">Оцените нас</item>
         <item name="item_contact_us">Связаться с нами</item>

From 5b8f49e98e749244192703394dfedd6b3a12a2a3 Mon Sep 17 00:00:00 2001
From: Vitor <droider.pc@gmail.com>
Date: Fri, 28 Dec 2018 17:23:55 +0100
Subject: [PATCH 135/149] Update strings.xml

Hope this makes morer sense in the way the sentences are built
---
 app/src/main/res/values-pt-rBR/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index ba6c510472..5ae981e83a 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -208,7 +208,7 @@
     <string name="message_pinned">Fixou uma mensagem:</string>
     <string name="message_muted">Usuário %1$s foi silenciado por %2$s</string>
     <string name="message_unmuted">Usuário %1$s saiu do modo silenciado por %2$s</string>
-    <string name="message_role_add">%3$s colocou o estatuto de %2$s a %1$s</string>
+    <string name="message_role_add">%3$s deu estatuto de %2$s a %1$s</string>
     <string name="message_role_removed">%3$s removeu o estatuto de %2$s de %1$s</string>
     <string name="message_credentials_saved_successfully">Credenciais salvas com sucesso</string>
 

From 4262cf4f9fbb3c0fbbbeae4823b67255620df535 Mon Sep 17 00:00:00 2001
From: Vitor <droider.pc@gmail.com>
Date: Fri, 28 Dec 2018 17:37:32 +0100
Subject: [PATCH 136/149] Update strings.xml

Fixed typo -_-
---
 app/src/main/res/values-pt-rBR/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 5ae981e83a..d6c60f89a7 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -256,7 +256,7 @@
     <string name="no_pinned_description">Todas as mensagens fixadas\naparecerão aqui</string>
 
     <!-- Favorite Messages -->
-    <string name="title_favorite_messages">Messagens Favoritas</string>
+    <string name="title_favorite_messages">Mensagens Favoritas</string>
     <string name="no_favorite_messages">Nenhuma messagem favorita</string>
     <string name="no_favorite_description">Todas mensagens favoritas\naparecerão aqui</string>
 

From 9334bcb0ad7ff839c951bbe907f49add15283773 Mon Sep 17 00:00:00 2001
From: Vitor <droider.pc@gmail.com>
Date: Fri, 28 Dec 2018 17:40:45 +0100
Subject: [PATCH 137/149] Update strings.xml

I really need to slow down and read things twice -_-
---
 app/src/main/res/values-pt-rBR/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index d6c60f89a7..08cc2a3c48 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -257,7 +257,7 @@
 
     <!-- Favorite Messages -->
     <string name="title_favorite_messages">Mensagens Favoritas</string>
-    <string name="no_favorite_messages">Nenhuma messagem favorita</string>
+    <string name="no_favorite_messages">Nenhuma mensagem favorita</string>
     <string name="no_favorite_description">Todas mensagens favoritas\naparecerão aqui</string>
 
     <!-- Files -->

From f015f0d427cf6b64be6807bb27677f0807b1e306 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Fri, 28 Dec 2018 15:08:36 -0300
Subject: [PATCH 138/149] Changes the user detais UI.

---
 app/build.gradle                              |   1 +
 .../userdetails/ui/UserDetailsFragment.kt     |  22 +-
 .../bg_border_user_details_avatar.xml         |  14 ++
 .../res/drawable/bg_round_bounds_white.xml    |  14 --
 .../main/res/layout/fragment_user_details.xml | 217 ++++++++++--------
 dependencies.gradle                           |   2 +
 6 files changed, 160 insertions(+), 110 deletions(-)
 create mode 100644 app/src/main/res/drawable/bg_border_user_details_avatar.xml
 delete mode 100644 app/src/main/res/drawable/bg_round_bounds_white.xml

diff --git a/app/build.gradle b/app/build.gradle
index 3eac882115..ddad12e80e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -140,6 +140,7 @@ dependencies {
     implementation libraries.frescoAnimatedWebP
 
     implementation libraries.glide
+    implementation libraries.glideTransformations
 
     kapt libraries.kotshiCompiler
     implementation libraries.kotshiApi
diff --git a/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsFragment.kt b/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsFragment.kt
index fe75775a0e..018dcadf9b 100644
--- a/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsFragment.kt
@@ -10,6 +10,7 @@ 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.emoji.internal.GlideApp
 import chat.rocket.android.userdetails.presentation.UserDetailsPresenter
 import chat.rocket.android.userdetails.presentation.UserDetailsView
 import chat.rocket.android.util.extensions.inflate
@@ -17,7 +18,12 @@ import chat.rocket.android.util.extensions.setLightStatusBar
 import chat.rocket.android.util.extensions.showToast
 import chat.rocket.android.util.extensions.ui
 import com.bumptech.glide.Glide
+import com.bumptech.glide.load.MultiTransformation
+import com.bumptech.glide.load.resource.bitmap.CenterCrop
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners
+import com.bumptech.glide.request.RequestOptions
 import dagger.android.support.AndroidSupportInjection
+import jp.wasabeef.glide.transformations.BlurTransformation
 import kotlinx.android.synthetic.main.app_bar_chat_room.*
 import kotlinx.android.synthetic.main.fragment_user_details.*
 import javax.inject.Inject
@@ -62,6 +68,7 @@ class UserDetailsFragment : Fragment(), UserDetailsView {
         super.onViewCreated(view, savedInstanceState)
 
         setupToolbar()
+        setupListeners()
         presenter.loadUserDetails(userId)
 
         analyticsManager.logScreenView(ScreenViewEvent.UserDetails)
@@ -74,14 +81,17 @@ class UserDetailsFragment : Fragment(), UserDetailsView {
         status: String,
         utcOffset: String
     ) {
-        Glide.with(this)
-            .asBitmap()
-            .load(avatarUrl)
+        val requestBuilder = Glide.with(this).load(avatarUrl)
+
+        requestBuilder.apply(RequestOptions.bitmapTransform(MultiTransformation(BlurTransformation(), CenterCrop())))
+            .into(image_blur)
+
+        requestBuilder.apply(RequestOptions.bitmapTransform(RoundedCorners(14)))
             .into(image_avatar)
 
         text_name.text = name
         text_username.text = username
-        text_description_status.text = status
+        text_description_status.text = status.substring(0, 1).toUpperCase() + status.substring(1)
         text_description_timezone.text = utcOffset
 
         // We should also setup the user details listeners.
@@ -114,4 +124,8 @@ class UserDetailsFragment : Fragment(), UserDetailsView {
             toolbar.isVisible = false
         }
     }
+
+    private fun setupListeners() {
+        image_arrow_back.setOnClickListener { activity?.onBackPressed() }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_border_user_details_avatar.xml b/app/src/main/res/drawable/bg_border_user_details_avatar.xml
new file mode 100644
index 0000000000..21468e90e4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_border_user_details_avatar.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <padding
+        android:bottom="3dp"
+        android:left="3dp"
+        android:right="3dp"
+        android:top="3dp" />
+
+    <solid android:color="@color/color_white" />
+
+    <corners android:radius="6dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_round_bounds_white.xml b/app/src/main/res/drawable/bg_round_bounds_white.xml
deleted file mode 100644
index ceddaa4a68..0000000000
--- a/app/src/main/res/drawable/bg_round_bounds_white.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <padding
-        android:bottom="2dp"
-        android:left="2dp"
-        android:right="2dp"
-        android:top="2dp" />
-
-    <solid android:color="@android:color/white" />
-
-    <corners android:radius="25px" />
-</shape>
diff --git a/app/src/main/res/layout/fragment_user_details.xml b/app/src/main/res/layout/fragment_user_details.xml
index efafa05401..c19fe83a4b 100644
--- a/app/src/main/res/layout/fragment_user_details.xml
+++ b/app/src/main/res/layout/fragment_user_details.xml
@@ -1,106 +1,139 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@android:color/white"
-    android:padding="@dimen/screen_edge_left_and_right_margins">
+    android:layout_height="match_parent">
 
-    <ImageView
-        android:id="@+id/image_avatar"
-        android:layout_width="98dp"
-        android:layout_height="98dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:srcCompat="@tools:sample/avatars[6]" />
-
-    <TextView
-        android:id="@+id/text_name"
-        style="@style/UserDetails.TextView.Name"
-        android:layout_width="wrap_content"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/image_avatar"
-        tools:text="Karem Flusser" />
+        android:background="@android:color/white">
 
-    <TextView
-        android:id="@+id/text_username"
-        style="@style/UserDetails.TextView.Username"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_name"
-        tools:text="karem.flusser" />
+        <ImageView
+            android:id="@+id/image_blur"
+            android:layout_width="match_parent"
+            android:layout_height="120dp" />
 
-    <TextView
-        android:id="@+id/text_message"
-        style="@style/UserDetails.TextView.Actions"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:drawableTop="@drawable/ic_message_24dp"
-        android:text="@string/msg_message"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_username" />
+        <ImageView
+            android:id="@+id/image_arrow_back"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_margin="@dimen/screen_edge_left_and_right_margins"
+            android:src="@drawable/ic_arrow_back_white_24dp"
+            android:tint="@color/color_black"
+            app:layout_constraintStart_toStartOf="@+id/image_blur"
+            app:layout_constraintTop_toTopOf="@+id/image_blur" />
 
-    <TextView
-        android:id="@+id/text_title_status"
-        style="@style/UserDetails.TextView.Title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="32dp"
-        android:text="@string/status"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_message" />
+        <ImageView
+            android:id="@+id/image_avatar"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:background="@drawable/bg_border_user_details_avatar"
+            app:layout_constraintBottom_toBottomOf="@+id/image_blur"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/image_blur"
+            tools:srcCompat="@tools:sample/avatars[6]" />
 
-    <TextView
-        android:id="@+id/text_description_status"
-        style="@style/UserDetails.TextView.Description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_title_status"
-        tools:text="Online" />
+        <TextView
+            android:id="@+id/text_name"
+            style="@style/UserDetails.TextView.Name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/image_avatar"
+            tools:text="Karem Flusser" />
 
-    <TextView
-        android:id="@+id/text_title_timezone"
-        style="@style/UserDetails.TextView.Title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:text="@string/timezone"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_description_status" />
+        <TextView
+            android:id="@+id/text_username"
+            style="@style/UserDetails.TextView.Username"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/text_name"
+            tools:text="karem.flusser" />
 
-    <TextView
-        android:id="@+id/text_description_timezone"
-        style="@style/UserDetails.TextView.Description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_title_timezone"
-        tools:text="(UTC-2) 11:08 AM" />
+        <TextView
+            android:id="@+id/text_message"
+            style="@style/UserDetails.TextView.Actions"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:drawableTop="@drawable/ic_message_24dp"
+            android:text="@string/msg_message"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/text_username" />
 
-    <com.wang.avi.AVLoadingIndicatorView
-        android:id="@+id/view_loading"
-        style="@style/Authentication.AVLoadingIndicatorView"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
+        <TextView
+            android:id="@+id/text_title_status"
+            style="@style/UserDetails.TextView.Title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/screen_edge_left_and_right_margins"
+            android:layout_marginTop="20dp"
+            android:text="@string/status"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/text_message" />
 
-    <androidx.constraintlayout.widget.Group
-        android:id="@+id/group_user_details"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:constraint_referenced_ids="image_avatar, text_name, text_username, text_message, text_title_status, text_description_status, text_title_timezone, text_description_timezone" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+        <TextView
+            android:id="@+id/text_description_status"
+            style="@style/UserDetails.TextView.Description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/screen_edge_left_and_right_margins"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/text_title_status"
+            tools:text="Online" />
+
+        <TextView
+            android:id="@+id/text_title_timezone"
+            style="@style/UserDetails.TextView.Title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/screen_edge_left_and_right_margins"
+            android:layout_marginTop="16dp"
+            android:text="@string/timezone"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/text_description_status" />
+
+        <TextView
+            android:id="@+id/text_description_timezone"
+            style="@style/UserDetails.TextView.Description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/screen_edge_left_and_right_margins"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/text_title_timezone"
+            tools:text="(UTC-2) 11:08 AM" />
+
+        <View
+            android:id="@+id/view_gray_bottom"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginTop="16dp"
+            android:background="#FFF3f4f5"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/text_description_timezone" />
+
+        <com.wang.avi.AVLoadingIndicatorView
+            android:id="@+id/view_loading"
+            style="@style/Authentication.AVLoadingIndicatorView"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/group_user_details"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:constraint_referenced_ids="image_blur, image_avatar, text_name, text_username, text_message, text_title_status, text_description_status, text_title_timezone, text_description_timezone, view_gray_bottom" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
diff --git a/dependencies.gradle b/dependencies.gradle
index 986725301e..1c58f7bb33 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -51,6 +51,7 @@ ext {
             markwon               : '2.0.0',
             aVLoadingIndicatorView: '2.1.3',
             glide                 : '4.8.0',
+            glideTransformations  : '4.0.0',
 
             // For wearable
             wear                  : '2.3.0',
@@ -118,6 +119,7 @@ ext {
             frescoImageViewer     : "com.github.luciofm:FrescoImageViewer:${versions.frescoImageViewer}",
             glide                 : "com.github.bumptech.glide:glide:${versions.glide}",
             glideProcessor        : "com.github.bumptech.glide:compiler:${versions.glide}",
+            glideTransformations  : "jp.wasabeef:glide-transformations:${versions.glideTransformations}",
 
             markwon               : "ru.noties:markwon:${versions.markwon}",
 

From 62692954934f8f99b270c731bda76dbd2d1a5756 Mon Sep 17 00:00:00 2001
From: Jan-NiklasB <44967908+Jan-NiklasB@users.noreply.github.com>
Date: Fri, 28 Dec 2018 20:47:57 +0100
Subject: [PATCH 139/149] =?UTF-8?q?Changed=20"Analyse=20verfolgung"=20to?=
 =?UTF-8?q?=20"Daten=20f=C3=BCr=20Analysezwecke"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 526c8f710e..1d377d19e2 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -164,7 +164,7 @@
     <string name="msg_permalink_copied">Permanenter Link kopiert</string>
 
     <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">Google Analytics verfolgung</string>
+    <string name="msg_analytics_tracking">Daten für Analysezwecke</string>
     <string name="msg_send_analytics_tracking">Anonyme Statistiken senden um diese App weiter zu verbessern</string>
     <string name="msg_do_not_send_analytics_tracking">KEINE anonymen Statistiken senden um diese App weiter zu verbessern</string>
     <string name="msg_not_applicable_since_it_is_a_foss_version">Nicht anwendbar, da es sich um eine FOSS version handelt</string>

From a8e9bbda8a0e216fa4a43569294e99342569b05a Mon Sep 17 00:00:00 2001
From: Pitstopper <18574776+Pitstopper@users.noreply.github.com>
Date: Sat, 29 Dec 2018 00:48:33 +0300
Subject: [PATCH 140/149] Update strings.xml

---
 app/src/main/res/values-ru-rRU/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 99418c4691..487867e478 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -64,7 +64,7 @@
     <string-array name="settings_actions">
         <item name="item_preferences">Персональные</item>
         <item name="item_password">Изменить пароль</item>
-        <item name="change_language">Change Language </item><!-- TODO Add translation -->
+        <item name="change_language">Изменить язык</item>
         <item name="item_share_app">Поделиться приложением</item>
         <item name="item_rate_us">Оцените нас</item>
         <item name="item_contact_us">Связаться с нами</item>

From b8ee33a4b7a169a84468f0fbe3d6d1f761a344ee Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Mon, 31 Dec 2018 12:04:28 -0300
Subject: [PATCH 141/149] Open user details view from member list

- Removes ChatDetailsActivity - using fragment instead;
- more refactor.
---
 app/src/main/AndroidManifest.xml              |   5 -
 .../analytics/event/ScreenViewEvent.kt        |   1 -
 .../di/ChatDetailsFragmentModule.kt           |  19 ----
 .../chatdetails/di/ChatDetailsModule.kt       |  15 ---
 .../presentation/ChatDetailsNavigator.kt      |  43 --------
 .../presentation/ChatDetailsPresenter.kt      |  12 ++-
 .../chatdetails/ui/ChatDetailsActivity.kt     |  85 ---------------
 .../chatdetails/ui/ChatDetailsFragment.kt     |  52 +++++----
 .../presentation/ChatRoomNavigator.kt         |  52 +++++++--
 .../chat/rocket/android/chatroom/ui/Menu.kt   |   2 +-
 .../android/dagger/module/ActivityBuilder.kt  |  14 +--
 .../di/FavoriteMessagesFragmentModule.kt      |  23 ----
 .../ui/FavoriteMessagesFragment.kt            |   6 +-
 .../android/files/di/FilesFragmentModule.kt   |  19 ----
 .../rocket/android/files/ui/FilesFragment.kt  |  12 ++-
 .../members/di/MembersFragmentModule.kt       |  25 -----
 .../members/di/MembersFragmentProvider.kt     |   8 +-
 .../members/presentation/MembersNavigator.kt  |  16 ---
 .../members/presentation/MembersPresenter.kt  |   4 +-
 .../members/ui/MemberBottomSheetFragment.kt   | 102 ------------------
 .../android/members/ui/MembersFragment.kt     |  27 +++--
 .../mentions/di/MentionsFragmentModule.kt     |  19 ----
 .../android/mentions/ui/MentionsFragment.kt   |   7 +-
 .../di/PinnedMessagesFragmentModule.kt        |  19 ----
 .../ui/PinnedMessagesFragment.kt              |   7 +-
 .../di/UserDetailsFragmentModule.kt           |   7 +-
 .../main/res/layout/activity_chat_details.xml |  15 ---
 .../layout/fragment_member_bottom_sheet.xml   |  92 ----------------
 28 files changed, 124 insertions(+), 584 deletions(-)
 delete mode 100644 app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsModule.kt
 delete mode 100644 app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsNavigator.kt
 delete mode 100644 app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsActivity.kt
 delete mode 100644 app/src/main/java/chat/rocket/android/members/presentation/MembersNavigator.kt
 delete mode 100644 app/src/main/java/chat/rocket/android/members/ui/MemberBottomSheetFragment.kt
 delete mode 100644 app/src/main/res/layout/activity_chat_details.xml
 delete mode 100644 app/src/main/res/layout/fragment_member_bottom_sheet.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 250fd8387a..f4c022101a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -78,11 +78,6 @@
             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"
diff --git a/app/src/main/java/chat/rocket/android/analytics/event/ScreenViewEvent.kt b/app/src/main/java/chat/rocket/android/analytics/event/ScreenViewEvent.kt
index 3c8c0195b7..b96de69855 100644
--- a/app/src/main/java/chat/rocket/android/analytics/event/ScreenViewEvent.kt
+++ b/app/src/main/java/chat/rocket/android/analytics/event/ScreenViewEvent.kt
@@ -19,7 +19,6 @@ sealed class ScreenViewEvent(val screenName: String) {
     object UserDetails : ScreenViewEvent("UserDetailsFragment")
     object FavoriteMessages : ScreenViewEvent("FavoriteMessagesFragment")
     object Files : ScreenViewEvent("FilesFragment")
-    object MemberBottomSheet : ScreenViewEvent("MemberBottomSheetFragment")
     object Members : ScreenViewEvent("MembersFragment")
     object Mentions : ScreenViewEvent("MentionsFragment")
     object MessageInfo : ScreenViewEvent("MessageInfoFragment")
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentModule.kt b/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentModule.kt
index 5b2ddd0ec4..52a46106aa 100644
--- a/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentModule.kt
+++ b/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentModule.kt
@@ -1,23 +1,16 @@
 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 {
@@ -27,16 +20,4 @@ class ChatDetailsFragmentModule {
     @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
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsModule.kt b/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsModule.kt
deleted file mode 100644
index 4c977a5eee..0000000000
--- a/app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsModule.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-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
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsNavigator.kt b/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsNavigator.kt
deleted file mode 100644
index 36ffb2316f..0000000000
--- a/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsNavigator.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-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)
-        }
-    }
-}
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsPresenter.kt b/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsPresenter.kt
index 5a1518b10f..eb4032d5ba 100644
--- a/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsPresenter.kt
@@ -1,6 +1,7 @@
 package chat.rocket.android.chatdetails.presentation
 
 import chat.rocket.android.chatdetails.domain.ChatDetails
+import chat.rocket.android.chatroom.presentation.ChatRoomNavigator
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
@@ -10,11 +11,12 @@ import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.util.ifNull
 import chat.rocket.core.internal.rest.getInfo
 import chat.rocket.core.model.Room
+import timber.log.Timber
 import javax.inject.Inject
 
 class ChatDetailsPresenter @Inject constructor(
     private val view: ChatDetailsView,
-    private val navigator: ChatDetailsNavigator,
+    private val navigator: ChatRoomNavigator,
     private val strategy: CancelStrategy,
     serverInteractor: GetCurrentServerInteractor,
     factory: ConnectionManagerFactory
@@ -29,11 +31,11 @@ class ChatDetailsPresenter @Inject constructor(
                 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!!)
+            } catch(exception: Exception) {
+                Timber.e(exception)
+                exception.message?.let {
+                    view.showMessage(it)
                 }.ifNull {
                     view.showGenericErrorMessage()
                 }
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsActivity.kt b/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsActivity.kt
deleted file mode 100644
index f2cc66d5c2..0000000000
--- a/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsActivity.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-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
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt b/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt
index 43ffd17da9..1c792c1cfa 100644
--- a/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt
@@ -1,5 +1,6 @@
 package chat.rocket.android.chatdetails.ui
 
+import DrawableHelper
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,6 +16,7 @@ import chat.rocket.android.chatdetails.presentation.ChatDetailsPresenter
 import chat.rocket.android.chatdetails.presentation.ChatDetailsView
 import chat.rocket.android.chatdetails.viewmodel.ChatDetailsViewModel
 import chat.rocket.android.chatdetails.viewmodel.ChatDetailsViewModelFactory
+import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.showToast
 import chat.rocket.android.util.extensions.ui
@@ -32,7 +34,7 @@ fun newInstance(
     disableMenu: Boolean
 ): ChatDetailsFragment {
     return ChatDetailsFragment().apply {
-        arguments = Bundle(1).apply {
+        arguments = Bundle(4).apply {
             putString(BUNDLE_CHAT_ROOM_ID, chatRoomId)
             putString(BUNDLE_CHAT_ROOM_TYPE, chatRoomType)
             putBoolean(BUNDLE_IS_SUBSCRIBED, isSubscribed)
@@ -48,14 +50,12 @@ 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 {
+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
@@ -72,13 +72,15 @@ class ChatDetailsFragment: Fragment(), ChatDetailsView {
             chatRoomType = bundle.getString(BUNDLE_CHAT_ROOM_TYPE)
             isSubscribed = bundle.getBoolean(BUNDLE_IS_SUBSCRIBED)
             disableMenu = bundle.getBoolean(BUNDLE_DISABLE_MENU)
+        } else {
+            requireNotNull(bundle) { "no arguments supplied when the fragment was instantiated" }
         }
     }
 
     override fun onCreateView(
-            inflater: LayoutInflater,
-            container: ViewGroup?,
-            savedInstanceState: Bundle?
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
     ): View? = container?.inflate(R.layout.fragment_chat_details)
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -94,9 +96,12 @@ class ChatDetailsFragment: Fragment(), ChatDetailsView {
             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
+            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
         }
     }
 
@@ -126,15 +131,24 @@ class ChatDetailsFragment: Fragment(), ChatDetailsView {
                 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) {
+                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) {
+            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) {
+            it.addOption(
+                getString(R.string.title_pinned_messages),
+                R.drawable.ic_action_message_pin_24dp
+            ) {
                 presenter.toPinned(chatRoomId!!)
             }
         }
@@ -178,9 +192,9 @@ class ChatDetailsFragment: Fragment(), ChatDetailsView {
                     layoutManager = LinearLayoutManager(it)
                     addItemDecoration(
                         DividerItemDecoration(
-                                it,
-                                resources.getDimensionPixelSize(R.dimen.divider_item_decorator_bound_start),
-                                resources.getDimensionPixelSize(R.dimen.divider_item_decorator_bound_end)
+                            it,
+                            resources.getDimensionPixelSize(R.dimen.divider_item_decorator_bound_start),
+                            resources.getDimensionPixelSize(R.dimen.divider_item_decorator_bound_end)
                         )
                     )
                     itemAnimator = DefaultItemAnimator()
@@ -192,9 +206,9 @@ class ChatDetailsFragment: Fragment(), ChatDetailsView {
     }
 
     private fun setupToolbar() {
-        (activity as ChatDetailsActivity).let {
-            it.setNavigationIcon(R.drawable.ic_close_white_24dp)
-            it.setToolbarTitle(getString(R.string.title_channel_details))
+        with((activity as ChatRoomActivity)) {
+            hideToolbarChatRoomIcon()
+            showToolbarTitle(getString(R.string.title_channel_details))
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomNavigator.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomNavigator.kt
index f978b1e075..734feebc50 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomNavigator.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomNavigator.kt
@@ -1,16 +1,20 @@
 package chat.rocket.android.chatroom.presentation
 
 import chat.rocket.android.R
-import chat.rocket.android.chatdetails.ui.chatDetailsIntent
+import chat.rocket.android.chatdetails.ui.TAG_CHAT_DETAILS_FRAGMENT
 import chat.rocket.android.chatinformation.ui.messageInformationIntent
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.chatroom.ui.chatRoomIntent
+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.server.ui.changeServerIntent
 import chat.rocket.android.userdetails.ui.TAG_USER_DETAILS_FRAGMENT
 import chat.rocket.android.util.extensions.addFragmentBackStack
-import javax.inject.Inject
 
-class ChatRoomNavigator @Inject constructor(internal val activity: ChatRoomActivity) {
+class ChatRoomNavigator(internal val activity: ChatRoomActivity) {
 
     fun toUserDetails(userId: String) {
         activity.addFragmentBackStack(TAG_USER_DETAILS_FRAGMENT, R.id.fragment_container) {
@@ -49,14 +53,50 @@ class ChatRoomNavigator @Inject constructor(internal val activity: ChatRoomActiv
         isChatRoomSubscribed: Boolean,
         isMenuDisabled: Boolean
     ) {
-        activity.startActivity(
-            activity.chatDetailsIntent(
+        activity.addFragmentBackStack(TAG_CHAT_DETAILS_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.chatdetails.ui.newInstance(
                 chatRoomId,
                 chatRoomType,
                 isChatRoomSubscribed,
                 isMenuDisabled
             )
-        )
+        }
+    }
+
+    fun toMembersList(chatRoomId: String) {
+        activity.addFragmentBackStack(TAG_MEMBERS_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.members.ui.newInstance(chatRoomId)
+        }
+    }
+
+    fun toMemberDetails(userId: String) {
+        activity.addFragmentBackStack(TAG_USER_DETAILS_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.userdetails.ui.newInstance(userId)
+        }
+    }
+
+    fun toMentions(chatRoomId: String) {
+        activity.addFragmentBackStack(TAG_MENTIONS_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.mentions.ui.newInstance(chatRoomId)
+        }
+    }
+
+    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 toNewServer() {
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/Menu.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/Menu.kt
index 1024bd6947..4c465711f1 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/Menu.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/Menu.kt
@@ -108,7 +108,7 @@ private fun ChatRoomFragment.setupDetailsMenuItem(menu: Menu) {
             Menu.NONE,
             MENU_ACTION_SHOW_DETAILS,
             Menu.NONE,
-            "Channel Details"
+            R.string.title_channel_details
     ).setIcon(R.drawable.ic_info_outline_white_24dp)
             .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/dagger/module/ActivityBuilder.kt b/app/src/main/java/chat/rocket/android/dagger/module/ActivityBuilder.kt
index 546fc38586..116fe008d8 100644
--- a/app/src/main/java/chat/rocket/android/dagger/module/ActivityBuilder.kt
+++ b/app/src/main/java/chat/rocket/android/dagger/module/ActivityBuilder.kt
@@ -12,8 +12,6 @@ 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
@@ -79,15 +77,7 @@ abstract class ActivityBuilder {
     @ContributesAndroidInjector(
         modules = [ChatRoomModule::class,
             ChatRoomFragmentProvider::class,
-            UserDetailsFragmentProvider::class
-        ]
-    )
-    abstract fun bindChatRoomActivity(): ChatRoomActivity
-
-    @PerActivity
-    @ContributesAndroidInjector(
-        modules = [
-            ChatDetailsModule::class,
+            UserDetailsFragmentProvider::class,
             ChatDetailsFragmentProvider::class,
             MembersFragmentProvider::class,
             MentionsFragmentProvider::class,
@@ -96,7 +86,7 @@ abstract class ActivityBuilder {
             FilesFragmentProvider::class
         ]
     )
-    abstract fun bindChatDetailsActivity(): ChatDetailsActivity
+    abstract fun bindChatRoomActivity(): ChatRoomActivity
 
     @PerActivity
     @ContributesAndroidInjector(modules = [PasswordFragmentProvider::class])
diff --git a/app/src/main/java/chat/rocket/android/favoritemessages/di/FavoriteMessagesFragmentModule.kt b/app/src/main/java/chat/rocket/android/favoritemessages/di/FavoriteMessagesFragmentModule.kt
index 7da552c069..32c3be74ca 100644
--- a/app/src/main/java/chat/rocket/android/favoritemessages/di/FavoriteMessagesFragmentModule.kt
+++ b/app/src/main/java/chat/rocket/android/favoritemessages/di/FavoriteMessagesFragmentModule.kt
@@ -1,17 +1,10 @@
 package chat.rocket.android.favoritemessages.di
 
-import androidx.lifecycle.LifecycleOwner
-import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
-import chat.rocket.android.db.DatabaseManager
-import chat.rocket.android.db.DatabaseManagerFactory
 import chat.rocket.android.favoritemessages.presentation.FavoriteMessagesView
 import chat.rocket.android.favoritemessages.ui.FavoriteMessagesFragment
-import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import dagger.Module
 import dagger.Provides
-import kotlinx.coroutines.experimental.Job
-import javax.inject.Named
 
 @Module
 class FavoriteMessagesFragmentModule {
@@ -21,20 +14,4 @@ class FavoriteMessagesFragmentModule {
     fun provideFavoriteMessagesView(frag: FavoriteMessagesFragment): FavoriteMessagesView {
         return frag
     }
-
-    @Provides
-    @PerFragment
-    fun provideJob() = Job()
-
-    @Provides
-    @PerFragment
-    fun provideLifecycleOwner(frag: FavoriteMessagesFragment): LifecycleOwner {
-        return frag
-    }
-
-    @Provides
-    @PerFragment
-    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
-        return CancelStrategy(owner, jobs)
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/favoritemessages/ui/FavoriteMessagesFragment.kt b/app/src/main/java/chat/rocket/android/favoritemessages/ui/FavoriteMessagesFragment.kt
index 353f5fcaf9..564eb9e76e 100644
--- a/app/src/main/java/chat/rocket/android/favoritemessages/ui/FavoriteMessagesFragment.kt
+++ b/app/src/main/java/chat/rocket/android/favoritemessages/ui/FavoriteMessagesFragment.kt
@@ -12,7 +12,6 @@ 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
@@ -116,9 +115,6 @@ class FavoriteMessagesFragment : Fragment(), FavoriteMessagesView {
     }
 
     private fun setupToolbar() {
-        (activity as ChatDetailsActivity).let {
-            it.setToolbarTitle(getString(R.string.title_favorite_messages))
-            it.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
-        }
+        (activity as ChatRoomActivity).showToolbarTitle(getString(R.string.title_favorite_messages))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/files/di/FilesFragmentModule.kt b/app/src/main/java/chat/rocket/android/files/di/FilesFragmentModule.kt
index 1f7ac95b35..b8b965de7a 100644
--- a/app/src/main/java/chat/rocket/android/files/di/FilesFragmentModule.kt
+++ b/app/src/main/java/chat/rocket/android/files/di/FilesFragmentModule.kt
@@ -1,13 +1,10 @@
 package chat.rocket.android.files.di
 
-import androidx.lifecycle.LifecycleOwner
-import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.files.presentation.FilesView
 import chat.rocket.android.files.ui.FilesFragment
 import dagger.Module
 import dagger.Provides
-import kotlinx.coroutines.experimental.Job
 
 @Module
 class FilesFragmentModule {
@@ -17,20 +14,4 @@ class FilesFragmentModule {
     fun provideFilesView(frag: FilesFragment): FilesView {
         return frag
     }
-
-    @Provides
-    @PerFragment
-    fun provideJob() = Job()
-
-    @Provides
-    @PerFragment
-    fun provideLifecycleOwner(frag: FilesFragment): LifecycleOwner {
-        return frag
-    }
-
-    @Provides
-    @PerFragment
-    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
-        return CancelStrategy(owner, jobs)
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/files/ui/FilesFragment.kt b/app/src/main/java/chat/rocket/android/files/ui/FilesFragment.kt
index 8806ceb4e0..a3a2c31159 100644
--- a/app/src/main/java/chat/rocket/android/files/ui/FilesFragment.kt
+++ b/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.chatdetails.ui.ChatDetailsActivity
+import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.files.adapter.FilesAdapter
 import chat.rocket.android.files.presentation.FilesPresenter
 import chat.rocket.android.files.presentation.FilesView
@@ -152,9 +152,11 @@ class FilesFragment : Fragment(), FilesView {
     }
 
     private fun setupToolbar(totalFiles: Long) {
-        (activity as ChatDetailsActivity).let {
-            it.setToolbarTitle(getString(R.string.title_files_total, totalFiles))
-            it.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
-        }
+        (activity as ChatRoomActivity).showToolbarTitle(
+            (getString(
+                R.string.title_files_total,
+                totalFiles
+            ))
+        )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/members/di/MembersFragmentModule.kt b/app/src/main/java/chat/rocket/android/members/di/MembersFragmentModule.kt
index 4fa0c2b631..542bbeab81 100644
--- a/app/src/main/java/chat/rocket/android/members/di/MembersFragmentModule.kt
+++ b/app/src/main/java/chat/rocket/android/members/di/MembersFragmentModule.kt
@@ -1,15 +1,10 @@
 package chat.rocket.android.members.di
 
-import androidx.lifecycle.LifecycleOwner
-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
 import chat.rocket.android.members.presentation.MembersView
 import chat.rocket.android.members.ui.MembersFragment
 import dagger.Module
 import dagger.Provides
-import kotlinx.coroutines.experimental.Job
 
 @Module
 class MembersFragmentModule {
@@ -19,24 +14,4 @@ class MembersFragmentModule {
     fun membersView(frag: MembersFragment): MembersView {
         return frag
     }
-
-    @Provides
-    @PerFragment
-    fun provideMembersNavigator(activity: ChatDetailsActivity) = MembersNavigator(activity)
-
-    @Provides
-    @PerFragment
-    fun provideJob() = Job()
-
-    @Provides
-    @PerFragment
-    fun provideLifecycleOwner(frag: MembersFragment): LifecycleOwner {
-        return frag
-    }
-
-    @Provides
-    @PerFragment
-    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
-        return CancelStrategy(owner, jobs)
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/members/di/MembersFragmentProvider.kt b/app/src/main/java/chat/rocket/android/members/di/MembersFragmentProvider.kt
index 3b42ececb8..c8fd541aa6 100644
--- a/app/src/main/java/chat/rocket/android/members/di/MembersFragmentProvider.kt
+++ b/app/src/main/java/chat/rocket/android/members/di/MembersFragmentProvider.kt
@@ -1,8 +1,7 @@
 package chat.rocket.android.members.di
 
-import chat.rocket.android.members.ui.MembersFragment
 import chat.rocket.android.dagger.scope.PerFragment
-import chat.rocket.android.members.ui.MemberBottomSheetFragment
+import chat.rocket.android.members.ui.MembersFragment
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
@@ -12,9 +11,4 @@ abstract class MembersFragmentProvider {
     @ContributesAndroidInjector(modules = [MembersFragmentModule::class])
     @PerFragment
     abstract fun provideMembersFragment(): MembersFragment
-
-    @ContributesAndroidInjector()
-    @PerFragment
-    abstract fun provideMemberBottomSheetFragment(): MemberBottomSheetFragment
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/members/presentation/MembersNavigator.kt b/app/src/main/java/chat/rocket/android/members/presentation/MembersNavigator.kt
deleted file mode 100644
index 55c4748250..0000000000
--- a/app/src/main/java/chat/rocket/android/members/presentation/MembersNavigator.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package chat.rocket.android.members.presentation
-
-import chat.rocket.android.R
-import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
-import chat.rocket.android.userdetails.ui.TAG_USER_DETAILS_FRAGMENT
-import chat.rocket.android.util.extensions.addFragmentBackStack
-
-class MembersNavigator(internal val activity: ChatDetailsActivity) {
-
-    fun toMemberDetails(userId: String) {
-        // TODO
-//        activity.addFragmentBackStack(TAG_USER_DETAILS_FRAGMENT, R.id.fragment_container) {
-//            chat.rocket.android.userdetails.ui.newInstance(userId)
-//        }
-    }
-}
diff --git a/app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt b/app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt
index 40c366d0ce..d84f18df5a 100644
--- a/app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt
@@ -1,12 +1,12 @@
 package chat.rocket.android.members.presentation
 
+import chat.rocket.android.chatroom.presentation.ChatRoomNavigator
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManager
 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
@@ -18,7 +18,7 @@ import javax.inject.Named
 
 class MembersPresenter @Inject constructor(
     private val view: MembersView,
-    private val navigator: MembersNavigator,
+    private val navigator: ChatRoomNavigator,
     private val dbManager: DatabaseManager,
     @Named("currentServer") private val currentServer: String,
     private val strategy: CancelStrategy,
diff --git a/app/src/main/java/chat/rocket/android/members/ui/MemberBottomSheetFragment.kt b/app/src/main/java/chat/rocket/android/members/ui/MemberBottomSheetFragment.kt
deleted file mode 100644
index c2e631a370..0000000000
--- a/app/src/main/java/chat/rocket/android/members/ui/MemberBottomSheetFragment.kt
+++ /dev/null
@@ -1,102 +0,0 @@
-package chat.rocket.android.members.ui
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.isVisible
-import chat.rocket.android.R
-import chat.rocket.android.analytics.AnalyticsManager
-import chat.rocket.android.analytics.event.ScreenViewEvent
-import chat.rocket.android.util.extensions.content
-import chat.rocket.android.util.extensions.textContent
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import dagger.android.support.AndroidSupportInjection
-import kotlinx.android.synthetic.main.fragment_member_bottom_sheet.*
-import javax.inject.Inject
-
-fun newInstance(
-    avatarUri: String,
-    realName: String,
-    username: String,
-    email: String,
-    utcOffset: String
-): BottomSheetDialogFragment {
-    return MemberBottomSheetFragment().apply {
-        arguments = Bundle(1).apply {
-            putString(BUNDLE_AVATAR_URI, avatarUri)
-            putString(BUNDLE_REAL_NAME, realName)
-            putString(BUNDLE_USERNAME, username)
-            putString(BUNDLE_EMAIL, email)
-            putString(BUNDLE_UTC_OFFSET, utcOffset)
-        }
-    }
-}
-
-internal const val TAG_MEMBER_BOTTOM_SHEET_FRAGMENT = "MemberBottomSheetFragment"
-
-private const val BUNDLE_AVATAR_URI = "avatar_uri"
-private const val BUNDLE_REAL_NAME = "real_name"
-private const val BUNDLE_USERNAME = "username"
-private const val BUNDLE_EMAIL = "email"
-private const val BUNDLE_UTC_OFFSET = "utc_offset"
-
-class MemberBottomSheetFragment : BottomSheetDialogFragment() {
-    @Inject
-    lateinit var analyticsManager: AnalyticsManager
-    private lateinit var avatarUri: String
-    private lateinit var realName: String
-    private lateinit var username: String
-    private lateinit var email: String
-    private lateinit var utcOffset: String
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        AndroidSupportInjection.inject(this)
-
-        val bundle = arguments
-        if (bundle != null) {
-            avatarUri = bundle.getString(BUNDLE_AVATAR_URI)
-            realName = bundle.getString(BUNDLE_REAL_NAME)
-            username = bundle.getString(BUNDLE_USERNAME)
-            email = bundle.getString(BUNDLE_EMAIL)
-            utcOffset = bundle.getString(BUNDLE_UTC_OFFSET)
-        } else {
-            requireNotNull(bundle) { "no arguments supplied when the fragment was instantiated" }
-        }
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? =
-        inflater.inflate(R.layout.fragment_member_bottom_sheet, container, false)
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        showMemberDetails()
-
-        analyticsManager.logScreenView(ScreenViewEvent.MemberBottomSheet)
-    }
-
-    private fun showMemberDetails() {
-        image_bottom_sheet_avatar.setImageURI(avatarUri)
-        text_bottom_sheet_member_name.content = realName
-        text_bottom_sheet_member_username.content = username
-
-        if (email.isNotEmpty()) {
-            text_member_email_address.textContent = email
-        } else {
-            text_email_address.isVisible = false
-            text_member_email_address.isVisible = false
-        }
-
-        if (utcOffset.isNotEmpty()) {
-            text_member_utc.content = utcOffset
-        } else {
-            text_utc.isVisible = false
-            text_member_utc.isVisible = false
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt b/app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt
index 27a228ebeb..8e20c69439 100644
--- a/app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt
+++ b/app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt
@@ -12,16 +12,18 @@ 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.ui.ChatRoomActivity
 import chat.rocket.android.helper.EndlessRecyclerViewScrollListener
 import chat.rocket.android.members.adapter.MembersAdapter
 import chat.rocket.android.members.presentation.MembersPresenter
 import chat.rocket.android.members.presentation.MembersView
 import chat.rocket.android.members.uimodel.MemberUiModel
+import chat.rocket.android.util.extensions.clearLightStatusBar
 import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.showToast
 import chat.rocket.android.util.extensions.ui
 import dagger.android.support.AndroidSupportInjection
+import kotlinx.android.synthetic.main.app_bar_chat_room.*
 import kotlinx.android.synthetic.main.fragment_members.*
 import javax.inject.Inject
 
@@ -120,20 +122,31 @@ class MembersFragment : Fragment(), MembersView {
 
     private fun setupRecyclerView() {
         ui {
-            recycler_view.layoutManager = linearLayoutManager
-            recycler_view.addItemDecoration(DividerItemDecoration(it, DividerItemDecoration.HORIZONTAL))
+            recycler_view.layoutManager = LinearLayoutManager(context)
+            recycler_view.addItemDecoration(
+                DividerItemDecoration(
+                    it,
+                    DividerItemDecoration.HORIZONTAL
+                )
+            )
             recycler_view.adapter = adapter
         }
     }
 
     private fun setupToolbar(totalMembers: Long? = null) {
-        (activity as ChatDetailsActivity).let {
+        with((activity as ChatRoomActivity)) {
             if (totalMembers != null) {
-                it.setToolbarTitle(getString(R.string.title_counted_members, totalMembers))
+                showToolbarTitle(
+                    (getString(
+                        R.string.title_counted_members,
+                        totalMembers
+                    ))
+                )
             } else {
-                it.setToolbarTitle(getString(R.string.title_members))
+                showToolbarTitle((getString(R.string.title_members)))
             }
-            it.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
+            this.clearLightStatusBar()
+            toolbar.isVisible = true
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/mentions/di/MentionsFragmentModule.kt b/app/src/main/java/chat/rocket/android/mentions/di/MentionsFragmentModule.kt
index 88b6ecb85d..6801c80775 100644
--- a/app/src/main/java/chat/rocket/android/mentions/di/MentionsFragmentModule.kt
+++ b/app/src/main/java/chat/rocket/android/mentions/di/MentionsFragmentModule.kt
@@ -1,13 +1,10 @@
 package chat.rocket.android.mentions.di
 
-import androidx.lifecycle.LifecycleOwner
-import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.mentions.presentention.MentionsView
 import chat.rocket.android.mentions.ui.MentionsFragment
 import dagger.Module
 import dagger.Provides
-import kotlinx.coroutines.experimental.Job
 
 @Module
 class MentionsFragmentModule {
@@ -17,20 +14,4 @@ class MentionsFragmentModule {
     fun provideMentionsView(frag: MentionsFragment): MentionsView {
         return frag
     }
-
-    @Provides
-    @PerFragment
-    fun provideJob() = Job()
-
-    @Provides
-    @PerFragment
-    fun provideLifecycleOwner(frag: MentionsFragment): LifecycleOwner {
-        return frag
-    }
-
-    @Provides
-    @PerFragment
-    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
-        return CancelStrategy(owner, jobs)
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/mentions/ui/MentionsFragment.kt b/app/src/main/java/chat/rocket/android/mentions/ui/MentionsFragment.kt
index 6eb6706dbe..47e5b6d206 100644
--- a/app/src/main/java/chat/rocket/android/mentions/ui/MentionsFragment.kt
+++ b/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
@@ -121,9 +121,6 @@ class MentionsFragment : Fragment(), MentionsView {
     }
 
     private fun setupToolbar() {
-        (activity as ChatDetailsActivity).let {
-            it.setToolbarTitle(getString(R.string.msg_mentions))
-            it.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
-        }
+        (activity as ChatRoomActivity).showToolbarTitle((getString(R.string.msg_mentions)))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/pinnedmessages/di/PinnedMessagesFragmentModule.kt b/app/src/main/java/chat/rocket/android/pinnedmessages/di/PinnedMessagesFragmentModule.kt
index 8993f8f696..1d9064f7df 100644
--- a/app/src/main/java/chat/rocket/android/pinnedmessages/di/PinnedMessagesFragmentModule.kt
+++ b/app/src/main/java/chat/rocket/android/pinnedmessages/di/PinnedMessagesFragmentModule.kt
@@ -1,13 +1,10 @@
 package chat.rocket.android.pinnedmessages.di
 
-import androidx.lifecycle.LifecycleOwner
-import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.pinnedmessages.presentation.PinnedMessagesView
 import chat.rocket.android.pinnedmessages.ui.PinnedMessagesFragment
 import dagger.Module
 import dagger.Provides
-import kotlinx.coroutines.experimental.Job
 
 @Module
 class PinnedMessagesFragmentModule {
@@ -17,20 +14,4 @@ class PinnedMessagesFragmentModule {
     fun providePinnedMessagesView(frag: PinnedMessagesFragment): PinnedMessagesView {
         return frag
     }
-
-    @Provides
-    @PerFragment
-    fun provideJob() = Job()
-
-    @Provides
-    @PerFragment
-    fun provideLifecycleOwner(frag: PinnedMessagesFragment): LifecycleOwner {
-        return frag
-    }
-
-    @Provides
-    @PerFragment
-    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
-        return CancelStrategy(owner, jobs)
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/pinnedmessages/ui/PinnedMessagesFragment.kt b/app/src/main/java/chat/rocket/android/pinnedmessages/ui/PinnedMessagesFragment.kt
index 0a2263c925..502e2e80f2 100644
--- a/app/src/main/java/chat/rocket/android/pinnedmessages/ui/PinnedMessagesFragment.kt
+++ b/app/src/main/java/chat/rocket/android/pinnedmessages/ui/PinnedMessagesFragment.kt
@@ -12,14 +12,12 @@ 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.pinnedmessages.presentation.PinnedMessagesPresenter
 import chat.rocket.android.pinnedmessages.presentation.PinnedMessagesView
-import chat.rocket.android.server.domain.AnalyticsTrackingInteractor
 import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.showToast
 import chat.rocket.android.util.extensions.ui
@@ -123,9 +121,6 @@ class PinnedMessagesFragment : Fragment(), PinnedMessagesView {
     }
 
     private fun setupToolbar() {
-        (activity as ChatDetailsActivity).let {
-            it.setToolbarTitle(getString(R.string.title_pinned_messages))
-            it.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
-        }
+        (activity as ChatRoomActivity).showToolbarTitle((getString(R.string.title_pinned_messages)))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/userdetails/di/UserDetailsFragmentModule.kt b/app/src/main/java/chat/rocket/android/userdetails/di/UserDetailsFragmentModule.kt
index 88ec10a0b9..e8218d49d3 100644
--- a/app/src/main/java/chat/rocket/android/userdetails/di/UserDetailsFragmentModule.kt
+++ b/app/src/main/java/chat/rocket/android/userdetails/di/UserDetailsFragmentModule.kt
@@ -1,6 +1,5 @@
 package chat.rocket.android.userdetails.di
 
-import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.userdetails.presentation.UserDetailsView
 import chat.rocket.android.userdetails.ui.UserDetailsFragment
@@ -13,8 +12,4 @@ class UserDetailsFragmentModule {
     @Provides
     @PerFragment
     fun provideUserDetailsView(frag: UserDetailsFragment): UserDetailsView = frag
-
-    @Provides
-    @PerFragment
-    fun provideLifecycleOwner(frag: UserDetailsFragment): LifecycleOwner = frag
-}
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_chat_details.xml b/app/src/main/res/layout/activity_chat_details.xml
deleted file mode 100644
index 89f372c5f0..0000000000
--- a/app/src/main/res/layout/activity_chat_details.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".chatdetails.ui.ChatDetailsActivity">
-    <include
-        android:id="@+id/layout_app_bar"
-        layout="@layout/app_bar_chat_details" />
-    <FrameLayout
-        android:id="@+id/fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_member_bottom_sheet.xml b/app/src/main/res/layout/fragment_member_bottom_sheet.xml
deleted file mode 100644
index 4ef66980df..0000000000
--- a/app/src/main/res/layout/fragment_member_bottom_sheet.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/member_bottom_sheet"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="16dp"
-    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
-    tools:context=".members.ui.MemberBottomSheetFragment">
-
-    <com.facebook.drawee.view.SimpleDraweeView
-        android:id="@+id/image_bottom_sheet_avatar"
-        android:layout_width="0dp"
-        android:layout_height="200dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <LinearLayout
-        android:id="@+id/name_and_username_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/colorBackgroundMemberContainer"
-        android:orientation="vertical"
-        android:paddingStart="16dp"
-        android:paddingTop="10dp"
-        android:paddingBottom="10dp"
-        app:layout_constraintBottom_toBottomOf="@+id/image_bottom_sheet_avatar"
-        app:layout_constraintLeft_toLeftOf="parent">
-
-        <TextView
-            android:id="@+id/text_bottom_sheet_member_name"
-            style="@style/TextAppearance.AppCompat.Title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorWhite"
-            tools:text="Ronald Perkins" />
-
-        <TextView
-            android:id="@+id/text_bottom_sheet_member_username"
-            style="@style/Sender.Name.TextView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:textColor="@color/colorWhite"
-            tools:text="\@ronaldPerkins" />
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/text_email_address"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:text="@string/msg_email_address"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/image_bottom_sheet_avatar" />
-
-    <TextView
-        android:id="@+id/text_member_email_address"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="10dp"
-        android:textColor="@color/colorPrimaryText"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_email_address"
-        tools:text="ronald@perkins.com" />
-
-    <TextView
-        android:id="@+id/text_utc"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:text="@string/msg_utc_offset"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_member_email_address" />
-
-    <TextView
-        android:id="@+id/text_member_utc"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="10dp"
-        android:textColor="@color/colorPrimaryText"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_utc"
-        tools:text="+01:00" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 073a501c0ceba534c7112d59b50104a79454c1c7 Mon Sep 17 00:00:00 2001
From: dev-ritik <ritikkne@gmail.com>
Date: Sun, 6 Jan 2019 13:59:27 +0530
Subject: [PATCH 142/149] Fixes @ mention bug.

---
 .../java/chat/rocket/android/suggestions/ui/SuggestionsView.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/suggestions/src/main/java/chat/rocket/android/suggestions/ui/SuggestionsView.kt b/suggestions/src/main/java/chat/rocket/android/suggestions/ui/SuggestionsView.kt
index fcba88de3e..74c5767118 100644
--- a/suggestions/src/main/java/chat/rocket/android/suggestions/ui/SuggestionsView.kt
+++ b/suggestions/src/main/java/chat/rocket/android/suggestions/ui/SuggestionsView.kt
@@ -74,7 +74,7 @@ class SuggestionsView : FrameLayout, TextWatcher {
         // If we don't have any adapter bound to any token bail out.
         if (adaptersByToken.isEmpty()) return
 
-        if (editor?.get() != null && editor?.get()?.selectionStart ?: 0 <= completionOffset.get()) {
+        if (editor?.get() != null && editor?.get()?.selectionStart ?: 0 < completionOffset.get()) {
             completionOffset.set(NO_STATE_INDEX)
             collapse()
         }

From 7440d0b0c1a4e3f89efa0b6f62e360dc775356f0 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Tue, 8 Jan 2019 07:48:11 -0300
Subject: [PATCH 143/149] Remove unused layout and improves the showing/hidding
 toobar anim.

---
 .../userdetails/ui/UserDetailsFragment.kt     | 29 ++++++++++++++-----
 .../chat/rocket/android/util/extensions/Ui.kt |  9 ++++--
 .../main/res/layout/app_bar_chat_details.xml  | 29 -------------------
 .../main/res/layout/fragment_user_details.xml | 11 +------
 4 files changed, 30 insertions(+), 48 deletions(-)
 delete mode 100644 app/src/main/res/layout/app_bar_chat_details.xml

diff --git a/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsFragment.kt b/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsFragment.kt
index 018dcadf9b..346784b40c 100644
--- a/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsFragment.kt
@@ -1,16 +1,17 @@
 package chat.rocket.android.userdetails.ui
 
 import android.os.Bundle
+import android.os.Handler
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 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.emoji.internal.GlideApp
 import chat.rocket.android.userdetails.presentation.UserDetailsPresenter
 import chat.rocket.android.userdetails.presentation.UserDetailsView
 import chat.rocket.android.util.extensions.inflate
@@ -45,6 +46,7 @@ class UserDetailsFragment : Fragment(), UserDetailsView {
     @Inject
     lateinit var analyticsManager: AnalyticsManager
     private lateinit var userId: String
+    private val handler = Handler()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -74,6 +76,11 @@ class UserDetailsFragment : Fragment(), UserDetailsView {
         analyticsManager.logScreenView(ScreenViewEvent.UserDetails)
     }
 
+    override fun onDestroyView() {
+        handler.removeCallbacksAndMessages(null)
+        super.onDestroyView()
+    }
+
     override fun showUserDetails(
         avatarUrl: String,
         name: String,
@@ -83,8 +90,9 @@ class UserDetailsFragment : Fragment(), UserDetailsView {
     ) {
         val requestBuilder = Glide.with(this).load(avatarUrl)
 
-        requestBuilder.apply(RequestOptions.bitmapTransform(MultiTransformation(BlurTransformation(), CenterCrop())))
-            .into(image_blur)
+        requestBuilder.apply(
+            RequestOptions.bitmapTransform(MultiTransformation(BlurTransformation(), CenterCrop()))
+        ).into(image_blur)
 
         requestBuilder.apply(RequestOptions.bitmapTransform(RoundedCorners(14)))
             .into(image_avatar)
@@ -119,10 +127,17 @@ class UserDetailsFragment : Fragment(), UserDetailsView {
     override fun showGenericErrorMessage() = showMessage(getString(R.string.msg_generic_error))
 
     private fun setupToolbar() {
-        with(activity as ChatRoomActivity) {
-            view?.let { setLightStatusBar(it) }
-            toolbar.isVisible = false
-        }
+        handler.postDelayed({
+            with(activity as ChatRoomActivity) {
+                view?.let {
+                    setLightStatusBar(
+                        it,
+                        ContextCompat.getColor(this, R.color.whitesmoke)
+                    )
+                }
+                toolbar.isVisible = false
+            }
+        }, 400)
     }
 
     private fun setupListeners() {
diff --git a/app/src/main/java/chat/rocket/android/util/extensions/Ui.kt b/app/src/main/java/chat/rocket/android/util/extensions/Ui.kt
index 9fcdc89528..fb19d94175 100644
--- a/app/src/main/java/chat/rocket/android/util/extensions/Ui.kt
+++ b/app/src/main/java/chat/rocket/android/util/extensions/Ui.kt
@@ -11,6 +11,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
+import androidx.annotation.ColorInt
 import androidx.annotation.LayoutRes
 import androidx.annotation.MenuRes
 import androidx.annotation.StringRes
@@ -22,12 +23,16 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import chat.rocket.android.R
 
-fun FragmentActivity.setLightStatusBar(view: View) {
+fun FragmentActivity.setLightStatusBar(view: View, @ColorInt color: Int = 0) {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
         var flags = view.systemUiVisibility
         flags = flags or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
         view.systemUiVisibility = flags
-        window.statusBarColor = ContextCompat.getColor(this, R.color.colorWhite)
+        window.statusBarColor = if (color == 0) {
+            ContextCompat.getColor(this, R.color.colorWhite)
+        } else {
+            color
+        }
     }
 }
 
diff --git a/app/src/main/res/layout/app_bar_chat_details.xml b/app/src/main/res/layout/app_bar_chat_details.xml
deleted file mode 100644
index 3af8a2af96..0000000000
--- a/app/src/main/res/layout/app_bar_chat_details.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/colorPrimary"
-    android:theme="@style/Theme.AppCompat.Light.NoActionBar">
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        app:layout_scrollFlags="scroll|enterAlways"
-        app:navigationIcon="@drawable/ic_close_white_24dp"
-        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-        <TextView
-            android:id="@+id/toolbar_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawablePadding="@dimen/text_view_drawable_padding"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@color/colorWhite"
-            android:textSize="18sp"
-            android:textStyle="bold"
-            tools:text="@string/title_channel_details" />
-    </androidx.appcompat.widget.Toolbar>
-</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_user_details.xml b/app/src/main/res/layout/fragment_user_details.xml
index c19fe83a4b..f52cbeeeb3 100644
--- a/app/src/main/res/layout/fragment_user_details.xml
+++ b/app/src/main/res/layout/fragment_user_details.xml
@@ -112,15 +112,6 @@
             app:layout_constraintTop_toBottomOf="@+id/text_title_timezone"
             tools:text="(UTC-2) 11:08 AM" />
 
-        <View
-            android:id="@+id/view_gray_bottom"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginTop="16dp"
-            android:background="#FFF3f4f5"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/text_description_timezone" />
-
         <com.wang.avi.AVLoadingIndicatorView
             android:id="@+id/view_loading"
             style="@style/Authentication.AVLoadingIndicatorView"
@@ -134,6 +125,6 @@
             android:id="@+id/group_user_details"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:constraint_referenced_ids="image_blur, image_avatar, text_name, text_username, text_message, text_title_status, text_description_status, text_title_timezone, text_description_timezone, view_gray_bottom" />
+            app:constraint_referenced_ids="image_blur, image_avatar, text_name, text_username, text_message, text_title_status, text_description_status, text_title_timezone, text_description_timezone" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>

From 1bce883d76201907eba21bf3a995b0c9f918aec8 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Wed, 9 Jan 2019 08:29:00 -0300
Subject: [PATCH 144/149] Removes unused build status from Travis. Updates
 coding style section. Uppercase some words.

---
 README.md | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 08cbbfb59f..d89364e418 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 # Rocket.Chat Android native application
 
-[![CircleCI](https://circleci.com/gh/RocketChat/Rocket.Chat.Android/tree/develop.svg?style=shield)](https://circleci.com/gh/RocketChat/Rocket.Chat.Android/tree/develop) [![Build Status](https://travis-ci.org/RocketChat/Rocket.Chat.Android.svg?branch=develop)](https://travis-ci.org/RocketChat/Rocket.Chat.Android) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/a81156a8682e4649994270d3670c3c83)](https://www.codacy.com/app/matheusjardimb/Rocket.Chat.Android) 
+[![CircleCI](https://circleci.com/gh/RocketChat/Rocket.Chat.Android/tree/develop.svg?style=shield)](https://circleci.com/gh/RocketChat/Rocket.Chat.Android/tree/develop) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/a81156a8682e4649994270d3670c3c83)](https://www.codacy.com/app/matheusjardimb/Rocket.Chat.Android)
 
 ## Get it from the stores
 
@@ -14,21 +14,22 @@ This repository contains all the code related to the Android native application
 
 ## How to build
 
-- You need to download the latest [Android Studio Preview](https://developer.android.com/studio/preview/) version since the stable IDE version does not support the [JetPack](https://developer.android.com/jetpack/) that is being used on this application. 
-- Make sure that you have the latest **gradle** and the **android plugin** versions installed. Go to `File > Project Structure > Project` and make sure that you have the latest versions installed. Refer [this](https://developer.android.com/studio/releases/gradle-plugin.html#updating-gradle) to see the compatible versions.
-- Kotlin is already configured in the project. To check, go to `Tools > Kotlin > Configure Kotlin in project`. A message saying kotlin is already configured in the project pops up. You can update kotlin to the latest version by going to `Tools > Kotlin > Configure Kotlin updates` and download the latest version of kotlin.
+- You need to download the latest [Android Studio Preview](https://developer.android.com/studio/preview/) version since the stable IDE version does not support the [JetPack](https://developer.android.com/jetpack/) that is being used on this application.
+- Make sure that you have the latest **Gradle** and the **Android plugin** versions installed. Go to `File > Project Structure > Project` and make sure that you have the latest versions installed. Refer [this](https://developer.android.com/studio/releases/gradle-plugin.html#updating-gradle) to see the compatible versions.
+- Kotlin is already configured in the project. To check, go to `Tools > Kotlin > Configure Kotlin in project`. A message saying Kotlin is already configured in the project pops up. You can update Kotlin to the latest version by going to `Tools > Kotlin > Configure Kotlin updates` and download the latest version of Kotlin.
 
 ### SDK Instructions
 
 - This version requires the [Kotlin SDK](https://github.com/RocketChat/Rocket.Chat.Kotlin.SDK) for Rocket.Chat. Clone the Kotlin SDK in by running `git clone https://github.com/RocketChat/Rocket.Chat.Kotlin.SDK.git`.
-- First, a build is required for the SDK, so that required jar files are generated. Make sure that the android repository and the kotlin sdk have the same immediate parent directory. Change the current directory to `Rocket.Chat.Android/app` and run the `build-sdk.sh` which will result in creating of the required jar file `core*.jar` and `common*.jar` in `Rocket.Chat.Android/app/libs`,by the following steps in your terminal window:
-**Note:** *To have Java 8 as default java for the system(Project won't build for Java > 8).*
+- First, a build is required for the SDK, so that required jar files are generated. Make sure that the Android repository and the Kotlin SDK have the same immediate parent directory. Change the current directory to `Rocket.Chat.Android/app` and run the `build-sdk.sh` which will result in creating of the required jar file `core*.jar` and `common*.jar` in `Rocket.Chat.Android/app/libs`, by the following steps in your terminal window:
 
 ```
 cd Rocket.Chat.Android/app
 ./build-sdk.sh
 ```
 
+**Note:** *You need to have Java 8 as default Java for the system (project won't build when using a Java 9+ version).*
+
 ## How to run
 
 ### Command Line
@@ -39,7 +40,7 @@ cd Rocket.Chat.Android/app
 
 ### Android Studio
 
-- After importing the project in android studio, go to `Run > Run app` and then select your device, or create a new virtual device by following the wizard.     
+- After importing the project in Android Studio, go to `Run > Run app` and then select your device, or create a new virtual device by following the wizard.     
 
 ## Bug report & Feature request
 
@@ -47,4 +48,4 @@ Are you having a technical issue trying to compile the app, or setting up Push N
 
 ## Coding Style
 
-Please follow our [coding style](https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md) when contributing.
+Please follow the official [Kotlin coding convections](https://kotlinlang.org/docs/reference/coding-conventions.html) when contributing.

From 163769094cddf6aeaaa833f4b59e9e026f345dfc Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Wed, 9 Jan 2019 11:19:08 -0300
Subject: [PATCH 145/149] Update string translations.

---
 app/src/main/res/values-pt-rBR/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 08cc2a3c48..20131633aa 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -208,8 +208,8 @@
     <string name="message_pinned">Fixou uma mensagem:</string>
     <string name="message_muted">Usuário %1$s foi silenciado por %2$s</string>
     <string name="message_unmuted">Usuário %1$s saiu do modo silenciado por %2$s</string>
-    <string name="message_role_add">%3$s deu estatuto de %2$s a %1$s</string>
-    <string name="message_role_removed">%3$s removeu o estatuto de %2$s de %1$s</string>
+    <string name="message_role_add">%1$s foi definido %2$s por %3$s</string>
+    <string name="message_role_removed">%1$s não é mais %2$s por %3$s</string>
     <string name="message_credentials_saved_successfully">Credenciais salvas com sucesso</string>
 
     <!-- Message actions -->
@@ -253,7 +253,7 @@
     <!-- Pinned Messages -->
     <string name="title_pinned_messages">Mensagens Fixadas</string>
     <string name="no_pinned_messages">Nenhuma mensagem fixada</string>
-    <string name="no_pinned_description">Todas as mensagens fixadas\naparecerão aqui</string>
+    <string name="no_pinned_description">Todas mensagens fixadas\naparecerão aqui</string>
 
     <!-- Favorite Messages -->
     <string name="title_favorite_messages">Mensagens Favoritas</string>

From 120dfd0fba69e37dad5ba1d400312dd0934a2195 Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Thu, 10 Jan 2019 16:37:41 -0300
Subject: [PATCH 146/149] Fix a bug that makes the typing status being send
 multiples time over the socket.

---
 .../rocket/android/chatroom/ui/ChatRoomFragment.kt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index 5930ce0e01..64e87a0e26 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -312,6 +312,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             showToolbarChatRoomIcon(chatRoomType)
         }
         getDraftMessage()
+        subscribeComposeTextMessage()
 
         analyticsManager.logScreenView(ScreenViewEvent.ChatRoom)
     }
@@ -848,7 +849,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
                 true
             )
 
-            subscribeComposeTextMessage()
             emojiKeyboardPopup = EmojiKeyboardPopup(activity!!, activity!!.findViewById(R.id.fragment_container))
 
             emojiKeyboardPopup.listener = this
@@ -1000,12 +1000,12 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     }
 
     private fun subscribeComposeTextMessage() {
-        val editTextObservable = text_message.asObservable()
-
-        compositeDisposable.addAll(
-            subscribeComposeButtons(editTextObservable),
-            subscribeComposeTypingStatus(editTextObservable)
-        )
+        text_message.asObservable().let {
+            compositeDisposable.addAll(
+                subscribeComposeButtons(it),
+                subscribeComposeTypingStatus(it)
+            )
+        }
     }
 
     private fun unsubscribeComposeTextMessage() {

From 279281a6d42ae1d0bcbed3cf3e37aa26f23b453d Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Thu, 10 Jan 2019 16:43:05 -0300
Subject: [PATCH 147/149] increases build number.

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index ddad12e80e..bd0c01b769 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,7 +16,7 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 2055
+        versionCode 2056
         versionName "3.2.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true

From b31e9d441f0bad6cf9b8108fa27f9f13454b25df Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Fri, 11 Jan 2019 11:04:10 -0300
Subject: [PATCH 148/149] Fix the settings items working inconsistently.

---
 .../rocket/android/settings/ui/SettingsFragment.kt | 14 +++++++++-----
 app/src/main/res/values-de/strings.xml             |  2 +-
 app/src/main/res/values-es/strings.xml             |  1 +
 app/src/main/res/values-fr/strings.xml             |  1 +
 app/src/main/res/values-ja/strings.xml             |  2 +-
 app/src/main/res/values-pt-rBR/strings.xml         |  1 +
 app/src/main/res/values-tr/strings.xml             |  1 +
 app/src/main/res/values-uk/strings.xml             |  1 +
 app/src/main/res/values/strings.xml                |  2 +-
 9 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
index e3a6c7f11b..b39f87c669 100644
--- a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
@@ -23,6 +23,7 @@ import chat.rocket.android.settings.password.ui.PasswordActivity
 import chat.rocket.android.settings.presentation.SettingsView
 import chat.rocket.android.util.extensions.addFragmentBackStack
 import chat.rocket.android.util.extensions.inflate
+import chat.rocket.android.util.extensions.showToast
 import chat.rocket.android.webview.ui.webViewIntent
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_settings.*
@@ -73,20 +74,23 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
             resources.getStringArray(R.array.settings_actions)[1] ->
                 activity?.startActivity(Intent(activity, PasswordActivity::class.java))
 
-            resources.getStringArray(R.array.settings_actions)[2] -> shareApp()
+            // TODO (https://github.com/RocketChat/Rocket.Chat.Android/pull/1918)
+            resources.getStringArray(R.array.settings_actions)[2] -> showToast("Coming soon")
 
-            resources.getStringArray(R.array.settings_actions)[3] -> showAppOnStore()
+            resources.getStringArray(R.array.settings_actions)[3] -> shareApp()
 
-            resources.getStringArray(R.array.settings_actions)[4] -> contactSupport()
+            resources.getStringArray(R.array.settings_actions)[4] -> showAppOnStore()
 
-            resources.getStringArray(R.array.settings_actions)[5] -> activity?.startActivity(
+            resources.getStringArray(R.array.settings_actions)[5] -> contactSupport()
+
+            resources.getStringArray(R.array.settings_actions)[6] -> activity?.startActivity(
                 context?.webViewIntent(
                     getString(R.string.license_url),
                     getString(R.string.title_licence)
                 )
             )
 
-            resources.getStringArray(R.array.settings_actions)[6] -> {
+            resources.getStringArray(R.array.settings_actions)[7] -> {
                 (activity as AppCompatActivity).addFragmentBackStack(
                     TAG_ABOUT_FRAGMENT,
                     R.id.fragment_container
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 90c7c89242..73158751de 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -71,12 +71,12 @@
     <string-array name="settings_actions">
         <item name="item_preferences">Eigenschaften</item>
         <item name="item_password">Passwort ändern</item>
+        <item name="change_language">Change Language</item>
         <item name="item_share_app">Link zur App teilen</item>
         <item name="item_rate_us">Bewerten Sie uns</item>
         <item name="item_contact_us">Kontaktieren Sie uns</item>
         <item name="item_licence">Lizenz</item>
         <item name="item_about">Über</item>
-
     </string-array>
 
     <!-- Regular information messages -->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 1691ea8b62..781d045fb7 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -63,6 +63,7 @@
     <string-array name="settings_actions">
         <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
         <item name="item_password">Change password</item> <!-- TODO Add translation -->
+        <item name="change_language">Change Language</item> <!-- TODO Add translation -->
         <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
         <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
         <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index f7d5f40487..c6f330f7af 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -64,6 +64,7 @@
     <string-array name="settings_actions">
         <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
         <item name="item_password">Change password</item> <!-- TODO Add translation -->
+        <item name="change_language">Change Language</item> <!-- TODO Add translation -->
         <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
         <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
         <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index f0124f4cff..ce424b3b0a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -66,7 +66,7 @@
     <string-array name="settings_actions">
         <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
         <item name="item_password">Change password</item> <!-- TODO Add translation -->
-        <item name="change_language">Change Language </item><!-- TODO Add translation -->
+        <item name="change_language">Change Language</item><!-- TODO Add translation -->
         <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
         <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
         <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 756e133c95..0b86a144b9 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -64,6 +64,7 @@
     <string-array name="settings_actions">
         <item name="item_preferences">Preferências</item>
         <item name="item_password">Alterar senha</item>
+        <item name="change_language">Alterar idioma</item>
         <item name="item_share_app">Compartilhar app</item>
         <item name="item_rate_us">Classifique-nos</item>
         <item name="item_contact_us">Contate-nos</item>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 1e983e6bfe..2a5cb94a38 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -64,6 +64,7 @@
     <string-array name="settings_actions">
         <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
         <item name="item_password">Change password</item> <!-- TODO Add translation -->
+        <item name="change_language">Change Language</item> <!-- TODO Add translation -->
         <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
         <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
         <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 94d842c08c..f8a52cd6f7 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -64,6 +64,7 @@
     <string-array name="settings_actions">
         <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
         <item name="item_password">Change password</item> <!-- TODO Add translation -->
+        <item name="change_language">Change Language</item> <!-- TODO Add translation -->
         <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
         <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
         <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 64588ac1ed..7752432e84 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -76,7 +76,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string-array name="settings_actions">
         <item name="item_preferences">Preferences</item>
         <item name="item_password">Change password</item>
-        <item name="change_language">Change Language </item>
+        <item name="change_language">Change Language</item>
         <item name="item_share_app">Share app</item>
         <item name="item_rate_us">Rate us</item>
         <item name="item_contact_us">Contact us</item>

From 373602fe760a43594a08e634a4d25a2982a0bada Mon Sep 17 00:00:00 2001
From: Filipe de Lima Brito <filipedelimabrito@gmail.com>
Date: Fri, 11 Jan 2019 11:09:06 -0300
Subject: [PATCH 149/149] Increases build number,

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index bd0c01b769..43d3db6475 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,7 +16,7 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 2056
+        versionCode 2057
         versionName "3.2.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true