Refactoring, move more functionality into Manager

[signal-cli] / src / main / java / cli / JsonAxolotlStore.java

diff --git a/src/main/java/cli/JsonAxolotlStore.java b/src/main/java/cli/JsonAxolotlStore.java
index 57282f129d1bc5a87f11cc1957b28f534dd49769..e7eb054c7167072e93c0c88cb8526372e5a7bf09 100644 (file)
--- a/src/main/java/cli/JsonAxolotlStore.java
+++ b/src/main/java/cli/JsonAxolotlStore.java
@@ -3,14 +3,15 @@ package cli;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;

-import org.json.JSONObject;
-import org.whispersystems.libaxolotl.*;
+import org.whispersystems.libaxolotl.AxolotlAddress;
+import org.whispersystems.libaxolotl.IdentityKey;
+import org.whispersystems.libaxolotl.IdentityKeyPair;
+import org.whispersystems.libaxolotl.InvalidKeyIdException;

 import org.whispersystems.libaxolotl.state.AxolotlStore;
 import org.whispersystems.libaxolotl.state.PreKeyRecord;
 import org.whispersystems.libaxolotl.state.SessionRecord;
 import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
 
 import org.whispersystems.libaxolotl.state.AxolotlStore;
 import org.whispersystems.libaxolotl.state.PreKeyRecord;
 import org.whispersystems.libaxolotl.state.SessionRecord;
 import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
 

-import java.io.IOException;

 import java.util.List;
 
 class JsonAxolotlStore implements AxolotlStore {
 import java.util.List;
 
 class JsonAxolotlStore implements AxolotlStore {