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

do not accept LMC for files

This commit is contained in:
Daniel Gultsch 2017-06-02 13:00:02 +02:00
parent 612e0afa63
commit e722ef6477
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/entities/Conversation.java
View File

@ -268,7 +268,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
if (counterpart.equals(message.getCounterpart()) if (counterpart.equals(message.getCounterpart())
&& ((message.getStatus() == Message.STATUS_RECEIVED) == received) && ((message.getStatus() == Message.STATUS_RECEIVED) == received)
&& (carbon == message.isCarbon() || received) ) { && (carbon == message.isCarbon() || received) ) {
if (id.equals(message.getRemoteMsgId())) { if (id.equals(message.getRemoteMsgId()) && !message.isFileOrImage() && !message.treatAsDownloadable()) {
return message; return message;
} else { } else {
return null; return null;