From 701742f5500ade311741c8af59fcd73181a6e6f6 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 2 Apr 2016 18:07:38 +0200 Subject: don't ask for resource when server uses http upload v0.1 --- src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationActivity.java') diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 42252ede..184b5dc6 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -1317,8 +1317,7 @@ public class ConversationActivity extends XmppActivity } } }; - if (max <= 0 - || c.getMode() == Conversation.MODE_MULTI + if (c.getMode() == Conversation.MODE_MULTI || FileBackend.allFilesUnderSize(this, uris, max) || c.getNextEncryption() == Message.ENCRYPTION_OTR) { callback.onPresenceSelected(); -- cgit v1.2.3