aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/crypto
diff options
context:
space:
mode:
authorAndreas Straub <andy@strb.org>2015-07-15 16:32:42 +0200
committerAndreas Straub <andy@strb.org>2015-07-19 22:23:28 +0200
commit4038af2f4764f1d35d82822514d65d17ab45b302 (patch)
tree535546d3a409e6db2b1a569234b79ec8cd1875cc /src/main/java/eu/siacs/conversations/crypto
parente8ec2ee628076aa43132c3214b786ddde64f93a6 (diff)
Fix trust status for outgoing messages
Tag sent messages with own fingerprint, set own fingerprint as always trusted, include own fingerprint in database trust search, explicitly reset trust colorfilter
Diffstat (limited to 'src/main/java/eu/siacs/conversations/crypto')
-rw-r--r--src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
index 23adbad8..57e57f7f 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
@@ -267,12 +267,12 @@ public class AxolotlService {
return true;
}
- public Trust getFingerprintTrust(String name, String fingerprint) {
- return mXmppConnectionService.databaseBackend.isIdentityKeyTrusted(account, name, fingerprint);
+ public Trust getFingerprintTrust(String fingerprint) {
+ return mXmppConnectionService.databaseBackend.isIdentityKeyTrusted(account, fingerprint);
}
- public void setFingerprintTrust(String name, String fingerprint, Trust trust) {
- mXmppConnectionService.databaseBackend.setIdentityKeyTrust(account, name, fingerprint, trust);
+ public void setFingerprintTrust(String fingerprint, Trust trust) {
+ mXmppConnectionService.databaseBackend.setIdentityKeyTrust(account, fingerprint, trust);
}
// --------------------------------------
@@ -844,12 +844,12 @@ public class AxolotlService {
return sessions.hasAny(address) ||
( deviceIds.containsKey(jid) && !deviceIds.get(jid).isEmpty());
}
- public SQLiteAxolotlStore.Trust getFingerprintTrust(String name, String fingerprint) {
- return axolotlStore.getFingerprintTrust(name, fingerprint);
+ public SQLiteAxolotlStore.Trust getFingerprintTrust(String fingerprint) {
+ return axolotlStore.getFingerprintTrust(fingerprint);
}
- public void setFingerprintTrust(String name, String fingerprint, SQLiteAxolotlStore.Trust trust) {
- axolotlStore.setFingerprintTrust(name, fingerprint, trust);
+ public void setFingerprintTrust(String fingerprint, SQLiteAxolotlStore.Trust trust) {
+ axolotlStore.setFingerprintTrust(fingerprint, trust);
}
private void buildSessionFromPEP(final Conversation conversation, final AxolotlAddress address) {