Merge branch 'develop' into new/answers-analytics

ad15a36b · Filipe de Lima Brito · 66f1f89e · 54b6b4ca · ad15a36b
Commit ad15a36b authored Aug 21, 2018 by Filipe de Lima Brito
Show 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
@@ -387,9 +387,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(