diff options
author | Christian Schneppe <christian@pix-art.de> | 2017-08-01 10:49:44 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2017-08-01 10:49:44 +0200 |
commit | 9946cd074f0c34d9b820bffa840e9f6726039d35 (patch) | |
tree | 768c544ef577502e8098fb200ce965c9c1c8d148 | |
parent | e879c6e1c2e2d56c1d1818460fc3b870fa39869e (diff) |
do not keep files in waiting when file size exceeds http upload limit in groups
Diffstat (limited to '')
-rw-r--r-- | src/main/java/de/pixart/messenger/services/XmppConnectionService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java index d8f69b6e9..06db41562 100644 --- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java +++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java @@ -1334,6 +1334,7 @@ public class XmppConnectionService extends Service { case Message.ENCRYPTION_NONE: if (message.needsUploading()) { if (account.httpUploadAvailable(fileBackend.getFile(message, false).getSize()) + || conversation.getMode() == Conversation.MODE_MULTI || message.fixCounterpart()) { this.sendFileMessage(message, delay); } else { @@ -1347,6 +1348,7 @@ public class XmppConnectionService extends Service { case Message.ENCRYPTION_DECRYPTED: if (message.needsUploading()) { if (account.httpUploadAvailable(fileBackend.getFile(message, false).getSize()) + || conversation.getMode() == Conversation.MODE_MULTI || message.fixCounterpart()) { this.sendFileMessage(message, delay); } else { @@ -1384,6 +1386,7 @@ public class XmppConnectionService extends Service { message.setFingerprint(account.getAxolotlService().getOwnFingerprint()); if (message.needsUploading()) { if (account.httpUploadAvailable(fileBackend.getFile(message, false).getSize()) + || conversation.getMode() == Conversation.MODE_MULTI || message.fixCounterpart()) { this.sendFileMessage(message, delay); } else { |