Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into new/take-a-photo

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

@@ -34,11 +34,9 @@ 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
-import chat.rocket.android.util.extensions.getBitmpap
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.RoomType
@@ -82,7 +80,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
 
@@ -138,9 +135,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)

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

@@ -787,9 +787,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

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
+    val username: String? = null,
+    val muted: List<String> = emptyList()
 )

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)
                     }

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

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

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

@@ -41,8 +41,7 @@ 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())
@@ -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
                         }
@@ -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
         }
@@ -351,7 +350,8 @@ class DatabaseManager(val context: Application,
                     updatedAt = updatedAt ?: chatRoom.updatedAt,
                     lastMessageText = mapLastMessageText(lastMessage),
                     lastMessageUserId = lastMessage?.sender?.id,
-                        lastMessageTimestamp = lastMessage?.timestamp
+                    lastMessageTimestamp = lastMessage?.timestamp,
+                    muted = muted
                 )
             }
         }
@@ -389,7 +389,8 @@ class DatabaseManager(val context: Application,
                     id = roomId,
                     subscriptionId = id,
                     type = type.toString(),
-                        name = name ?: throw NullPointerException(), // this should be filtered on the SDK
+                    name = name
+                        ?: throw NullPointerException(), // this should be filtered on the SDK
                     fullname = fullName ?: chatRoom.fullname,
                     userId = userId ?: chatRoom.userId,
                     readonly = readonly ?: chatRoom.readonly,
@@ -402,14 +403,15 @@ class DatabaseManager(val context: Application,
                     groupMentions = groupMentions ?: chatRoom.groupMentions,
                     updatedAt = updatedAt ?: chatRoom.updatedAt,
                     timestamp = timestamp ?: chatRoom.timestamp,
-                        lastSeen = lastSeen ?: chatRoom.lastSeen
+                    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()
 
@@ -609,7 +614,7 @@ private fun String.databaseName(): String {
     val tmp = this.removePrefix("https://")
         .removePrefix("http://")
         .removeTrailingSlash()
-            .replace("/","-")
+        .replace("/", "-")
         .replace(".", "_")
 
     return "$tmp.db"

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,9 +25,10 @@ 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

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(

app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt

 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
 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
@@ -84,7 +87,15 @@ 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()
+        }
+    }
 
+    private fun startAppPlayStore() {
+        try {
+            startActivity(Intent(Intent.ACTION_VIEW, getString(R.string.market_link).toUri()))
+        } catch (error: ActivityNotFoundException) {
+            startActivity(Intent(Intent.ACTION_VIEW, getString(R.string.play_store_link).toUri()))
         }
     }
 

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 -->
@@ -148,6 +150,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>

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>
@@ -57,8 +58,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 -->
@@ -166,6 +168,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 -->

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>
@@ -58,8 +59,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 -->
@@ -158,6 +160,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>

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>
@@ -58,8 +59,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 -->
@@ -170,6 +172,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>

app/src/main/res/values-ja/strings.xml

@@ -18,11 +18,13 @@
     <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>
     <string name="title_about">About</string>
     <string name="title_create_channel">新しいチャネルを作成</string>
+    <string name="title_are_you_sure">本気ですか？</string>
 
     <!-- Actions -->
     <string name="action_connect">接続</string>
@@ -53,14 +55,15 @@
     <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">環境設定</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 -->
@@ -152,10 +155,10 @@
     <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_muted_on_this_channel">あなたはこのチャンネルでミュートされています</string>
+
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">プライベート</string>
@@ -209,7 +212,6 @@
     <string name="action_msg_share">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">パーマリンクのコピー</string>
 
     <!-- Permission messages -->

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>
@@ -58,8 +59,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 -->
@@ -157,6 +159,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>
@@ -185,8 +188,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.

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>
@@ -58,8 +59,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 -->
@@ -154,6 +156,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>

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>
@@ -58,8 +59,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 -->
@@ -171,6 +173,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>

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>
@@ -58,8 +59,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 -->
@@ -156,6 +158,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>

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

app/src/main/res/values/strings.xml

@@ -28,6 +28,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,8 +71,9 @@ 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="item_password">About</item>
         <item name="item_share_app">Share App</item>
+        <item name="item_rate_us">Rate Us</item>
+        <item name="item_password">About</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -183,6 +185,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>