don't merge downloadable messages

iNPUTmice created 11 years ago

Change summary

src/eu/siacs/conversations/entities/Message.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

Detailed changes

src/eu/siacs/conversations/entities/Message.java

@@ -327,7 +327,9 @@ public class Message extends AbstractEntity {
 				.getStatus() == Message.STATUS_SEND_RECEIVED) && (message
 				.getStatus() == Message.STATUS_UNSEND
 				|| message.getStatus() == Message.STATUS_SEND || message
-					.getStatus() == Message.STATUS_SEND_DISPLAYED)))));
+					.getStatus() == Message.STATUS_SEND_DISPLAYED))))
+				&& !message.bodyContainsDownloadable()
+				&& !this.bodyContainsDownloadable());
 	}
 
 	public String getMergedBody() {