vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-11 01:59:38 +02:00
Code Issues Releases Wiki Activity

Fix some issues and delete old code.

Browse source
This commit is contained in:
Paul Schaub 2017-12-31 16:55:25 +01:00
parent 2db7717abc
commit 7bff6e7d99
10 changed files with 76 additions and 1389 deletions
Download patch file Download diff file Expand all files Collapse all files

2
smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoRatchet.java
View file

@ -68,7 +68,7 @@ public class SignalOmemoRatchet
SessionCipher> store)
{
super(omemoManager, store);
this.storeConnector = new SignalOmemoStoreConnector(omemoManager, store);
this.storeConnector = new SignalOmemoStoreConnector(omemoManager.getOwnDevice(), store);
}
@Override

14
smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoService.java
View file

@ -111,17 +111,17 @@ public final class SignalOmemoService
}
@Override
protected void processBundle(OmemoManager.LoggedInOmemoManager managerGuard,
PreKeyBundle preKeyBundle,
OmemoDevice device)
protected void processBundle(OmemoDevice userDevice,
PreKeyBundle contactsBundle,
OmemoDevice contactsDevice)
throws CorruptedOmemoKeyException
{
SignalOmemoStoreConnector connector = new SignalOmemoStoreConnector(managerGuard.get(), getOmemoStoreBackend());
SignalOmemoStoreConnector connector = new SignalOmemoStoreConnector(userDevice, getOmemoStoreBackend());
SessionBuilder builder = new SessionBuilder(connector, connector, connector, connector,
SignalOmemoStoreConnector.asAddress(device));
SignalOmemoStoreConnector.asAddress(contactsDevice));
try {
builder.process(preKeyBundle);
LOGGER.log(Level.FINE, "Session built with " + device);
builder.process(contactsBundle);
LOGGER.log(Level.FINE, "Session built with " + contactsDevice);
} catch (org.whispersystems.libsignal.InvalidKeyException e) {
throw new CorruptedOmemoKeyException(e.getMessage());
} catch (UntrustedIdentityException e) {

9
smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoStoreConnector.java
View file

@ -26,7 +26,6 @@ import java.util.TreeMap;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.jivesoftware.smackx.omemo.OmemoManager;
import org.jivesoftware.smackx.omemo.OmemoStore;
import org.jivesoftware.smackx.omemo.exceptions.CorruptedOmemoKeyException;
import org.jivesoftware.smackx.omemo.internal.OmemoDevice;
@ -59,20 +58,20 @@ public class SignalOmemoStoreConnector
private static final Logger LOGGER = Logger.getLogger(SignalOmemoStoreConnector.class.getName());
private final OmemoManager omemoManager;
private final OmemoStore<IdentityKeyPair, IdentityKey, PreKeyRecord, SignedPreKeyRecord, SessionRecord,
SignalProtocolAddress, ECPublicKey, PreKeyBundle, SessionCipher>
omemoStore;
private final OmemoDevice userDevice;
public SignalOmemoStoreConnector(OmemoManager omemoManager, OmemoStore<IdentityKeyPair,
public SignalOmemoStoreConnector(OmemoDevice userDevice, OmemoStore<IdentityKeyPair,
IdentityKey, PreKeyRecord, SignedPreKeyRecord, SessionRecord, SignalProtocolAddress, ECPublicKey,
PreKeyBundle, SessionCipher> store) {
this.omemoManager = omemoManager;
this.userDevice = userDevice;
this.omemoStore = store;
}
OmemoDevice getOurDevice() {
return omemoManager.getOwnDevice();
return userDevice;
}
@Override