moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-05 16:55:03 -05:00
Code Issues Releases Wiki Activity

do not keep files in waiting when file size exceeds http upload limit in groups. fixes #2533

Browse Source
This commit is contained in:
Daniel Gultsch 2017-07-01 19:31:48 +02:00
parent 2b9cdde558
commit 7cf360fabf
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -1231,6 +1231,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 {
@ -1244,6 +1245,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 {
@ -1281,6 +1283,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 {