Don't merge messages with different trust statuses

Andreas Straub created 10 years ago

Change summary

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

Detailed changes

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

@@ -399,7 +399,8 @@ public class Message extends AbstractEntity {
 						!message.getBody().startsWith(ME_COMMAND) &&
 						!this.getBody().startsWith(ME_COMMAND) &&
 						!this.bodyIsHeart() &&
-						!message.bodyIsHeart()
+						!message.bodyIsHeart() &&
+						this.isTrusted() == message.isTrusted()
 				);
 	}
 
@@ -679,4 +680,9 @@ public class Message extends AbstractEntity {
 	public String getAxolotlFingerprint() {
 		return axolotlFingerprint;
 	}
+
+	public boolean isTrusted() {
+		return conversation.getAccount().getAxolotlService().getFingerprintTrust(axolotlFingerprint)
+				== AxolotlService.SQLiteAxolotlStore.Trust.TRUSTED;
+	}
 }