Merge branch 'develop-2.x' of...

Merge branch 'develop-2.x' of https://github.com/RocketChat/Rocket.Chat.Android into fix/message-composer-becomes-empty-with-new-messages

app/build.gradle

@@ -92,21 +92,15 @@ dependencies {
     implementation libraries.kotshiApi
 
     implementation libraries.frescoImageViewer
-
     implementation libraries.androidSvg
 
-    implementation libraries.aVLoadingIndicatorView
-
-    implementation libraries.textDrawable
-
     implementation libraries.markwon
-
     implementation libraries.markwonImageLoader
 
-    implementation libraries.moshiLazyAdapters
-
     implementation libraries.sheetMenu
 
+    implementation libraries.aVLoadingIndicatorView
+
     implementation('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
         transitive = true
     }

app/src/main/java/chat/rocket/android/app/DrawableHelper.kt

 import android.content.Context
-import android.graphics.Typeface
 import android.graphics.drawable.Drawable
 import android.support.v4.content.ContextCompat
 import android.support.v4.graphics.drawable.DrawableCompat
 import android.widget.EditText
 import android.widget.TextView
 import chat.rocket.android.R
-import chat.rocket.android.helper.TextHelper
-import com.amulyakhare.textdrawable.TextDrawable
 
 object DrawableHelper {
-    private val AVATAR_BACKGROUND_HEXADECIMAL_COLORS = intArrayOf(
-            0xFFF44336.toInt(), 0xFFE91E63.toInt(), 0xFF9C27B0.toInt(), 0xFF673AB7.toInt(), 0xFF3F51B5.toInt(),
-            0xFF2196F3.toInt(), 0xFF03A9F4.toInt(), 0xFF00BCD4.toInt(), 0xFF009688.toInt(), 0xFF4CAF50.toInt(),
-            0xFF8BC34A.toInt(), 0xFFCDDC39.toInt(), 0xFFFFC107.toInt(), 0xFFFF9800.toInt(), 0xFFFF5722.toInt(),
-            0xFF795548.toInt(), 0xFF9E9E9E.toInt(), 0xFF607D8B.toInt())
+
     /**
      * Returns a Drawable from its ID.
      *
@@ -123,29 +116,4 @@ object DrawableHelper {
         }
         return userStatusDrawable
     }
-
-    /**
-     * Returns a drawable with the first character from a string.
-     *
-     * @param string The string to get its first character and to get the avatar background color.
-     * @return A drawable with the string first character.
-     */
-    fun getTextDrawable(string: String): Drawable {
-        return TextDrawable.builder()
-                .beginConfig()
-                .useFont(Typeface.SANS_SERIF)
-                .endConfig()
-                .buildRoundRect(TextHelper.getFirstCharacter(string), getAvatarBackgroundColor(string), 4)
-    }
-
-    /**
-     * Returns a background color to be rendered on the avatar.
-     *
-     * @param string Gets the background color based on the provided string.
-     * @return A hexadecimal color.
-     * @see (Rocket.Chat/server/startup/avatar.js)
-     */
-    private fun getAvatarBackgroundColor(string: String): Int {
-        return AVATAR_BACKGROUND_HEXADECIMAL_COLORS[string.length % AVATAR_BACKGROUND_HEXADECIMAL_COLORS.size]
-    }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/app/utils/SvgDecoder.kt

@@ -23,8 +23,8 @@ import com.facebook.imagepipeline.image.QualityInfo
 object SvgDecoder {
     val svgFormat = ImageFormat("SVG_FORMAT", "svg")
     // We do not include the closing ">" since there can be additional information.
-    private val headerTag = "<?xml"
-    private val possibleHeaderTags = arrayOf(ImageFormatCheckerUtils.asciiBytes("<svg"))
+    private val headerTag = "<svg"
+    private val possibleHeaderTags = arrayOf(ImageFormatCheckerUtils.asciiBytes("<?xml"))
 
     /**
      * Custom SVG format checker that verifies that the header of the file corresponds to our [SvgDecoder.headerTag] or [SvgDecoder.possibleHeaderTags].

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

@@ -4,56 +4,32 @@ import chat.rocket.android.authentication.presentation.AuthenticationNavigator
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.helper.NetworkHelper
 import chat.rocket.android.helper.UrlHelper
-import chat.rocket.android.server.domain.*
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.domain.RefreshSettingsInteractor
+import chat.rocket.android.server.domain.SaveCurrentServerInteractor
 import chat.rocket.android.util.extensions.launchUI
 import chat.rocket.common.util.ifNull
-import chat.rocket.core.RocketChatClient
-import chat.rocket.core.internal.rest.settings
-import java.security.InvalidParameterException
 import javax.inject.Inject
 
 class ServerPresenter @Inject constructor(private val view: ServerView,
                                           private val strategy: CancelStrategy,
                                           private val navigator: AuthenticationNavigator,
                                           private val serverInteractor: SaveCurrentServerInteractor,
-                                          private val settingsInteractor: SaveSettingsInteractor,
-                                          private val factory: RocketChatClientFactory) {
-    private lateinit var client: RocketChatClient
-    private var settingsFilter = arrayOf(SITE_URL, SITE_NAME, FAVICON_512, USE_REALNAME, ALLOW_ROOM_NAME_SPECIAL_CHARS, FAVORITE_ROOMS,
-            ACCOUNT_LOGIN_FORM, ACCOUNT_GOOGLE, ACCOUNT_FACEBOOK, ACCOUNT_GITHUB, ACCOUNT_GITLAB, ACCOUNT_LINKEDIN, ACCOUNT_METEOR,
-            ACCOUNT_TWITTER, ACCOUNT_WORDPRESS, LDAP_ENABLE, ACCOUNT_REGISTRATION, STORAGE_TYPE, HIDE_USER_JOIN, HIDE_USER_LEAVE, HIDE_TYPE_AU,
-            HIDE_MUTE_UNMUTE, HIDE_TYPE_RU, ACCOUNT_CUSTOM_FIELDS, ALLOW_MESSAGE_DELETING, ALLOW_MESSAGE_EDITING, ALLOW_MESSAGE_PINNING,
-            SHOW_DELETED_STATUS, SHOW_EDITED_STATUS)
-
+                                          private val refreshSettingsInteractor: RefreshSettingsInteractor) {
     fun connect(server: String) {
         if (!UrlHelper.isValidUrl(server)) {
             view.showInvalidServerUrl()
         } else {
-            try {
-                client = factory.create(server)
-            } catch (exception: InvalidParameterException) {
-                exception.message?.let {
-                    view.showMessage(it)
-                }.ifNull {
-                    view.showGenericErrorMessage()
-                }
-                return
-            }
-
-            client.let { rocketChatClient ->
             launchUI(strategy) {
                 if (NetworkHelper.hasInternetAccess()) {
                     view.showLoading()
 
                     try {
-                            val settings = rocketChatClient.settings(*settingsFilter)
-                            settingsInteractor.save(server, settings)
+                        refreshSettingsInteractor.refresh(server)
                         serverInteractor.save(server)
 
                         navigator.toLogin()
-                        } catch (exception: Exception) {
-                            exception.message?.let {
+                    } catch (ex: Exception) {
+                        ex.message?.let {
                             view.showMessage(it)
                         }.ifNull {
                             view.showGenericErrorMessage()
@@ -67,5 +43,4 @@ class ServerPresenter @Inject constructor(private val view: ServerView,
             }
         }
     }
-    }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/domain/UriInteractor.kt

@@ -2,11 +2,7 @@ package chat.rocket.android.chatroom.domain
 
 import android.content.Context
 import android.net.Uri
-import chat.rocket.android.util.extensions.getFileName
-import chat.rocket.android.util.extensions.getMimeType
-import chat.rocket.android.util.extensions.getRealPathFromURI
-import okio.Okio
-import java.io.File
+import chat.rocket.android.util.extensions.*
 import javax.inject.Inject
 
 
@@ -28,26 +24,7 @@ class UriInteractor @Inject constructor(private val context: Context) {
      */
     fun getRealPath(uri: Uri): String? = uri.getRealPathFromURI(context)
 
-    /**
-     * Save the contents of an [Uri] to a temp file named after uri.getFileName()
-     */
-    fun tempFile(uri: Uri): File? {
-        try {
-            val outputDir = context.cacheDir // context being the Activity pointer
-            val outputFile = File(outputDir, uri.getFileName(context))
-            val from = context.contentResolver.openInputStream(uri)
-
-            Okio.source(from).use { a ->
-                Okio.buffer(Okio.sink(outputFile)).use{ b ->
-                    b.writeAll(a)
-                    b.close()
-                }
-                a.close()
-            }
-            return outputFile
-        } catch (ex: Exception) {
-            ex.printStackTrace()
-            return null
-        }
-    }
+    fun getFileSize(uri: Uri) = uri.getFileSize(context)
+
+    fun getInputStream(uri: Uri) = uri.getInputStream(context)
 }
\ No newline at end of file

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

@@ -15,7 +15,7 @@ import chat.rocket.common.util.ifNull
 import chat.rocket.core.internal.realtime.State
 import chat.rocket.core.internal.realtime.connect
 import chat.rocket.core.internal.realtime.subscribeRoomMessages
-import chat.rocket.core.internal.realtime.unsubscibre
+import chat.rocket.core.internal.realtime.unsubscribe
 import chat.rocket.core.internal.rest.*
 import chat.rocket.core.model.Message
 import chat.rocket.core.model.Value
@@ -24,7 +24,6 @@ import kotlinx.coroutines.experimental.async
 import kotlinx.coroutines.experimental.channels.Channel
 import kotlinx.coroutines.experimental.launch
 import timber.log.Timber
-import java.io.File
 import javax.inject.Inject
 
 class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
@@ -92,32 +91,28 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
         }
     }
 
+    fun selectFile() {
+        view.showFileSelection(settings.uploadMimeTypeFilter())
+    }
+
     fun uploadFile(roomId: String, uri: Uri, msg: String) {
         launchUI(strategy) {
             view.showLoading()
-            var tempFile: File? = null
             try {
                 val fileName = async { uriInteractor.getFileName(uri) }.await()
                 val mimeType = async { uriInteractor.getMimeType(uri) }.await()
-                /* FIXME - this is a workaround for uploading files with the SDK
-                 *
-                 * https://developer.android.com/guide/topics/providers/document-provider.html
-                 *
-                 * We need to use contentResolver.openInputStream(uri) to open this file.
-                 * Since the SDK is not Android specific we cannot pass the Uri and let the
-                 * SDK handle the file.
-                 *
-                 * As a temporary workaround we are saving the contents to a temp file.
-                 *
-                 * A proper solution is to implement some interface to open the InputStream
-                 * and use a RequestBody based on https://github.com/square/okhttp/issues/3585
-                 */
-                tempFile = async { uriInteractor.tempFile(uri) }.await()
+                val fileSize = async { uriInteractor.getFileSize(uri) }.await()
+                val maxFileSize = settings.uploadMaxFileSize()
 
-                if (fileName == null || tempFile == null) {
-                    view.showInvalidFileMessage()
-                } else {
-                    client.uploadFile(roomId, tempFile, mimeType, msg, fileName)
+                when {
+                    fileName.isNullOrEmpty() -> view.showInvalidFileMessage()
+                    fileSize > maxFileSize -> view.showInvalidFileSize(fileSize, maxFileSize)
+                    else -> {
+                        Timber.d("Uploading to $roomId: $fileName - $mimeType")
+                        client.uploadFile(roomId, fileName!!, mimeType, msg, description = fileName) {
+                            uriInteractor.getInputStream(uri)
+                        }
+                    }
                 }
             } catch (ex: RocketChatException) {
                 Timber.d(ex)
@@ -127,13 +122,12 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
                     view.showGenericErrorMessage()
                 }
             } finally {
-                tempFile?.delete()
                 view.hideLoading()
             }
         }
     }
 
-    fun subscribeMessages(roomId: String) {
+    private fun subscribeMessages(roomId: String) {
         client.addStateChannel(stateChannel)
         launch(CommonPool + strategy.jobs) {
             for (status in stateChannel) {
@@ -179,7 +173,7 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
         launch(CommonPool) {
             client.removeStateChannel(stateChannel)
             subId?.let { subscriptionId ->
-                client.unsubscibre(subscriptionId)
+                client.unsubscribe(subscriptionId)
             }
         }
     }

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

@@ -21,6 +21,11 @@ interface ChatRoomView : LoadingView, MessageView {
      */
     fun sendMessage(text: String)
 
+    /**
+     * Perform file selection with the mime type [filter]
+     */
+    fun showFileSelection(filter: Array<String>)
+
     /**
      * Uploads a file to a chat room.
      *
@@ -90,4 +95,6 @@ interface ChatRoomView : LoadingView, MessageView {
      * Clears the message composition.
      */
     fun clearMessageComposition()
+
+    fun showInvalidFileSize(fileSize: Int, maxFileSize: Int)
 }
\ No newline at end of file

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

@@ -222,7 +222,17 @@ class ChatRoomFragment : Fragment(), ChatRoomView {
             text_message.textContent = text
             editingMessageId = messageId
         }
+    }
+
+    override fun showFileSelection(filter: Array<String>) {
+        val intent = Intent(Intent.ACTION_GET_CONTENT)
+        intent.type = "*/*"
+        intent.putExtra(Intent.EXTRA_MIME_TYPES, filter)
+        startActivityForResult(intent, REQUEST_CODE_FOR_PERFORM_SAF)
+    }
 
+    override fun showInvalidFileSize(fileSize: Int, maxFileSize: Int) {
+        showMessage(getString(R.string.max_file_size_exceeded, fileSize, maxFileSize))
     }
 
     private fun setupRecyclerView() {
@@ -277,7 +287,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView {
 
             button_files.setOnClickListener {
                 handler.postDelayed({
-                    performSAF()
+                    presenter.selectFile()
                 }, 300)
 
                 handler.postDelayed({
@@ -327,10 +337,4 @@ class ChatRoomFragment : Fragment(), ChatRoomView {
 
         view_dim.setVisible(false)
     }
-
-    private fun performSAF() {
-        val intent = Intent(Intent.ACTION_GET_CONTENT)
-        intent.type = "*/*"
-        startActivityForResult(intent, REQUEST_CODE_FOR_PERFORM_SAF)
-    }
 }
\ No newline at end of file

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

@@ -4,6 +4,7 @@ import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.server.domain.GetChatRoomsInteractor
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
+import chat.rocket.android.server.domain.RefreshSettingsInteractor
 import chat.rocket.android.server.domain.SaveChatRoomsInteractor
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.extensions.launchUI
@@ -28,6 +29,7 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
                                              private val getChatRoomsInteractor: GetChatRoomsInteractor,
                                              private val saveChatRoomsInteractor: SaveChatRoomsInteractor,
                                              private val localRepository: LocalRepository,
+                                             private val refreshSettingsInteractor: RefreshSettingsInteractor,
                                              factory: RocketChatClientFactory) {
     private val client: RocketChatClient = factory.create(serverInteractor.get()!!)
     private val currentServer = serverInteractor.get()!!
@@ -36,6 +38,7 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
     private val stateChannel = Channel<State>()
 
     fun loadChatRooms() {
+        refreshSettingsInteractor.refreshAsync(currentServer)
         launchUI(strategy) {
             view.showLoading()
             try {

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

@@ -40,7 +40,7 @@ class ChatRoomsAdapter(private val context: Context,
     inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
         fun bind(chatRoom: ChatRoom) = with(itemView) {
-            bindAvatar(chatRoom, layout_avatar, image_avatar, image_room_avatar)
+            bindAvatar(chatRoom, image_avatar)
             bindName(chatRoom, text_chat_name)
             bindLastMessageDateTime(chatRoom, text_last_message_date_time)
             bindLastMessage(chatRoom, text_last_message)
@@ -49,17 +49,8 @@ class ChatRoomsAdapter(private val context: Context,
             setOnClickListener { listener(chatRoom) }
         }
 
-        private fun bindAvatar(chatRoom: ChatRoom, avatarLayout: View, drawee: SimpleDraweeView, imageView: ImageView) {
-            val chatRoomName = chatRoom.name
-            if (chatRoom.type is RoomType.DirectMessage) {
-                drawee.setImageURI(UrlHelper.getAvatarUrl(chatRoom.client.url, chatRoomName))
-                imageView.setVisible(false)
-                avatarLayout.setVisible(true)
-            } else {
-                imageView.setImageDrawable(DrawableHelper.getTextDrawable(chatRoomName))
-                avatarLayout.setVisible(false)
-                imageView.setVisible(true)
-            }
+        private fun bindAvatar(chatRoom: ChatRoom, drawee: SimpleDraweeView) {
+            drawee.setImageURI(UrlHelper.getAvatarUrl(chatRoom.client.url, chatRoom.name))
         }
 
         private fun bindName(chatRoom: ChatRoom, textView: TextView) {

app/src/main/java/chat/rocket/android/server/domain/RefreshSettingsInteractor.kt

+package chat.rocket.android.server.domain
+
+import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.core.internal.rest.settings
+import kotlinx.coroutines.experimental.CommonPool
+import kotlinx.coroutines.experimental.async
+import kotlinx.coroutines.experimental.withContext
+import javax.inject.Inject
+
+class RefreshSettingsInteractor @Inject constructor(private val factory: RocketChatClientFactory,
+                                                    private val repository: SettingsRepository) {
+
+    private var settingsFilter = arrayOf(
+        SITE_URL, SITE_NAME, FAVICON_512, USE_REALNAME, ALLOW_ROOM_NAME_SPECIAL_CHARS,
+        FAVORITE_ROOMS, ACCOUNT_LOGIN_FORM, ACCOUNT_GOOGLE, ACCOUNT_FACEBOOK, ACCOUNT_GITHUB,
+        ACCOUNT_GITLAB, ACCOUNT_LINKEDIN, ACCOUNT_METEOR, ACCOUNT_TWITTER, ACCOUNT_WORDPRESS,
+        LDAP_ENABLE, ACCOUNT_REGISTRATION, UPLOAD_STORAGE_TYPE, UPLOAD_MAX_FILE_SIZE,
+        UPLOAD_WHITELIST_MIMETYPES, HIDE_USER_JOIN, HIDE_USER_LEAVE, HIDE_TYPE_AU, HIDE_MUTE_UNMUTE,
+        HIDE_TYPE_RU, ACCOUNT_CUSTOM_FIELDS, ALLOW_MESSAGE_DELETING, ALLOW_MESSAGE_EDITING,
+        ALLOW_MESSAGE_PINNING, SHOW_DELETED_STATUS, SHOW_EDITED_STATUS)
+
+    suspend fun refresh(server: String) {
+        withContext(CommonPool) {
+            factory.create(server).let { client ->
+                val settings = client.settings(*settingsFilter)
+                repository.save(server, settings)
+            }
+        }
+    }
+
+    fun refreshAsync(server: String) {
+        async {
+            try {
+                refresh(server)
+            } catch (ex: Exception) {
+                ex.printStackTrace()
+            }
+        }
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/server/domain/SettingsRepository.kt

 package chat.rocket.android.server.domain
 
+import chat.rocket.android.util.extensions.mapToTypedArray
 import chat.rocket.core.model.Value
 
 typealias PublicSettings = Map<String, Value<Any>>
@@ -28,7 +29,9 @@ const val USE_REALNAME = "UI_Use_Real_Name"
 const val ALLOW_ROOM_NAME_SPECIAL_CHARS = "UI_Allow_room_names_with_special_chars"
 const val FAVORITE_ROOMS = "Favorite_Rooms"
 const val LDAP_ENABLE = "LDAP_Enable"
-const val STORAGE_TYPE = "FileUpload_Storage_Type"
+const val UPLOAD_STORAGE_TYPE = "FileUpload_Storage_Type"
+const val UPLOAD_MAX_FILE_SIZE = "FileUpload_MaxFileSize"
+const val UPLOAD_WHITELIST_MIMETYPES = "FileUpload_MediaTypeWhiteList"
 const val HIDE_USER_JOIN = "Message_HideType_uj"
 const val HIDE_USER_LEAVE = "Message_HideType_ul"
 const val HIDE_TYPE_AU = "Message_HideType_au"
@@ -67,3 +70,16 @@ fun Map<String, Value<Any>>.registrationEnabled(): Boolean {
     val value = this[ACCOUNT_REGISTRATION]
     return value?.value == "Public"
 }
+
+fun Map<String, Value<Any>>.uploadMimeTypeFilter(): Array<String> {
+    val values = this[UPLOAD_WHITELIST_MIMETYPES]?.value
+    values?.let { it as String }?.split(",")?.let {
+        return it.mapToTypedArray { it.trim() }
+    }
+
+    return arrayOf("*/*")
+}
+
+fun Map<String, Value<Any>>.uploadMaxFileSize(): Int {
+    return this[UPLOAD_MAX_FILE_SIZE]?.value?.let { it as Int } ?: Int.MAX_VALUE
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/util/extensions/Collections.kt

+package chat.rocket.android.util.extensions
+
+inline fun <T, reified R> List<T>.mapToTypedArray(transform: (T) -> R): Array<R> {
+    return when (this) {
+        is RandomAccess -> Array(size) { index -> transform(this[index]) }
+        else -> with(iterator()) { Array(size) { transform(next()) } }
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/util/extensions/Text.kt

 package chat.rocket.android.util.extensions
 
-import android.content.ContentResolver
-import android.content.Context
-import android.net.Uri
 import android.widget.TextView
-import android.provider.OpenableColumns
-import android.webkit.MimeTypeMap
-import android.provider.MediaStore
 import ru.noties.markwon.Markwon
 
 fun String.ifEmpty(value: String): String {
@@ -44,49 +38,3 @@ var TextView.content: CharSequence
         Markwon.scheduleDrawables(this)
         Markwon.scheduleTableRows(this)
     }
\ No newline at end of file
-
-fun Uri.getFileName(context: Context): String? {
-    val cursor = context.contentResolver.query(this, null, null, null, null, null)
-
-    var fileName: String? = null
-    cursor.use { cursor ->
-        if (cursor != null && cursor.moveToFirst()) {
-            fileName = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME))
-        }
-    }
-    return fileName
-}
-
-fun Uri.getFileSize(context: Context): String? {
-    val cursor = context.contentResolver.query(this, null, null, null, null, null)
-
-    var fileSize: String? = null
-    cursor.use { cursor ->
-        val sizeIndex = cursor.getColumnIndex(OpenableColumns.SIZE)
-        if (cursor != null && cursor.moveToFirst()) {
-            if (!cursor.isNull(sizeIndex)) {
-                fileSize = cursor.getString(sizeIndex)
-            }
-        }
-    }
-    return fileSize
-}
-
-fun Uri.getMimeType(context: Context): String {
-    return if (scheme == ContentResolver.SCHEME_CONTENT) {
-        context.contentResolver.getType(this)
-    } else {
-        val fileExtension = MimeTypeMap.getFileExtensionFromUrl(toString())
-        MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExtension.toLowerCase())
-    }
-}
-
-fun Uri.getRealPathFromURI(context: Context): String? {
-    val cursor = context.contentResolver.query(this, arrayOf(MediaStore.Images.Media.DATA), null, null, null)
-
-    cursor.use { cursor ->
-        val columnIndex = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA)
-        cursor.moveToFirst()
-        return cursor.getString(columnIndex)
-    }
-}
\ No newline at end of file

app/src/main/java/chat/rocket/android/util/extensions/Uri.kt

+package chat.rocket.android.util.extensions
+
+import android.annotation.TargetApi
+import android.content.ContentResolver
+import android.content.Context
+import android.net.Uri
+import android.os.Build
+import android.provider.DocumentsContract
+import android.provider.MediaStore
+import android.provider.OpenableColumns
+import android.webkit.MimeTypeMap
+import java.io.FileInputStream
+import java.io.FileNotFoundException
+import java.io.IOException
+import java.io.InputStream
+
+fun Uri.getFileName(context: Context): String? {
+    val cursor = context.contentResolver.query(this, null, null, null, null, null)
+
+    var fileName: String? = null
+    cursor.use { cursor ->
+        if (cursor != null && cursor.moveToFirst()) {
+            fileName = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME))
+        }
+    }
+    return fileName
+}
+
+fun Uri.getFileSize(context: Context): Int {
+    val cursor = context.contentResolver.query(this, null, null, null, null, null)
+
+    var fileSize: String? = null
+    cursor.use { cursor ->
+        val sizeIndex = cursor.getColumnIndex(OpenableColumns.SIZE)
+        if (cursor != null && cursor.moveToFirst()) {
+            if (!cursor.isNull(sizeIndex)) {
+                fileSize = cursor.getString(sizeIndex)
+            }
+        }
+    }
+    return fileSize?.toIntOrNull() ?: -1
+}
+
+fun Uri.getMimeType(context: Context): String {
+    return if (scheme == ContentResolver.SCHEME_CONTENT) {
+        context.contentResolver.getType(this)
+    } else {
+        val fileExtension = MimeTypeMap.getFileExtensionFromUrl(toString())
+        MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExtension.toLowerCase())
+    }
+}
+
+fun Uri.getRealPathFromURI(context: Context): String? {
+    val cursor = context.contentResolver.query(this, arrayOf(MediaStore.Images.Media.DATA), null, null, null)
+
+    cursor.use { cursor ->
+        val columnIndex = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA)
+        cursor.moveToFirst()
+        return cursor.getString(columnIndex)
+    }
+}
+
+@TargetApi(Build.VERSION_CODES.N)
+fun Uri.isVirtualFile(context: Context): Boolean {
+    if (!DocumentsContract.isDocumentUri(context, this)) {
+        return false
+    }
+
+    val cursor = context.contentResolver.query(this,
+            arrayOf(DocumentsContract.Document.COLUMN_FLAGS),
+            null, null, null)
+
+    var flags = 0
+    if (cursor.moveToFirst()) {
+        flags = cursor.getInt(0)
+    }
+    cursor.close()
+
+    return flags and DocumentsContract.Document.FLAG_VIRTUAL_DOCUMENT != 0
+}
+
+@Throws(IOException::class)
+fun Uri.getInputStreamForVirtualFile(context: Context, mimeTypeFilter: String): FileInputStream? {
+
+    val resolver = context.contentResolver
+
+    val openableMimeTypes = resolver.getStreamTypes(this, mimeTypeFilter)
+
+    if (openableMimeTypes == null || openableMimeTypes.isEmpty()) {
+        throw FileNotFoundException()
+    }
+
+    return resolver.openTypedAssetFileDescriptor(this, openableMimeTypes[0],
+            null)?.createInputStream()
+}
+
+fun Uri.getInputStream(context: Context): InputStream? {
+    if (isVirtualFile(context)) {
+        return getInputStreamForVirtualFile(context, "*/*")
+    }
+
+    return context.contentResolver.openInputStream(this)
+}
\ No newline at end of file

app/src/main/res/layout/avatar.xml

@@ -9,6 +9,6 @@
         android:id="@+id/image_avatar"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        app:roundedCornerRadius="2dp" />
+        app:roundedCornerRadius="3dp" />
 
 </LinearLayout>
\ No newline at end of file

app/src/main/res/layout/item_chat.xml

@@ -9,33 +9,15 @@
     android:layout_marginStart="@dimen/screen_edge_left_and_right_margins"
     android:layout_marginTop="12dp">
 
-    <android.support.constraint.ConstraintLayout
-        android:id="@+id/avatar_container"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@+id/middle_container"
-        app:layout_constraintTop_toTopOf="parent">
-
     <include
         android:id="@+id/layout_avatar"
         layout="@layout/avatar"
         android:layout_width="40dp"
         android:layout_height="40dp"
-            android:visibility="gone" />
-
-        <!-- We need to build the avatar with initials since the server returns a SVG file with a pre defined 50x50 pixel.
-            TODO: check to scale the SVG file on the app and remove the view bellow (or make the server to return a jpg file.
-            SVG scaling with fresco is impossible: http://frescolib.org/docs/resizing.html
-         -->
-        <ImageView
-            android:id="@+id/image_room_avatar"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:visibility="gone"
-            tools:ignore="contentDescription" />
-    </android.support.constraint.ConstraintLayout>
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/middle_container"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <android.support.constraint.ConstraintLayout
         android:id="@+id/middle_container"
@@ -43,7 +25,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:layout_marginStart="16dp"
-        app:layout_constraintLeft_toRightOf="@+id/avatar_container"
+        app:layout_constraintLeft_toRightOf="@+id/layout_avatar"
         app:layout_constraintRight_toLeftOf="@+id/right_container">
 
         <TextView

app/src/main/res/values-pt-rBR/strings.xml

@@ -80,4 +80,7 @@
     <!-- Pinned Messages -->
     <string name="title_pinned_messages">Mensagens Pinadas</string>
 
+    <!-- Upload Messages -->
+    <string name="max_file_size_exceeded">Tamanho de arquivo (%1$d bytes) excedeu tamanho máximo de upload (%2$d bytes)</string>
+
 </resources>
\ No newline at end of file

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

@@ -82,4 +82,7 @@
     <!-- Pinned Messages -->
     <string name="title_pinned_messages">Pinned Messages</string>
 
+    <!-- Upload Messages -->
+    <string name="max_file_size_exceeded">File size %1$d bytes exceeded max upload size of %2$d bytes</string>
+
 </resources>
\ No newline at end of file

build.gradle

@@ -13,7 +13,7 @@ buildscript {
         classpath "com.android.tools.build:gradle:3.0.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
-        classpath 'com.google.gms:google-services:3.1.2'
+        classpath 'com.google.gms:google-services:3.2.0'
         classpath 'io.fabric.tools:gradle:1.+'
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -27,7 +27,6 @@ allprojects {
         jcenter()
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
         maven { url "https://jitpack.io" }
-        maven { url "http://dl.bintray.com/amulyakhare/maven" } // For TextDrawable.
     }
 
     apply from: rootProject.file('dependencies.gradle')

dependencies.gradle

@@ -25,12 +25,10 @@ ext {
         fresco                 : '1.7.1',
         kotshi                 : '0.3.0',
         frescoImageViewer      : '0.5.0',
-        androidSvg             : '1.2.1',
-        aVLoadingIndicatorView : '2.1.3',
+        androidSvg             : 'master-SNAPSHOT',
         markwon                : '1.0.3',
-        textDrawable           : '1.0.2', // Remove this library after https://github.com/RocketChat/Rocket.Chat/pull/9492 is merged
-        moshiLazyAdapters      : '2.1', // Even declared on the SDK we need to add this library here because java.lang.NoClassDefFoundError: Failed resolution of: Lcom/serjltt/moshi/adapters/FallbackEnum;
         sheetMenu              : '1.3.3',
+        aVLoadingIndicatorView : '2.1.3',
 
         // For testing
         junit                  : '4.12',
@@ -84,20 +82,15 @@ ext {
         kotshiCompiler         : "se.ansman.kotshi:compiler:${versions.kotshi}",
 
         frescoImageViewer      : "com.github.stfalcon:frescoimageviewer:${versions.frescoImageViewer}",
-
-        androidSvg             : "com.caverock:androidsvg:${versions.androidSvg}",
-
-        aVLoadingIndicatorView : "com.wang.avi:library:${versions.aVLoadingIndicatorView}",
-
-        textDrawable           : "com.github.rocketchat:textdrawable:${versions.textDrawable}",
+        androidSvg             : "com.github.BigBadaboom:androidsvg:${versions.androidSvg}",
 
         markwon                : "ru.noties:markwon:${versions.markwon}",
         markwonImageLoader     : "ru.noties:markwon-image-loader:${versions.markwon}",
 
-        moshiLazyAdapters      : "com.serjltt.moshi:moshi-lazy-adapters:${versions.moshiLazyAdapters}",
-
         sheetMenu              : "com.github.whalemare:sheetmenu:${versions.sheetMenu}",
 
+        aVLoadingIndicatorView : "com.wang.avi:library:${versions.aVLoadingIndicatorView}",
+
         // For testing
         junit         : "junit:junit:$versions.junit",
         expressoCore  : "com.android.support.test.espresso:espresso-core:${versions.expresso}",