From 40e46ed8fae76ead976e65e2a2db6a116befe13a Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 23 Nov 2018 13:11:51 +0100 Subject: [PATCH] make sure that conversation is 1:1 before offering to select presence on file resend --- .../java/eu/siacs/conversations/ui/ConversationFragment.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 958dda384..2d56703e5 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -1694,6 +1694,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke final XmppConnection xmppConnection = conversation.getAccount().getXmppConnection(); if (!message.hasFileOnRemoteHost() && xmppConnection != null + && conversation.getMode() == Conversational.MODE_SINGLE && !xmppConnection.getFeatures().httpUpload(message.getFileParams().size)) { activity.selectPresence(conversation, () -> { message.setCounterpart(conversation.getNextCounterpart());