diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-03-08 12:55:03 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-03-08 12:55:03 +0100 |
commit | 48f3922fe652fea8d7b97afe90868d5d4ab290f7 (patch) | |
tree | e47b0a621c4717c39daf00ff1741dc4b02ebb0f2 /src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceStub.java | |
parent | 2b86b686c52c3d82ad01a8ff81c5766d64050b62 (diff) |
Fixed merge issue with AxolotlService (differentiation between impl and interface)
Diffstat (limited to 'src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceStub.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceStub.java | 81 |
1 files changed, 46 insertions, 35 deletions
diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceStub.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceStub.java index 42777b75..b0228d34 100644 --- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceStub.java +++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceStub.java @@ -10,6 +10,7 @@ import org.whispersystems.libaxolotl.state.SignedPreKeyRecord; import java.security.cert.X509Certificate; import java.util.Collections; +import java.util.List; import java.util.Set; import eu.siacs.conversations.entities.Account; @@ -24,11 +25,6 @@ import eu.siacs.conversations.xmpp.jid.Jid; public class AxolotlServiceStub implements AxolotlService { @Override - public boolean fetchMapHasErrors(Contact contact) { - return false; - } - - @Override public String getOwnFingerprint() { return null; } @@ -39,16 +35,6 @@ public class AxolotlServiceStub implements AxolotlService { } @Override - public Set<IdentityKey> getKeysWithTrust(XmppAxolotlSession.Trust trust, Contact contact) { - return Collections.emptySet(); - } - - @Override - public long getNumTrustedKeys(Contact contact) { - return 0; - } - - @Override public Set<String> getFingerprintsForOwnSessions() { return Collections.emptySet(); } @@ -114,11 +100,6 @@ public class AxolotlServiceStub implements AxolotlService { } @Override - public boolean isContactAxolotlCapable(Contact contact) { - return false; - } - - @Override public XmppAxolotlSession.Trust getFingerprintTrust(String fingerprint) { return XmppAxolotlSession.Trust.TRUSTED; } @@ -139,11 +120,6 @@ public class AxolotlServiceStub implements AxolotlService { } @Override - public Set<AxolotlAddress> findDevicesWithoutSession(Jid contactJid) { - return Collections.emptySet(); - } - - @Override public boolean createSessionsIfNeeded(Conversation conversation) { return false; } @@ -153,11 +129,6 @@ public class AxolotlServiceStub implements AxolotlService { return false; } - @Override - public boolean hasPendingKeyFetches(Account account, Contact contact) { - return false; - } - @Nullable @Override public XmppAxolotlMessage encrypt(Message message) { @@ -170,11 +141,6 @@ public class AxolotlServiceStub implements AxolotlService { } @Override - public void prepareKeyTransportMessage(Contact contact, OnMessageCreatedCallback onMessageCreatedCallback) { - - } - - @Override public XmppAxolotlMessage fetchAxolotlMessageFromCache(Message message) { return null; } @@ -190,6 +156,51 @@ public class AxolotlServiceStub implements AxolotlService { } @Override + public boolean fetchMapHasErrors(List<Jid> jids) { + return false; + } + + @Override + public Set<IdentityKey> getKeysWithTrust(XmppAxolotlSession.Trust trust, Jid jid) { + return Collections.emptySet(); + } + + @Override + public Set<IdentityKey> getKeysWithTrust(XmppAxolotlSession.Trust trust, List<Jid> jids) { + return Collections.emptySet(); + } + + @Override + public long getNumTrustedKeys(Jid jid) { + return 0; + } + + @Override + public boolean anyTargetHasNoTrustedKeys(List<Jid> jids) { + return false; + } + + @Override + public boolean isConversationAxolotlCapable(Conversation conversation) { + return false; + } + + @Override + public List<Jid> getCryptoTargets(Conversation conversation) { + return Collections.emptyList(); + } + + @Override + public boolean hasPendingKeyFetches(Account account, List<Jid> jids) { + return false; + } + + @Override + public void prepareKeyTransportMessage(Conversation conversation, OnMessageCreatedCallback onMessageCreatedCallback) { + + } + + @Override public void onAdvancedStreamFeaturesAvailable(Account account) { } |