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/ShareWithActivity.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java') diff --git a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java index 90333cfe..8cd017bf 100644 --- a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java @@ -296,10 +296,10 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer } }; if (account.httpUploadAvailable() - && ( - (share.image && !neverCompressPictures()) + && ((share.image && !neverCompressPictures()) || conversation.getMode() == Conversation.MODE_MULTI - || FileBackend.allFilesUnderSize(this, share.uris, max))) { + || FileBackend.allFilesUnderSize(this, share.uris, max)) + && conversation.getNextEncryption() != Message.ENCRYPTION_OTR) { callback.onPresenceSelected(); } else { selectPresence(conversation, callback); -- cgit v1.2.3