aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-11-30 21:07:34 +0100
committerChristian Schneppe <christian@pix-art.de>2018-11-30 21:07:34 +0100
commitfaf18982c13bbc2f70d23bca13670d9b91617d76 (patch)
tree4b6b1a16109d6dea9b86f14031e1af6b764484d6 /src/main
parent17a326ecb42bb0472d2005bbf40e4f96784c3f49 (diff)
make sure that conversation is 1:1 before offering to select presence on file resend
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationFragment.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 949dba90d..f71a8e704 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -1933,6 +1933,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());