aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Straub <andy@strb.org>2015-07-05 22:10:43 +0200
committerAndreas Straub <andy@strb.org>2015-07-19 21:32:27 +0200
commit25450bf6d365e4bb71addd38275296575f3a5658 (patch)
tree7496e935c10d38bbc9dc754aa6b31273dbe5d180 /src
parentbf4185ac08a42e9d16bf1e2fc0126bff467a55be (diff)
Trust all IdentityKeys
The trust-on-first-use policy leads to problems when receiving messages from two different devices of a contact before sending a message to them (as their IdentityKeys will not have been added yet). Since session trust will be managed externally anyway, this change is not a security problem, and will allow us to decrypt messages from yet-untrusted sessions.
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java5
1 files changed, 3 insertions, 2 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 420c75b5b..cdd8d85d9 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
@@ -233,8 +233,9 @@ public class AxolotlService {
*/
@Override
public boolean isTrustedIdentity(String name, IdentityKey identityKey) {
- Set<IdentityKey> trustedKeys = mXmppConnectionService.databaseBackend.loadIdentityKeys(account, name);
- return trustedKeys.isEmpty() || trustedKeys.contains(identityKey);
+ //Set<IdentityKey> trustedKeys = mXmppConnectionService.databaseBackend.loadIdentityKeys(account, name);
+ //return trustedKeys.isEmpty() || trustedKeys.contains(identityKey);
+ return true;
}
// --------------------------------------