Merge branch 'develop' into patch-1

7c5b4974 · Filipe de Lima Brito · GitHub · abac2f3d · 54b6b4ca · 7c5b4974
Unverified Commit 7c5b4974 authored Aug 21, 2018 by Filipe de Lima Brito Committed by GitHub Aug 21, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

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

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
@@ -389,9 +389,8 @@ class ChatRoomPresenter @Inject constructor(
                    val maxFileSizeAllowed = settings.uploadMaxFileSize()

                    when {
-                        fileSize > maxFileSizeAllowed -> {
+                        fileSize > maxFileSizeAllowed && maxFileSizeAllowed !in -1..0 ->
                            view.showInvalidFileSize(fileSize, maxFileSizeAllowed)
-                        }
                        else -> {
                            retryIO("uploadFile($roomId, $fileName, $mimeType") {
                                client.uploadFile(