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

Don't merge messages with different trust statuses

This commit is contained in:
Andreas Straub 2015-07-15 15:45:12 +02:00
parent fca0c36757
commit e8ec2ee628
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/eu/siacs/conversations/entities/Message.java
View File

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