Merge branch 'develop' into new/delete-my-account

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)

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

@@ -770,9 +770,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()
\ No newline at end of file
+)

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,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

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

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

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

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

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

@@ -158,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">Privé</string>

app/src/main/res/values-hi-rIN/strings.xml

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

@@ -141,22 +141,25 @@
     <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>
+
+    <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>
     <!-- TODO - Add proper translation -->
-    <string name="msg_view_less">view less</string>
+    <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-pt-rBR/strings.xml

@@ -157,6 +157,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 +186,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

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

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

@@ -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">Приватний</string>

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

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