aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-09-19 22:02:42 +0200
committerChristian Schneppe <christian@pix-art.de>2016-09-19 22:02:42 +0200
commitac7a486074b3dd596b5456f7a8306a91bdf8c98a (patch)
treee992949ef60d08619364da99bd00ea08476d3419 /src/main/java/de
parent32ec1789762241c3b2463b2e662084ce2eff399a (diff)
add missing condition to ShareWithActivity
Diffstat (limited to 'src/main/java/de')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ShareWithActivity.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java
index 161711b81..9a6adf10a 100644
--- a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java
@@ -320,6 +320,7 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer
};
if (account.httpUploadAvailable()
&& ((share.image && !neverCompressPictures())
+ || share.video
|| conversation.getMode() == Conversation.MODE_MULTI
|| FileBackend.allFilesUnderSize(this, share.uris, max))
&& conversation.getNextEncryption() != Message.ENCRYPTION_OTR) {