Rename axolotl -> signalProtocol

diff --git a/src/main/java/org/asamk/textsecure/JsonAxolotlStore.java b/src/main/java/org/asamk/textsecure/JsonSignalProtocolStore.java
similarity index 92%
rename from src/main/java/org/asamk/textsecure/JsonAxolotlStore.java
rename to src/main/java/org/asamk/textsecure/JsonSignalProtocolStore.java
index afc448a2cc207706a5ca5bc1c01c973fe81bcb78..f440a709acd5c3de25030e4a8f9315db4dae33f0 100644 (file)
--- a/src/main/java/org/asamk/textsecure/JsonAxolotlStore.java
+++ b/src/main/java/org/asamk/textsecure/JsonSignalProtocolStore.java
@@ -14,7 +14,7 @@ import org.whispersystems.libsignal.state.SignedPreKeyRecord;
 
 import java.util.List;
 
 
 import java.util.List;
 

-class JsonAxolotlStore implements SignalProtocolStore {
+class JsonSignalProtocolStore implements SignalProtocolStore {

 
     @JsonProperty("preKeys")
     @JsonDeserialize(using = JsonPreKeyStore.JsonPreKeyStoreDeserializer.class)
 
     @JsonProperty("preKeys")
     @JsonDeserialize(using = JsonPreKeyStore.JsonPreKeyStoreDeserializer.class)


@@ -36,17 +36,17 @@ class JsonAxolotlStore implements SignalProtocolStore {
     @JsonSerialize(using = JsonIdentityKeyStore.JsonIdentityKeyStoreSerializer.class)
     protected JsonIdentityKeyStore identityKeyStore;
 
     @JsonSerialize(using = JsonIdentityKeyStore.JsonIdentityKeyStoreSerializer.class)
     protected JsonIdentityKeyStore identityKeyStore;
 

-    public JsonAxolotlStore() {
+    public JsonSignalProtocolStore() {

     }
 
     }
 

-    public JsonAxolotlStore(JsonPreKeyStore preKeyStore, JsonSessionStore sessionStore, JsonSignedPreKeyStore signedPreKeyStore, JsonIdentityKeyStore identityKeyStore) {
+    public JsonSignalProtocolStore(JsonPreKeyStore preKeyStore, JsonSessionStore sessionStore, JsonSignedPreKeyStore signedPreKeyStore, JsonIdentityKeyStore identityKeyStore) {

         this.preKeyStore = preKeyStore;
         this.sessionStore = sessionStore;
         this.signedPreKeyStore = signedPreKeyStore;
         this.identityKeyStore = identityKeyStore;
     }
 
         this.preKeyStore = preKeyStore;
         this.sessionStore = sessionStore;
         this.signedPreKeyStore = signedPreKeyStore;
         this.identityKeyStore = identityKeyStore;
     }
 

-    public JsonAxolotlStore(IdentityKeyPair identityKeyPair, int registrationId) {
+    public JsonSignalProtocolStore(IdentityKeyPair identityKeyPair, int registrationId) {

         preKeyStore = new JsonPreKeyStore();
         sessionStore = new JsonSessionStore();
         signedPreKeyStore = new JsonSignedPreKeyStore();
         preKeyStore = new JsonPreKeyStore();
         sessionStore = new JsonSessionStore();
         signedPreKeyStore = new JsonSignedPreKeyStore();

diff --git a/src/main/java/org/asamk/textsecure/Manager.java b/src/main/java/org/asamk/textsecure/Manager.java
index 77c46e9b2a53f1da0fe4f808a5a272ea43dc180e..2d67517051c8bdb7f93fd3e12c9c09b0a4532df3 100644 (file)
--- a/src/main/java/org/asamk/textsecure/Manager.java
+++ b/src/main/java/org/asamk/textsecure/Manager.java
@@ -28,6 +28,7 @@ import org.whispersystems.libsignal.*;
 import org.whispersystems.libsignal.ecc.Curve;
 import org.whispersystems.libsignal.ecc.ECKeyPair;
 import org.whispersystems.libsignal.state.PreKeyRecord;
 import org.whispersystems.libsignal.ecc.Curve;
 import org.whispersystems.libsignal.ecc.ECKeyPair;
 import org.whispersystems.libsignal.state.PreKeyRecord;

+import org.whispersystems.libsignal.state.SignalProtocolStore;

 import org.whispersystems.libsignal.state.SignedPreKeyRecord;
 import org.whispersystems.libsignal.util.KeyHelper;
 import org.whispersystems.libsignal.util.Medium;
 import org.whispersystems.libsignal.state.SignedPreKeyRecord;
 import org.whispersystems.libsignal.util.KeyHelper;
 import org.whispersystems.libsignal.util.Medium;


@@ -72,7 +73,7 @@ class Manager implements TextSecure {
 
     private boolean registered = false;
 
 
     private boolean registered = false;
 

-    private JsonAxolotlStore axolotlStore;
+    private SignalProtocolStore signalProtocolStore;

     private SignalServiceAccountManager accountManager;
     private JsonGroupStore groupStore;
 
     private SignalServiceAccountManager accountManager;
     private JsonGroupStore groupStore;
 


@@ -99,7 +100,7 @@ class Manager implements TextSecure {
     }
 
     public boolean userHasKeys() {
     }
 
     public boolean userHasKeys() {

-        return axolotlStore != null;
+        return signalProtocolStore != null;

     }
 
     private JsonNode getNotNullNode(JsonNode parent, String name) throws InvalidObjectException {
     }
 
     private JsonNode getNotNullNode(JsonNode parent, String name) throws InvalidObjectException {


@@ -129,7 +130,7 @@ class Manager implements TextSecure {
         } else {
             nextSignedPreKeyId = 0;
         }
         } else {
             nextSignedPreKeyId = 0;
         }

-        axolotlStore = jsonProcessot.convertValue(getNotNullNode(rootNode, "axolotlStore"), JsonAxolotlStore.class); //new JsonAxolotlStore(in.getJSONObject("axolotlStore"));
+        signalProtocolStore = jsonProcessot.convertValue(getNotNullNode(rootNode, "axolotlStore"), JsonSignalProtocolStore.class);

         registered = getNotNullNode(rootNode, "registered").asBoolean();
         JsonNode groupStoreNode = rootNode.get("groupStore");
         if (groupStoreNode != null) {
         registered = getNotNullNode(rootNode, "registered").asBoolean();
         JsonNode groupStoreNode = rootNode.get("groupStore");
         if (groupStoreNode != null) {


@@ -149,7 +150,7 @@ class Manager implements TextSecure {
                 .put("preKeyIdOffset", preKeyIdOffset)
                 .put("nextSignedPreKeyId", nextSignedPreKeyId)
                 .put("registered", registered)
                 .put("preKeyIdOffset", preKeyIdOffset)
                 .put("nextSignedPreKeyId", nextSignedPreKeyId)
                 .put("registered", registered)

-                .putPOJO("axolotlStore", axolotlStore)
+                .putPOJO("axolotlStore", signalProtocolStore)

                 .putPOJO("groupStore", groupStore)
         ;
         try {
                 .putPOJO("groupStore", groupStore)
         ;
         try {


@@ -162,7 +163,7 @@ class Manager implements TextSecure {
     public void createNewIdentity() {
         IdentityKeyPair identityKey = KeyHelper.generateIdentityKeyPair();
         int registrationId = KeyHelper.generateRegistrationId(false);
     public void createNewIdentity() {
         IdentityKeyPair identityKey = KeyHelper.generateIdentityKeyPair();
         int registrationId = KeyHelper.generateRegistrationId(false);

-        axolotlStore = new JsonAxolotlStore(identityKey, registrationId);
+        signalProtocolStore = new JsonSignalProtocolStore(identityKey, registrationId);

         groupStore = new JsonGroupStore();
         registered = false;
         save();
         groupStore = new JsonGroupStore();
         registered = false;
         save();


@@ -196,7 +197,7 @@ class Manager implements TextSecure {
             ECKeyPair keyPair = Curve.generateKeyPair();
             PreKeyRecord record = new PreKeyRecord(preKeyId, keyPair);
 
             ECKeyPair keyPair = Curve.generateKeyPair();
             PreKeyRecord record = new PreKeyRecord(preKeyId, keyPair);
 

-            axolotlStore.storePreKey(preKeyId, record);
+            signalProtocolStore.storePreKey(preKeyId, record);

             records.add(record);
         }
 
             records.add(record);
         }
 


@@ -207,18 +208,18 @@ class Manager implements TextSecure {
     }
 
     private PreKeyRecord generateLastResortPreKey() {
     }
 
     private PreKeyRecord generateLastResortPreKey() {

-        if (axolotlStore.containsPreKey(Medium.MAX_VALUE)) {
+        if (signalProtocolStore.containsPreKey(Medium.MAX_VALUE)) {

             try {
             try {

-                return axolotlStore.loadPreKey(Medium.MAX_VALUE);
+                return signalProtocolStore.loadPreKey(Medium.MAX_VALUE);

             } catch (InvalidKeyIdException e) {
             } catch (InvalidKeyIdException e) {

-                axolotlStore.removePreKey(Medium.MAX_VALUE);
+                signalProtocolStore.removePreKey(Medium.MAX_VALUE);

             }
         }
 
         ECKeyPair keyPair = Curve.generateKeyPair();
         PreKeyRecord record = new PreKeyRecord(Medium.MAX_VALUE, keyPair);
 
             }
         }
 
         ECKeyPair keyPair = Curve.generateKeyPair();
         PreKeyRecord record = new PreKeyRecord(Medium.MAX_VALUE, keyPair);
 

-        axolotlStore.storePreKey(Medium.MAX_VALUE, record);
+        signalProtocolStore.storePreKey(Medium.MAX_VALUE, record);

         save();
 
         return record;
         save();
 
         return record;


@@ -230,7 +231,7 @@ class Manager implements TextSecure {
             byte[] signature = Curve.calculateSignature(identityKeyPair.getPrivateKey(), keyPair.getPublicKey().serialize());
             SignedPreKeyRecord record = new SignedPreKeyRecord(nextSignedPreKeyId, System.currentTimeMillis(), keyPair, signature);
 
             byte[] signature = Curve.calculateSignature(identityKeyPair.getPrivateKey(), keyPair.getPublicKey().serialize());
             SignedPreKeyRecord record = new SignedPreKeyRecord(nextSignedPreKeyId, System.currentTimeMillis(), keyPair, signature);
 

-            axolotlStore.storeSignedPreKey(nextSignedPreKeyId, record);
+            signalProtocolStore.storeSignedPreKey(nextSignedPreKeyId, record);

             nextSignedPreKeyId = (nextSignedPreKeyId + 1) % Medium.MAX_VALUE;
             save();
 
             nextSignedPreKeyId = (nextSignedPreKeyId + 1) % Medium.MAX_VALUE;
             save();
 


@@ -243,7 +244,7 @@ class Manager implements TextSecure {
     public void verifyAccount(String verificationCode) throws IOException {
         verificationCode = verificationCode.replace("-", "");
         signalingKey = Util.getSecret(52);
     public void verifyAccount(String verificationCode) throws IOException {
         verificationCode = verificationCode.replace("-", "");
         signalingKey = Util.getSecret(52);

-        accountManager.verifyAccountWithCode(verificationCode, signalingKey, axolotlStore.getLocalRegistrationId(), false, true);
+        accountManager.verifyAccountWithCode(verificationCode, signalingKey, signalProtocolStore.getLocalRegistrationId(), false, true);

 
         //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
         registered = true;
 
         //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
         registered = true;


@@ -252,9 +253,9 @@ class Manager implements TextSecure {
 
         PreKeyRecord lastResortKey = generateLastResortPreKey();
 
 
         PreKeyRecord lastResortKey = generateLastResortPreKey();
 

-        SignedPreKeyRecord signedPreKeyRecord = generateSignedPreKey(axolotlStore.getIdentityKeyPair());
+        SignedPreKeyRecord signedPreKeyRecord = generateSignedPreKey(signalProtocolStore.getIdentityKeyPair());

 
 

-        accountManager.setPreKeys(axolotlStore.getIdentityKeyPair().getPublicKey(), lastResortKey, signedPreKeyRecord, oneTimePreKeys);
+        accountManager.setPreKeys(signalProtocolStore.getIdentityKeyPair().getPublicKey(), lastResortKey, signedPreKeyRecord, oneTimePreKeys);

         save();
     }
 
         save();
     }
 


@@ -397,7 +398,7 @@ class Manager implements TextSecure {
     private void sendMessage(SignalServiceDataMessage message, Collection<String> recipients)
             throws IOException, EncapsulatedExceptions {
         SignalServiceMessageSender messageSender = new SignalServiceMessageSender(URL, TRUST_STORE, username, password,
     private void sendMessage(SignalServiceDataMessage message, Collection<String> recipients)
             throws IOException, EncapsulatedExceptions {
         SignalServiceMessageSender messageSender = new SignalServiceMessageSender(URL, TRUST_STORE, username, password,

-                axolotlStore, USER_AGENT, Optional.<SignalServiceMessageSender.EventListener>absent());
+                signalProtocolStore, USER_AGENT, Optional.<SignalServiceMessageSender.EventListener>absent());

 
         Set<SignalServiceAddress> recipientsTS = new HashSet<>(recipients.size());
         for (String recipient : recipients) {
 
         Set<SignalServiceAddress> recipientsTS = new HashSet<>(recipients.size());
         for (String recipient : recipients) {


@@ -422,7 +423,7 @@ class Manager implements TextSecure {
     }
 
     private SignalServiceContent decryptMessage(SignalServiceEnvelope envelope) {
     }
 
     private SignalServiceContent decryptMessage(SignalServiceEnvelope envelope) {

-        SignalServiceCipher cipher = new SignalServiceCipher(new SignalServiceAddress(username), axolotlStore);
+        SignalServiceCipher cipher = new SignalServiceCipher(new SignalServiceAddress(username), signalProtocolStore);

         try {
             return cipher.decrypt(envelope);
         } catch (Exception e) {
         try {
             return cipher.decrypt(envelope);
         } catch (Exception e) {


@@ -433,7 +434,7 @@ class Manager implements TextSecure {
     }
 
     private void handleEndSession(String source) {
     }
 
     private void handleEndSession(String source) {

-        axolotlStore.deleteAllSessions(source);
+        signalProtocolStore.deleteAllSessions(source);

     }
 
     public interface ReceiveMessageHandler {
     }
 
     public interface ReceiveMessageHandler {