From 8be0e8a27ddd4d55a48a38efc5434a581be6f1b3 Mon Sep 17 00:00:00 2001 From: Andreas Straub Date: Mon, 20 Jul 2015 22:35:07 +0200 Subject: Start TrustKeysActivity if no keys are TRUSTED If there are no UNDECIDED keys, but none of the contact's keys are trusted, redirect the user to the TrustKeysActivity --- .../siacs/conversations/crypto/axolotl/AxolotlService.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/main/java/eu/siacs/conversations/crypto') 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 6e28f111..72d1d14a 100644 --- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java +++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java @@ -278,8 +278,8 @@ public class AxolotlService { mXmppConnectionService.databaseBackend.setIdentityKeyTrust(account, fingerprint, trust); } - public Set getContactUndecidedKeys(String bareJid) { - return mXmppConnectionService.databaseBackend.loadIdentityKeys(account, bareJid, Trust.UNDECIDED); + public Set getContactUndecidedKeys(String bareJid, Trust trust) { + return mXmppConnectionService.databaseBackend.loadIdentityKeys(account, bareJid, trust); } public long getContactNumTrustedKeys(String bareJid) { @@ -692,12 +692,12 @@ public class AxolotlService { return axolotlStore.getIdentityKeyPair().getPublicKey(); } - public Set getPendingKeys() { - return axolotlStore.getContactUndecidedKeys(account.getJid().toBareJid().toString()); + public Set getKeysWithTrust(SQLiteAxolotlStore.Trust trust) { + return axolotlStore.getContactUndecidedKeys(account.getJid().toBareJid().toString(), trust); } - public Set getPendingKeys(Contact contact) { - return axolotlStore.getContactUndecidedKeys(contact.getJid().toBareJid().toString()); + public Set getKeysWithTrust(SQLiteAxolotlStore.Trust trust, Contact contact) { + return axolotlStore.getContactUndecidedKeys(contact.getJid().toBareJid().toString(), trust); } public long getNumTrustedKeys(Contact contact) { -- cgit v1.2.3