aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-05-19 20:37:23 +0200
committerChristian Schneppe <christian@pix-art.de>2017-05-19 20:37:23 +0200
commit1391da0737ddafd07a05120b612ad8f4533dd2fb (patch)
tree728a2c37612bcd59406ecfb00a7d2360b4911383
parenta82d52a8544a7dd55a8ee69df2134ca75c43624d (diff)
fall back to jingle only in 1:1
-rw-r--r--src/main/java/de/pixart/messenger/services/XmppConnectionService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index f8842953d..61a9d2318 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -1285,7 +1285,8 @@ public class XmppConnectionService extends Service {
private void sendFileMessage(final Message message, final boolean delay) {
Log.d(Config.LOGTAG, "send file message");
final Account account = message.getConversation().getAccount();
- if (account.httpUploadAvailable(fileBackend.getFile(message, false).getSize())) {
+ if (account.httpUploadAvailable(fileBackend.getFile(message, false).getSize())
+ || message.getConversation().getMode() == Conversation.MODE_MULTI) {
mHttpConnectionManager.createNewUploadConnection(message, delay);
} else {
mJingleConnectionManager.createNewConnection(message);