Merge pull request #1596 from RocketChat/fix/file-size-validation

[FIX] File size validation

Merge pull request #1596 from RocketChat/fix/file-size-validation
[FIX] File size validation
2e627aaa · Filipe de Lima Brito · GitHub · b404ba00 · 5cf023b3 · 2e627aaa
Unverified Commit 2e627aaa authored Aug 16, 2018 by Filipe de Lima Brito Committed by GitHub Aug 16, 2018
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

ChatRoomPresenter.kt ...rocket/android/chatroom/presentation/ChatRoomPresenter.kt +2 -5

No files found.
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
@@ -338,12 +338,9 @@ class ChatRoomPresenter @Inject constructor(
                    val maxFileSizeAllowed = settings.uploadMaxFileSize()

                    when {
-                        fileName.isEmpty() -> {
-                            view.showInvalidFileMessage()
-                        }
-                        fileSize > maxFileSizeAllowed -> {
+                        fileName.isEmpty() -> view.showInvalidFileMessage()
+                        fileSize > maxFileSizeAllowed && maxFileSizeAllowed !in -1..0 ->
                            view.showInvalidFileSize(fileSize, maxFileSizeAllowed)
-                        }
                        else -> {
                            var inputStream: InputStream? = uriInteractor.getInputStream(uri)