diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-04-06 22:41:21 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-04-06 22:41:21 +0200 |
| commit | 18548e9ebb246071f0bc46ca3bb07a300176cf24 (patch) | |
| tree | af1e572162c4966bf0a871f1c0790d32dfd05bc9 /src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java | |
| parent | 1e1f7f419ecbe9db44acb84fd06c7b889d1af475 (diff) | |
Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferences
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java')
| -rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java index 51fe92bb..8a61e00c 100644 --- a/src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java @@ -306,8 +306,7 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer }; } if (account.httpUploadAvailable() - && ((share.image && !neverCompressPictures()) - || conversation.getMode() == Conversation.MODE_MULTI + && (conversation.getMode() == Conversation.MODE_MULTI || FileUtils.allFilesUnderSize(this, share.uris, max)) && conversation.getNextEncryption() != Message.ENCRYPTION_OTR) { callback.onPresenceSelected(); |