Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into new/answers-analytics

66f1f89e · Filipe de Lima Brito · ad37af44 · 2e627aaa · 66f1f89e
Commit 66f1f89e authored Aug 20, 2018 by Filipe de Lima Brito
Hide 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
@@ -333,12 +333,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)