diff options
| author | lookshe <github@lookshe.org> | 2016-04-17 17:02:50 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-04-17 17:02:50 +0200 |
| commit | de7631e300eb9e578336d642dd279faecdb09391 (patch) | |
| tree | 1407d6ca126bcd8244a83ee5bb76e5a7d581c5d2 /src/main/java | |
| parent | 4b11fa4c69834d8e03b18032e12b0ce788da2f70 (diff) | |
@Overrides addedtrz/merge_1.11.7
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceImpl.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceImpl.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceImpl.java index 364898b6..281eb91f 100644 --- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceImpl.java +++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceImpl.java @@ -243,10 +243,12 @@ public class AxolotlServiceImpl implements OnAdvancedStreamFeaturesLoaded, Axolo return keys; } + @Override public long getNumTrustedKeys(Jid jid) { return axolotlStore.getContactNumTrustedKeys(jid.toBareJid().toString()); } + @Override public boolean anyTargetHasNoTrustedKeys(List<Jid> jids) { for(Jid jid : jids) { if (axolotlStore.getContactNumTrustedKeys(jid.toBareJid().toString()) == 0) { @@ -614,6 +616,7 @@ public class AxolotlServiceImpl implements OnAdvancedStreamFeaturesLoaded, Axolo }); } + @Override public boolean isConversationAxolotlCapable(Conversation conversation) { final List<Jid> jids = getCryptoTargets(conversation); for(Jid jid : jids) { @@ -624,6 +627,7 @@ public class AxolotlServiceImpl implements OnAdvancedStreamFeaturesLoaded, Axolo return jids.size() > 0; } + @Override public List<Jid> getCryptoTargets(Conversation conversation) { final List<Jid> jids; if (conversation.getMode() == Conversation.MODE_SINGLE) { @@ -875,6 +879,7 @@ public class AxolotlServiceImpl implements OnAdvancedStreamFeaturesLoaded, Axolo return verified; } + @Override public boolean hasPendingKeyFetches(Account account, List<Jid> jids) { AxolotlAddress ownAddress = new AxolotlAddress(account.getJid().toBareJid().toString(), 0); if (fetchStatusMap.getAll(ownAddress).containsValue(FetchStatus.PENDING)) { @@ -952,6 +957,7 @@ public class AxolotlServiceImpl implements OnAdvancedStreamFeaturesLoaded, Axolo }); } + @Override public void prepareKeyTransportMessage(final Conversation conversation, final OnMessageCreatedCallback onMessageCreatedCallback) { executor.execute(new Runnable() { @Override |