diff options
| author | lookshe <github@lookshe.org> | 2016-04-05 23:24:49 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-04-05 23:24:49 +0200 |
| commit | d6a076e11281d4c3fb6b9504fe99d799b04ebbbb (patch) | |
| tree | 7cbbe209ed0a883bcf29389d91979974444447c1 /src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | |
| parent | bfb3cb844578d06fad9aade3a7576ee44d785f70 (diff) | |
| parent | 5eedce91f9d92e5139f13fddb57314570f42b9ad (diff) | |
Merge tag '1.11.3' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 00554960..9d2917d5 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -197,7 +197,7 @@ public class MessageAdapter extends ArrayAdapter<Message> { if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL) { XmppAxolotlSession.Trust trust = message.getConversation() .getAccount().getAxolotlService().getFingerprintTrust( - message.getAxolotlFingerprint()); + message.getFingerprint()); if(trust == null || (!trust.trusted() && !trust.trustedInactive())) { viewHolder.indicator.setColorFilter(ConversationsPlusColors.warning()); |