Merge branch 'beta' into i18n/russian-translation

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

 package chat.rocket.android.chatroom.presentation
 
+import android.graphics.Bitmap
 import android.net.Uri
 import chat.rocket.android.R
 import chat.rocket.android.analytics.AnalyticsManager
@@ -80,6 +81,7 @@ import org.threeten.bp.Instant
 import timber.log.Timber
 import java.io.InputStream
 import java.util.*
+import java.util.zip.DeflaterInputStream
 import javax.inject.Inject
 
 class ChatRoomPresenter @Inject constructor(
@@ -331,7 +333,7 @@ class ChatRoomPresenter @Inject constructor(
         view.showFileSelection(settings.uploadMimeTypeFilter())
     }
 
-    fun uploadFile(roomId: String, uri: Uri, msg: String) {
+    fun uploadFile(roomId: String, uri: Uri, msg: String, bitmap: Bitmap? = null) {
         launchUI(strategy) {
             view.showLoading()
             try {
@@ -348,12 +350,8 @@ class ChatRoomPresenter @Inject constructor(
                         else -> {
                             var inputStream: InputStream? = uriInteractor.getInputStream(uri)
 
-                            if (mimeType.contains("image")) {
-                                uriInteractor.getBitmap(uri)?.let {
-                                    it.compressImageAndGetInputStream(mimeType)?.let {
-                                        inputStream = it
-                                    }
-                                }
+                            bitmap?.compressImageAndGetInputStream(mimeType)?.let {
+                                inputStream = it
                             }
 
                             retryIO("uploadFile($roomId, $fileName, $mimeType") {

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

 package chat.rocket.android.chatroom.ui
 
+import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import androidx.core.view.isVisible
+import chat.rocket.android.emoji.internal.GlideApp
 import chat.rocket.android.util.extensions.getFileName
 import chat.rocket.android.util.extensions.getMimeType
+import com.bumptech.glide.request.target.SimpleTarget
+import com.bumptech.glide.request.transition.Transition
 
 fun ChatRoomFragment.showFileAttachmentDialog(uri: Uri) {
-    activity?.let { fragmentActivity ->
-        uri.getMimeType(fragmentActivity).let { mimeType ->
+    var bitmap: Bitmap? = null
+
+    activity?.let { context ->
+        uri.getMimeType(context).let { mimeType ->
             description.text.clear()
             when {
                 mimeType.startsWith("image") -> {
-                    imagePreview.isVisible = true
-                    imagePreview.setImageURI(uri)
-                }
-                mimeType.startsWith("video") -> {
-                    audioVideoAttachment.isVisible = true
+                    GlideApp
+                        .with(context)
+                        .asBitmap()
+                        .load(uri)
+                        .override(500, 500)
+                        .centerCrop()
+                        .into(object : SimpleTarget<Bitmap>() {
+                            override fun onResourceReady(
+                                resource: Bitmap,
+                                transition: Transition<in Bitmap>?
+                            ) {
+                                bitmap = resource
+                                imagePreview.isVisible = true
+                                imagePreview.setImageBitmap(resource)
+                            }
+                        })
                 }
+                mimeType.startsWith("video") -> audioVideoAttachment.isVisible = true
                 else -> {
                     textFile.isVisible = true
-                    textFile.text = uri.getFileName(fragmentActivity)
+                    textFile.text = uri.getFileName(context)
                 }
             }
         }
     }
 
     sendButton.setOnClickListener {
-        presenter.uploadFile(chatRoomId, uri, (citation ?: "") + description.text.toString())
+        presenter.uploadFile(
+            chatRoomId,
+            uri,
+            (citation ?: "") + description.text.toString(),
+            bitmap
+        )
         alertDialog.dismiss()
     }
     cancelButton.setOnClickListener { alertDialog.dismiss() }

app/src/main/java/chat/rocket/android/files/uimodel/FileUiModel.kt

@@ -34,8 +34,8 @@ class FileUiModel(
     }
 
     private fun getUserDisplayName(): String {
-        val username = "@${genericAttachment.user?.username}"
-        val realName = genericAttachment.user?.name
+        val username = "@${genericAttachment.user.username}"
+        val realName = genericAttachment.user.name
         val uploaderName = if (settings.useRealName()) realName else username
         return uploaderName ?: username
     }

app/src/main/java/chat/rocket/android/server/infraestructure/SharedPreferencesAccountsRepository.kt

@@ -14,12 +14,12 @@ class SharedPreferencesAccountsRepository(
     private val moshi: Moshi
 ) : AccountsRepository {
 
-    override fun save(newAccount: Account) {
+    override fun save(account: Account) {
         val accounts = load()
 
-        val newList = accounts.filter { account -> newAccount.serverUrl != account.serverUrl }
+        val newList = accounts.filter { it.serverUrl != it.serverUrl }
             .toMutableList()
-        newList.add(0, newAccount)
+        newList.add(0, account)
         save(newList)
     }
 

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

@@ -10,15 +10,19 @@ import android.provider.DocumentsContract
 import android.provider.MediaStore
 import android.provider.OpenableColumns
 import android.webkit.MimeTypeMap
-import java.io.*
+import java.io.File
+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))
+    cursor?.use {
+        if (it.moveToFirst()) {
+            fileName = it.getString(it.getColumnIndex(OpenableColumns.DISPLAY_NAME))
         }
     }
     return fileName
@@ -29,7 +33,7 @@ fun Uri.getFileSize(context: Context): Int {
     if (scheme == ContentResolver.SCHEME_CONTENT) {
         try {
             val fileInputStream = context.contentResolver.openInputStream(this)
-            fileSize = fileInputStream.available().toString()
+            fileSize = fileInputStream?.available().toString()
         } catch (e: Exception) {
             e.printStackTrace()
         }
@@ -67,14 +71,17 @@ fun Uri.isVirtualFile(context: Context): Boolean {
     val cursor = context.contentResolver.query(
         this,
         arrayOf(DocumentsContract.Document.COLUMN_FLAGS),
-        null, null, null
+        null,
+        null,
+        null
     )
 
     var flags = 0
-    if (cursor.moveToFirst()) {
-        flags = cursor.getInt(0)
+    cursor?.use {
+        if (it.moveToFirst()) {
+            flags = it.getInt(0)
+        }
     }
-    cursor.close()
 
     return flags and DocumentsContract.Document.FLAG_VIRTUAL_DOCUMENT != 0
 }
@@ -104,4 +111,4 @@ fun Uri.getInputStream(context: Context): InputStream? {
 
 fun Uri.getBitmpap(context: Context): Bitmap? {
     return MediaStore.Images.Media.getBitmap(context.contentResolver, this)
-}
+}
\ No newline at end of file