From 9946cd074f0c34d9b820bffa840e9f6726039d35 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Tue, 1 Aug 2017 10:49:44 +0200
Subject: do not keep files in waiting when file size exceeds http upload limit
 in groups

---
 src/main/java/de/pixart/messenger/services/XmppConnectionService.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/main/java/de/pixart/messenger/services/XmppConnectionService.java')

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 {
-- 
cgit v1.2.3