aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/entities
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-11-24 21:53:43 +0100
committerChristian Schneppe <christian@pix-art.de>2016-11-24 21:53:43 +0100
commite75acffa61b46a6320ca0341252b720b0609536b (patch)
tree7e65a6aa8d7dd4d0b2378ce8832156072510d045 /src/main/java/de/pixart/messenger/entities
parent13fda37f57578846aff5fdd0ec3cb323fb234b29 (diff)
changed design language to match BTBV proposal
* untrusted messages have red background * unverified messages have normal background and red lock
Diffstat (limited to 'src/main/java/de/pixart/messenger/entities')
-rw-r--r--src/main/java/de/pixart/messenger/entities/Message.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Message.java b/src/main/java/de/pixart/messenger/entities/Message.java
index 4224f6d6f..14120908f 100644
--- a/src/main/java/de/pixart/messenger/entities/Message.java
+++ b/src/main/java/de/pixart/messenger/entities/Message.java
@@ -495,7 +495,7 @@ public class Message extends AbstractEntity {
!message.bodyIsHeart() &&
!this.bodyIsXmpp() &&
!message.bodyIsXmpp() &&
- this.isTrusted() == message.isTrusted()
+ ((this.axolotlFingerprint == null && message.axolotlFingerprint == null) || this.axolotlFingerprint.equals(message.getFingerprint()))
);
}
@@ -819,7 +819,7 @@ public class Message extends AbstractEntity {
public boolean isTrusted() {
FingerprintStatus s = conversation.getAccount().getAxolotlService().getFingerprintTrust(axolotlFingerprint);
- return s != null && s.isTrustedAndActive();
+ return s != null && s.isTrusted();
}
private int getPreviousEncryption() {