require encrypted to be the same for messages to get merged

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

@@ -315,8 +315,10 @@ public class Message extends AbstractEntity {
 		if (message == null) {
 			return false;
 		}
-		return (this.getType() == Message.TYPE_TEXT
+		return (message.getType() == Message.TYPE_TEXT
+				&& message.getEncryption() != Message.ENCRYPTION_PGP
 				&& this.getType() == message.getType()
+				&& this.getEncryption() == message.getEncryption()
 				&& this.getCounterpart().equals(message.getCounterpart())
 				&& (message.getTimeSent() - this.getTimeSent()) <= 20000 && ((this
 				.getStatus() == message.getStatus()) || (this.getStatus() == Message.STATUS_SEND && message