sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make sure that conversation is 1:1 before offering to select presence on file resend

This commit is contained in:
Daniel Gultsch 2018-11-23 13:11:51 +01:00
parent b2d02e3c0f
commit 40e46ed8fa
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View File

@ -1694,6 +1694,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
final XmppConnection xmppConnection = conversation.getAccount().getXmppConnection(); final XmppConnection xmppConnection = conversation.getAccount().getXmppConnection();
if (!message.hasFileOnRemoteHost() if (!message.hasFileOnRemoteHost()
&& xmppConnection != null && xmppConnection != null
&& conversation.getMode() == Conversational.MODE_SINGLE
&& !xmppConnection.getFeatures().httpUpload(message.getFileParams().size)) { && !xmppConnection.getFeatures().httpUpload(message.getFileParams().size)) {
activity.selectPresence(conversation, () -> { activity.selectPresence(conversation, () -> {
message.setCounterpart(conversation.getNextCounterpart()); message.setCounterpart(conversation.getNextCounterpart());