Move storage package to manager

diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
index 8dc38e4fe26ebd6f8c12c47f5773c39ecbada023..db78f454c93851485f2066ae07e6e56254e4b339 100644 (file)
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -3,8 +3,8 @@ package org.asamk.signal;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.groups.GroupUtils;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.groups.GroupUtils;

-import org.asamk.signal.storage.contacts.ContactInfo;
-import org.asamk.signal.storage.groups.GroupInfo;
+import org.asamk.signal.manager.storage.contacts.ContactInfo;
+import org.asamk.signal.manager.storage.groups.GroupInfo;

 import org.asamk.signal.util.DateUtils;
 import org.asamk.signal.util.Util;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.asamk.signal.util.DateUtils;
 import org.asamk.signal.util.Util;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;

diff --git a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
index 24d6898c837f6ab1e7b8ac18f01b0642fc80c1eb..2c98ec6bb0efd18bf3df42263253bc09b2eebb1c 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
@@ -4,7 +4,7 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.manager.Manager;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.manager.Manager;

-import org.asamk.signal.storage.contacts.ContactInfo;
+import org.asamk.signal.manager.storage.contacts.ContactInfo;

 
 import java.util.List;
 
 
 import java.util.List;
 

diff --git a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
index 66ff3a00285e836a3ef09c0be05825193194446e..b4be4ad074297a642b283d946e452fe8ea72efe7 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
@@ -6,7 +6,7 @@ import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
 
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.groups.GroupInviteLinkUrl;

-import org.asamk.signal.storage.groups.GroupInfo;
+import org.asamk.signal.manager.storage.groups.GroupInfo;

 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 import java.util.List;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 import java.util.List;

diff --git a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
index a75e4328346d355c440e469cb31db78a8b495d57..3f422cbd0753109fef0a93adbde1cfcd25ec52e7 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
@@ -4,7 +4,7 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.manager.Manager;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.manager.Manager;

-import org.asamk.signal.storage.protocol.JsonIdentityKeyStore;
+import org.asamk.signal.manager.storage.protocol.IdentityInfo;

 import org.asamk.signal.util.Hex;
 import org.asamk.signal.util.Util;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import org.asamk.signal.util.Hex;
 import org.asamk.signal.util.Util;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;


@@ -13,7 +13,7 @@ import java.util.List;
 
 public class ListIdentitiesCommand implements LocalCommand {
 
 
 public class ListIdentitiesCommand implements LocalCommand {
 

-    private static void printIdentityFingerprint(Manager m, JsonIdentityKeyStore.Identity theirId) {
+    private static void printIdentityFingerprint(Manager m, IdentityInfo theirId) {

         String digits = Util.formatSafetyNumber(m.computeSafetyNumber(theirId.getAddress(), theirId.getIdentityKey()));
         System.out.println(String.format("%s: %s Added: %s Fingerprint: %s Safety Number: %s",
                 theirId.getAddress().getNumber().orNull(),
         String digits = Util.formatSafetyNumber(m.computeSafetyNumber(theirId.getAddress(), theirId.getIdentityKey()));
         System.out.println(String.format("%s: %s Added: %s Fingerprint: %s Safety Number: %s",
                 theirId.getAddress().getNumber().orNull(),


@@ -35,14 +35,14 @@ public class ListIdentitiesCommand implements LocalCommand {
             return 1;
         }
         if (ns.get("number") == null) {
             return 1;
         }
         if (ns.get("number") == null) {

-            for (JsonIdentityKeyStore.Identity identity : m.getIdentities()) {
+            for (IdentityInfo identity : m.getIdentities()) {

                 printIdentityFingerprint(m, identity);
             }
         } else {
             String number = ns.getString("number");
             try {
                 printIdentityFingerprint(m, identity);
             }
         } else {
             String number = ns.getString("number");
             try {

-                List<JsonIdentityKeyStore.Identity> identities = m.getIdentities(number);
-                for (JsonIdentityKeyStore.Identity id : identities) {
+                List<IdentityInfo> identities = m.getIdentities(number);
+                for (IdentityInfo id : identities) {

                     printIdentityFingerprint(m, id);
                 }
             } catch (InvalidNumberException e) {
                     printIdentityFingerprint(m, id);
                 }
             } catch (InvalidNumberException e) {

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index df3f12f27fc9ec429914dfeed04e6e28b92963f3..d19116a4b126348e04f6e9fa1a1eb3cad0e30ad4 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -6,7 +6,7 @@ import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;

-import org.asamk.signal.storage.groups.GroupInfo;
+import org.asamk.signal.manager.storage.groups.GroupInfo;

 import org.asamk.signal.util.ErrorUtils;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.whispersystems.libsignal.util.Pair;
 import org.asamk.signal.util.ErrorUtils;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.whispersystems.libsignal.util.Pair;

diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index c958e0a4373c468ef1fa2f270c20bd9408274f18..e00f44acaa119f951798ee857a9763f194d81db5 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -28,15 +28,15 @@ import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.manager.helper.GroupHelper;
 import org.asamk.signal.manager.helper.ProfileHelper;
 import org.asamk.signal.manager.helper.UnidentifiedAccessHelper;
 import org.asamk.signal.manager.helper.GroupHelper;
 import org.asamk.signal.manager.helper.ProfileHelper;
 import org.asamk.signal.manager.helper.UnidentifiedAccessHelper;

-import org.asamk.signal.storage.SignalAccount;
-import org.asamk.signal.storage.contacts.ContactInfo;
-import org.asamk.signal.storage.groups.GroupInfo;
-import org.asamk.signal.storage.groups.GroupInfoV1;
-import org.asamk.signal.storage.groups.GroupInfoV2;
-import org.asamk.signal.storage.profiles.SignalProfile;
-import org.asamk.signal.storage.profiles.SignalProfileEntry;
-import org.asamk.signal.storage.protocol.JsonIdentityKeyStore;
-import org.asamk.signal.storage.stickers.Sticker;
+import org.asamk.signal.manager.storage.SignalAccount;
+import org.asamk.signal.manager.storage.contacts.ContactInfo;
+import org.asamk.signal.manager.storage.groups.GroupInfo;
+import org.asamk.signal.manager.storage.groups.GroupInfoV1;
+import org.asamk.signal.manager.storage.groups.GroupInfoV2;
+import org.asamk.signal.manager.storage.profiles.SignalProfile;
+import org.asamk.signal.manager.storage.profiles.SignalProfileEntry;
+import org.asamk.signal.manager.storage.protocol.IdentityInfo;
+import org.asamk.signal.manager.storage.stickers.Sticker;

 import org.asamk.signal.util.IOUtils;
 import org.asamk.signal.util.Util;
 import org.signal.libsignal.metadata.InvalidMetadataMessageException;
 import org.asamk.signal.util.IOUtils;
 import org.asamk.signal.util.Util;
 import org.signal.libsignal.metadata.InvalidMetadataMessageException;


@@ -2422,8 +2422,7 @@ public class Manager implements Closeable {
                 DeviceContactsOutputStream out = new DeviceContactsOutputStream(fos);
                 for (ContactInfo record : account.getContactStore().getContacts()) {
                     VerifiedMessage verifiedMessage = null;
                 DeviceContactsOutputStream out = new DeviceContactsOutputStream(fos);
                 for (ContactInfo record : account.getContactStore().getContacts()) {
                     VerifiedMessage verifiedMessage = null;

-                    JsonIdentityKeyStore.Identity currentIdentity = account.getSignalProtocolStore()
-                            .getIdentity(record.getAddress());
+                    IdentityInfo currentIdentity = account.getSignalProtocolStore().getIdentity(record.getAddress());

                     if (currentIdentity != null) {
                         verifiedMessage = new VerifiedMessage(record.getAddress(),
                                 currentIdentity.getIdentityKey(),
                     if (currentIdentity != null) {
                         verifiedMessage = new VerifiedMessage(record.getAddress(),
                                 currentIdentity.getIdentityKey(),


@@ -2517,11 +2516,11 @@ public class Manager implements Closeable {
         return account.getGroupStore().getGroup(groupId);
     }
 
         return account.getGroupStore().getGroup(groupId);
     }
 

-    public List<JsonIdentityKeyStore.Identity> getIdentities() {
+    public List<IdentityInfo> getIdentities() {

         return account.getSignalProtocolStore().getIdentities();
     }
 
         return account.getSignalProtocolStore().getIdentities();
     }
 

-    public List<JsonIdentityKeyStore.Identity> getIdentities(String number) throws InvalidNumberException {
+    public List<IdentityInfo> getIdentities(String number) throws InvalidNumberException {

         return account.getSignalProtocolStore().getIdentities(canonicalizeAndResolveSignalServiceAddress(number));
     }
 
         return account.getSignalProtocolStore().getIdentities(canonicalizeAndResolveSignalServiceAddress(number));
     }
 


@@ -2533,11 +2532,11 @@ public class Manager implements Closeable {
      */
     public boolean trustIdentityVerified(String name, byte[] fingerprint) throws InvalidNumberException {
         SignalServiceAddress address = canonicalizeAndResolveSignalServiceAddress(name);
      */
     public boolean trustIdentityVerified(String name, byte[] fingerprint) throws InvalidNumberException {
         SignalServiceAddress address = canonicalizeAndResolveSignalServiceAddress(name);

-        List<JsonIdentityKeyStore.Identity> ids = account.getSignalProtocolStore().getIdentities(address);
+        List<IdentityInfo> ids = account.getSignalProtocolStore().getIdentities(address);

         if (ids == null) {
             return false;
         }
         if (ids == null) {
             return false;
         }

-        for (JsonIdentityKeyStore.Identity id : ids) {
+        for (IdentityInfo id : ids) {

             if (!Arrays.equals(id.getIdentityKey().serialize(), fingerprint)) {
                 continue;
             }
             if (!Arrays.equals(id.getIdentityKey().serialize(), fingerprint)) {
                 continue;
             }


@@ -2563,11 +2562,11 @@ public class Manager implements Closeable {
      */
     public boolean trustIdentityVerifiedSafetyNumber(String name, String safetyNumber) throws InvalidNumberException {
         SignalServiceAddress address = canonicalizeAndResolveSignalServiceAddress(name);
      */
     public boolean trustIdentityVerifiedSafetyNumber(String name, String safetyNumber) throws InvalidNumberException {
         SignalServiceAddress address = canonicalizeAndResolveSignalServiceAddress(name);

-        List<JsonIdentityKeyStore.Identity> ids = account.getSignalProtocolStore().getIdentities(address);
+        List<IdentityInfo> ids = account.getSignalProtocolStore().getIdentities(address);

         if (ids == null) {
             return false;
         }
         if (ids == null) {
             return false;
         }

-        for (JsonIdentityKeyStore.Identity id : ids) {
+        for (IdentityInfo id : ids) {

             if (!safetyNumber.equals(computeSafetyNumber(address, id.getIdentityKey()))) {
                 continue;
             }
             if (!safetyNumber.equals(computeSafetyNumber(address, id.getIdentityKey()))) {
                 continue;
             }


@@ -2592,11 +2591,11 @@ public class Manager implements Closeable {
      */
     public boolean trustIdentityAllKeys(String name) {
         SignalServiceAddress address = resolveSignalServiceAddress(name);
      */
     public boolean trustIdentityAllKeys(String name) {
         SignalServiceAddress address = resolveSignalServiceAddress(name);

-        List<JsonIdentityKeyStore.Identity> ids = account.getSignalProtocolStore().getIdentities(address);
+        List<IdentityInfo> ids = account.getSignalProtocolStore().getIdentities(address);

         if (ids == null) {
             return false;
         }
         if (ids == null) {
             return false;
         }

-        for (JsonIdentityKeyStore.Identity id : ids) {
+        for (IdentityInfo id : ids) {

             if (id.getTrustLevel() == TrustLevel.UNTRUSTED) {
                 account.getSignalProtocolStore()
                         .setIdentityTrustLevel(address, id.getIdentityKey(), TrustLevel.TRUSTED_UNVERIFIED);
             if (id.getTrustLevel() == TrustLevel.UNTRUSTED) {
                 account.getSignalProtocolStore()
                         .setIdentityTrustLevel(address, id.getIdentityKey(), TrustLevel.TRUSTED_UNVERIFIED);

diff --git a/src/main/java/org/asamk/signal/manager/ProvisioningManager.java b/src/main/java/org/asamk/signal/manager/ProvisioningManager.java
index f81cfa49acfe1f7ad5087ddf936eb63f4ccb891f..95e92c7aef106ad1aeba3c74a820c22f4d1bdf43 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/ProvisioningManager.java
+++ b/src/main/java/org/asamk/signal/manager/ProvisioningManager.java
@@ -16,7 +16,7 @@
  */
 package org.asamk.signal.manager;
 
  */
 package org.asamk.signal.manager;
 

-import org.asamk.signal.storage.SignalAccount;
+import org.asamk.signal.manager.storage.SignalAccount;

 import org.signal.zkgroup.InvalidInputException;
 import org.signal.zkgroup.profiles.ProfileKey;
 import org.whispersystems.libsignal.IdentityKeyPair;
 import org.signal.zkgroup.InvalidInputException;
 import org.signal.zkgroup.profiles.ProfileKey;
 import org.whispersystems.libsignal.IdentityKeyPair;

diff --git a/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java b/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java
index c5f727e19560e148d5dd5af67ecd4197cc451277..f56639e319ba28e9f7029fd05aecd9bcb56a8f6a 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java
+++ b/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java
@@ -1,8 +1,8 @@
 package org.asamk.signal.manager.groups;
 
 package org.asamk.signal.manager.groups;
 

-import org.asamk.signal.storage.groups.GroupInfo;
-import org.asamk.signal.storage.groups.GroupInfoV1;
-import org.asamk.signal.storage.groups.GroupInfoV2;
+import org.asamk.signal.manager.storage.groups.GroupInfo;
+import org.asamk.signal.manager.storage.groups.GroupInfoV1;
+import org.asamk.signal.manager.storage.groups.GroupInfoV2;

 import org.signal.zkgroup.InvalidInputException;
 import org.signal.zkgroup.groups.GroupMasterKey;
 import org.signal.zkgroup.groups.GroupSecretParams;
 import org.signal.zkgroup.InvalidInputException;
 import org.signal.zkgroup.groups.GroupMasterKey;
 import org.signal.zkgroup.groups.GroupSecretParams;

diff --git a/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index 6a52e00ed9a817c2659f23df0dc5beed154e6959..394eba57da748fcc76b9d6e9767b7ba4623e5494 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -5,8 +5,8 @@ import com.google.protobuf.InvalidProtocolBufferException;
 import org.asamk.signal.manager.groups.GroupIdV2;
 import org.asamk.signal.manager.groups.GroupLinkPassword;
 import org.asamk.signal.manager.groups.GroupUtils;
 import org.asamk.signal.manager.groups.GroupIdV2;
 import org.asamk.signal.manager.groups.GroupLinkPassword;
 import org.asamk.signal.manager.groups.GroupUtils;

-import org.asamk.signal.storage.groups.GroupInfoV2;
-import org.asamk.signal.storage.profiles.SignalProfile;
+import org.asamk.signal.manager.storage.groups.GroupInfoV2;
+import org.asamk.signal.manager.storage.profiles.SignalProfile;

 import org.asamk.signal.util.IOUtils;
 import org.signal.storageservice.protos.groups.AccessControl;
 import org.signal.storageservice.protos.groups.GroupChange;
 import org.asamk.signal.util.IOUtils;
 import org.signal.storageservice.protos.groups.AccessControl;
 import org.signal.storageservice.protos.groups.GroupChange;

diff --git a/src/main/java/org/asamk/signal/manager/helper/ProfileProvider.java b/src/main/java/org/asamk/signal/manager/helper/ProfileProvider.java
index 1ff4cb05dddfa0943349b4e1444626bb9ca4839b..c16b5e0d86835cd0cd44425f6cdf6d30ab56227e 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/helper/ProfileProvider.java
+++ b/src/main/java/org/asamk/signal/manager/helper/ProfileProvider.java
@@ -1,6 +1,6 @@
 package org.asamk.signal.manager.helper;
 
 package org.asamk.signal.manager.helper;
 

-import org.asamk.signal.storage.profiles.SignalProfile;
+import org.asamk.signal.manager.storage.profiles.SignalProfile;

 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 public interface ProfileProvider {
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 public interface ProfileProvider {

diff --git a/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java b/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
index 97331cf3b211533ecd3106e06abefca52a6d15ee..a994c40a8af373c8b2bf38dcbf41452bc89addcf 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
+++ b/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
@@ -1,6 +1,6 @@
 package org.asamk.signal.manager.helper;
 
 package org.asamk.signal.manager.helper;
 

-import org.asamk.signal.storage.profiles.SignalProfile;
+import org.asamk.signal.manager.storage.profiles.SignalProfile;

 import org.signal.libsignal.metadata.certificate.InvalidCertificateException;
 import org.signal.zkgroup.profiles.ProfileKey;
 import org.whispersystems.libsignal.util.guava.Optional;
 import org.signal.libsignal.metadata.certificate.InvalidCertificateException;
 import org.signal.zkgroup.profiles.ProfileKey;
 import org.whispersystems.libsignal.util.guava.Optional;

diff --git a/src/main/java/org/asamk/signal/storage/SignalAccount.java b/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
similarity index 94%
rename from src/main/java/org/asamk/signal/storage/SignalAccount.java
rename to src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 393d04490e0229f6140004e90a3d64707c7157eb..c3573209b2523f472bcb6777891273f53145c1b2 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/SignalAccount.java
+++ b/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.storage;
+package org.asamk.signal.manager.storage;

 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;


@@ -11,20 +11,20 @@ import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import org.asamk.signal.manager.groups.GroupId;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import org.asamk.signal.manager.groups.GroupId;

-import org.asamk.signal.storage.contacts.ContactInfo;
-import org.asamk.signal.storage.contacts.JsonContactsStore;
-import org.asamk.signal.storage.groups.GroupInfo;
-import org.asamk.signal.storage.groups.GroupInfoV1;
-import org.asamk.signal.storage.groups.JsonGroupStore;
-import org.asamk.signal.storage.profiles.ProfileStore;
-import org.asamk.signal.storage.protocol.JsonIdentityKeyStore;
-import org.asamk.signal.storage.protocol.JsonSignalProtocolStore;
-import org.asamk.signal.storage.protocol.RecipientStore;
-import org.asamk.signal.storage.protocol.SessionInfo;
-import org.asamk.signal.storage.protocol.SignalServiceAddressResolver;
-import org.asamk.signal.storage.stickers.StickerStore;
-import org.asamk.signal.storage.threads.LegacyJsonThreadStore;
-import org.asamk.signal.storage.threads.ThreadInfo;
+import org.asamk.signal.manager.storage.contacts.ContactInfo;
+import org.asamk.signal.manager.storage.contacts.JsonContactsStore;
+import org.asamk.signal.manager.storage.groups.GroupInfo;
+import org.asamk.signal.manager.storage.groups.GroupInfoV1;
+import org.asamk.signal.manager.storage.groups.JsonGroupStore;
+import org.asamk.signal.manager.storage.profiles.ProfileStore;
+import org.asamk.signal.manager.storage.protocol.IdentityInfo;
+import org.asamk.signal.manager.storage.protocol.JsonSignalProtocolStore;
+import org.asamk.signal.manager.storage.protocol.RecipientStore;
+import org.asamk.signal.manager.storage.protocol.SessionInfo;
+import org.asamk.signal.manager.storage.protocol.SignalServiceAddressResolver;
+import org.asamk.signal.manager.storage.stickers.StickerStore;
+import org.asamk.signal.manager.storage.threads.LegacyJsonThreadStore;
+import org.asamk.signal.manager.storage.threads.ThreadInfo;

 import org.asamk.signal.util.IOUtils;
 import org.asamk.signal.util.Util;
 import org.signal.zkgroup.InvalidInputException;
 import org.asamk.signal.util.IOUtils;
 import org.asamk.signal.util.Util;
 import org.signal.zkgroup.InvalidInputException;


@@ -286,7 +286,7 @@ public class SignalAccount implements Closeable {
                 session.address = recipientStore.resolveServiceAddress(session.address);
             }
 
                 session.address = recipientStore.resolveServiceAddress(session.address);
             }
 

-            for (JsonIdentityKeyStore.Identity identity : signalProtocolStore.getIdentities()) {
+            for (IdentityInfo identity : signalProtocolStore.getIdentities()) {

                 identity.setAddress(recipientStore.resolveServiceAddress(identity.getAddress()));
             }
         }
                 identity.setAddress(recipientStore.resolveServiceAddress(identity.getAddress()));
             }
         }

diff --git a/src/main/java/org/asamk/signal/storage/contacts/ContactInfo.java b/src/main/java/org/asamk/signal/manager/storage/contacts/ContactInfo.java
similarity index 95%
rename from src/main/java/org/asamk/signal/storage/contacts/ContactInfo.java
rename to src/main/java/org/asamk/signal/manager/storage/contacts/ContactInfo.java
index 3b15521070fdbfdd780f9fc820bcf1693b86ef65..4dd132f74af7d67af2db70b307ca256df9837977 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/contacts/ContactInfo.java
+++ b/src/main/java/org/asamk/signal/manager/storage/contacts/ContactInfo.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.storage.contacts;
+package org.asamk.signal.manager.storage.contacts;

 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/src/main/java/org/asamk/signal/storage/contacts/JsonContactsStore.java b/src/main/java/org/asamk/signal/manager/storage/contacts/JsonContactsStore.java
similarity index 96%
rename from src/main/java/org/asamk/signal/storage/contacts/JsonContactsStore.java
rename to src/main/java/org/asamk/signal/manager/storage/contacts/JsonContactsStore.java
index bb81b0c98109388a3e279e47214781720efd5978..d2859f3f837a38e17aa8488498295e00bbbc61c8 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/contacts/JsonContactsStore.java
+++ b/src/main/java/org/asamk/signal/manager/storage/contacts/JsonContactsStore.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.storage.contacts;
+package org.asamk.signal.manager.storage.contacts;

 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/src/main/java/org/asamk/signal/storage/groups/GroupInfo.java b/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java
similarity index 97%
rename from src/main/java/org/asamk/signal/storage/groups/GroupInfo.java
rename to src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java
index fe72514172c8b3a945e6c4ed8aad2e690b19b285..a644b6209b8bbdcc6203b42bf531afc32121543e 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/groups/GroupInfo.java
+++ b/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.storage.groups;
+package org.asamk.signal.manager.storage.groups;

 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 

diff --git a/src/main/java/org/asamk/signal/storage/groups/GroupInfoV1.java b/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java
similarity index 99%
rename from src/main/java/org/asamk/signal/storage/groups/GroupInfoV1.java
rename to src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java
index e48fe297f71ddf8a48a80cbe60c2203c485c669b..39591647dbf0bf8c67eddc40bc9d9a8796635c96 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/groups/GroupInfoV1.java
+++ b/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.storage.groups;
+package org.asamk.signal.manager.storage.groups;

 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/src/main/java/org/asamk/signal/storage/groups/GroupInfoV2.java b/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
similarity index 98%
rename from src/main/java/org/asamk/signal/storage/groups/GroupInfoV2.java
rename to src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
index 0139f879dde864d9f147b0e60daf085301f129f8..17c239251caddc4f57105e1cbea445aee0ea83f2 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/groups/GroupInfoV2.java
+++ b/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.storage.groups;
+package org.asamk.signal.manager.storage.groups;

 
 import org.asamk.signal.manager.groups.GroupIdV2;
 import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
 
 import org.asamk.signal.manager.groups.GroupIdV2;
 import org.asamk.signal.manager.groups.GroupInviteLinkUrl;

diff --git a/src/main/java/org/asamk/signal/storage/groups/JsonGroupStore.java b/src/main/java/org/asamk/signal/manager/storage/groups/JsonGroupStore.java
similarity index 99%
rename from src/main/java/org/asamk/signal/storage/groups/JsonGroupStore.java
rename to src/main/java/org/asamk/signal/manager/storage/groups/JsonGroupStore.java
index 1aae49f72d8b43b7e6cd144b4dfab55a5e75180e..2b4dbcf5ee785760051ff6e972bb1596055172e0 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/groups/JsonGroupStore.java
+++ b/src/main/java/org/asamk/signal/manager/storage/groups/JsonGroupStore.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.storage.groups;
+package org.asamk.signal.manager.storage.groups;

 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonGenerator;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonGenerator;

diff --git a/src/main/java/org/asamk/signal/storage/profiles/ProfileStore.java b/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java
similarity index 99%
rename from src/main/java/org/asamk/signal/storage/profiles/ProfileStore.java
rename to src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java
index 3b3d3f9f662f5593c379cfcb3ba688ba987b22b8..bff2f17eac9c056fc964cc93f027d8401789b0d5 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/profiles/ProfileStore.java
+++ b/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.storage.profiles;
+package org.asamk.signal.manager.storage.profiles;

 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonGenerator;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonGenerator;

diff --git a/src/main/java/org/asamk/signal/storage/profiles/SignalProfile.java b/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java
similarity index 98%
rename from src/main/java/org/asamk/signal/storage/profiles/SignalProfile.java
rename to src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java
index 023458ed3012c266afbe0f36ce0653319bd1205d..48a38578ae97c1b000f96e37e12874b548f17db1 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/profiles/SignalProfile.java
+++ b/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.storage.profiles;
+package org.asamk.signal.manager.storage.profiles;

 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/src/main/java/org/asamk/signal/storage/profiles/SignalProfileEntry.java b/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfileEntry.java
similarity index 96%
rename from src/main/java/org/asamk/signal/storage/profiles/SignalProfileEntry.java
rename to src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfileEntry.java
index e6acf30da2009e000e16a99f5a906d096f1ef56e..a81fbcb51c49cefc3a3c0d29be935684feb9cfca 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/profiles/SignalProfileEntry.java
+++ b/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfileEntry.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.storage.profiles;
+package org.asamk.signal.manager.storage.profiles;

 
 import org.signal.zkgroup.profiles.ProfileKey;
 import org.signal.zkgroup.profiles.ProfileKeyCredential;
 
 import org.signal.zkgroup.profiles.ProfileKey;
 import org.signal.zkgroup.profiles.ProfileKeyCredential;

diff --git a/src/main/java/org/asamk/signal/manager/storage/protocol/IdentityInfo.java b/src/main/java/org/asamk/signal/manager/storage/protocol/IdentityInfo.java
new file mode 100644 (file)
index 0000000..d4af11f
--- /dev/null
+++ b/src/main/java/org/asamk/signal/manager/storage/protocol/IdentityInfo.java
@@ -0,0 +1,57 @@
+package org.asamk.signal.manager.storage.protocol;
+
+import org.asamk.signal.manager.TrustLevel;
+import org.whispersystems.libsignal.IdentityKey;
+import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+
+import java.util.Date;
+
+public class IdentityInfo {
+
+    SignalServiceAddress address;
+    IdentityKey identityKey;
+    TrustLevel trustLevel;
+    Date added;
+
+    public IdentityInfo(SignalServiceAddress address, IdentityKey identityKey, TrustLevel trustLevel) {
+        this.address = address;
+        this.identityKey = identityKey;
+        this.trustLevel = trustLevel;
+        this.added = new Date();
+    }
+
+    IdentityInfo(SignalServiceAddress address, IdentityKey identityKey, TrustLevel trustLevel, Date added) {
+        this.address = address;
+        this.identityKey = identityKey;
+        this.trustLevel = trustLevel;
+        this.added = added;
+    }
+
+    public SignalServiceAddress getAddress() {
+        return address;
+    }
+
+    public void setAddress(final SignalServiceAddress address) {
+        this.address = address;
+    }
+
+    boolean isTrusted() {
+        return trustLevel == TrustLevel.TRUSTED_UNVERIFIED || trustLevel == TrustLevel.TRUSTED_VERIFIED;
+    }
+
+    public IdentityKey getIdentityKey() {
+        return this.identityKey;
+    }
+
+    public TrustLevel getTrustLevel() {
+        return this.trustLevel;
+    }
+
+    public Date getDateAdded() {
+        return this.added;
+    }
+
+    public byte[] getFingerprint() {
+        return identityKey.getPublicKey().serialize();
+    }
+}

diff --git a/src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonIdentityKeyStore.java
similarity index 80%
rename from src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java
rename to src/main/java/org/asamk/signal/manager/storage/protocol/JsonIdentityKeyStore.java
index 29160cf18d09c82325bdc58d0574ca9e170968b6..517b384e50d3e7a450260015f802df07e0d683b0 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java
+++ b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonIdentityKeyStore.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.storage.protocol;
+package org.asamk.signal.manager.storage.protocol;

 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;


@@ -31,7 +31,7 @@ public class JsonIdentityKeyStore implements IdentityKeyStore {
 
     final static Logger logger = LoggerFactory.getLogger(JsonIdentityKeyStore.class);
 
 
     final static Logger logger = LoggerFactory.getLogger(JsonIdentityKeyStore.class);
 

-    private final List<Identity> identities = new ArrayList<>();
+    private final List<IdentityInfo> identities = new ArrayList<>();

 
     private final IdentityKeyPair identityKeyPair;
     private final int localRegistrationId;
 
     private final IdentityKeyPair identityKeyPair;
     private final int localRegistrationId;


@@ -85,7 +85,7 @@ public class JsonIdentityKeyStore implements IdentityKeyStore {
     public boolean saveIdentity(
             SignalServiceAddress serviceAddress, IdentityKey identityKey, TrustLevel trustLevel, Date added
     ) {
     public boolean saveIdentity(
             SignalServiceAddress serviceAddress, IdentityKey identityKey, TrustLevel trustLevel, Date added
     ) {

-        for (Identity id : identities) {
+        for (IdentityInfo id : identities) {

             if (!id.address.matches(serviceAddress) || !id.identityKey.equals(identityKey)) {
                 continue;
             }
             if (!id.address.matches(serviceAddress) || !id.identityKey.equals(identityKey)) {
                 continue;
             }


@@ -97,7 +97,7 @@ public class JsonIdentityKeyStore implements IdentityKeyStore {
             return true;
         }
 
             return true;
         }
 

-        identities.add(new Identity(serviceAddress, identityKey, trustLevel, added != null ? added : new Date()));
+        identities.add(new IdentityInfo(serviceAddress, identityKey, trustLevel, added != null ? added : new Date()));

         return false;
     }
 
         return false;
     }
 


@@ -111,7 +111,7 @@ public class JsonIdentityKeyStore implements IdentityKeyStore {
     public void setIdentityTrustLevel(
             SignalServiceAddress serviceAddress, IdentityKey identityKey, TrustLevel trustLevel
     ) {
     public void setIdentityTrustLevel(
             SignalServiceAddress serviceAddress, IdentityKey identityKey, TrustLevel trustLevel
     ) {

-        for (Identity id : identities) {
+        for (IdentityInfo id : identities) {

             if (!id.address.matches(serviceAddress) || !id.identityKey.equals(identityKey)) {
                 continue;
             }
             if (!id.address.matches(serviceAddress) || !id.identityKey.equals(identityKey)) {
                 continue;
             }


@@ -123,7 +123,7 @@ public class JsonIdentityKeyStore implements IdentityKeyStore {
             return;
         }
 
             return;
         }
 

-        identities.add(new Identity(serviceAddress, identityKey, trustLevel, new Date()));
+        identities.add(new IdentityInfo(serviceAddress, identityKey, trustLevel, new Date()));

     }
 
     @Override
     }
 
     @Override


@@ -132,7 +132,7 @@ public class JsonIdentityKeyStore implements IdentityKeyStore {
         SignalServiceAddress serviceAddress = resolveSignalServiceAddress(address.getName());
         boolean trustOnFirstUse = true;
 
         SignalServiceAddress serviceAddress = resolveSignalServiceAddress(address.getName());
         boolean trustOnFirstUse = true;
 

-        for (Identity id : identities) {
+        for (IdentityInfo id : identities) {

             if (!id.address.matches(serviceAddress)) {
                 continue;
             }
             if (!id.address.matches(serviceAddress)) {
                 continue;
             }


@@ -150,14 +150,14 @@ public class JsonIdentityKeyStore implements IdentityKeyStore {
     @Override
     public IdentityKey getIdentity(SignalProtocolAddress address) {
         SignalServiceAddress serviceAddress = resolveSignalServiceAddress(address.getName());
     @Override
     public IdentityKey getIdentity(SignalProtocolAddress address) {
         SignalServiceAddress serviceAddress = resolveSignalServiceAddress(address.getName());

-        Identity identity = getIdentity(serviceAddress);
+        IdentityInfo identity = getIdentity(serviceAddress);

         return identity == null ? null : identity.getIdentityKey();
     }
 
         return identity == null ? null : identity.getIdentityKey();
     }
 

-    public Identity getIdentity(SignalServiceAddress serviceAddress) {
+    public IdentityInfo getIdentity(SignalServiceAddress serviceAddress) {

         long maxDate = 0;
         long maxDate = 0;

-        Identity maxIdentity = null;
-        for (Identity id : this.identities) {
+        IdentityInfo maxIdentity = null;
+        for (IdentityInfo id : this.identities) {

             if (!id.address.matches(serviceAddress)) {
                 continue;
             }
             if (!id.address.matches(serviceAddress)) {
                 continue;
             }


@@ -171,14 +171,14 @@ public class JsonIdentityKeyStore implements IdentityKeyStore {
         return maxIdentity;
     }
 
         return maxIdentity;
     }
 

-    public List<Identity> getIdentities() {
+    public List<IdentityInfo> getIdentities() {

         // TODO deep copy
         return identities;
     }
 
         // TODO deep copy
         return identities;
     }
 

-    public List<Identity> getIdentities(SignalServiceAddress serviceAddress) {
-        List<Identity> identities = new ArrayList<>();
-        for (Identity identity : this.identities) {
+    public List<IdentityInfo> getIdentities(SignalServiceAddress serviceAddress) {
+        List<IdentityInfo> identities = new ArrayList<>();
+        for (IdentityInfo identity : this.identities) {

             if (identity.address.matches(serviceAddress)) {
                 identities.add(identity);
             }
             if (identity.address.matches(serviceAddress)) {
                 identities.add(identity);
             }


@@ -246,7 +246,7 @@ public class JsonIdentityKeyStore implements IdentityKeyStore {
             json.writeStringField("identityKey",
                     Base64.encodeBytes(jsonIdentityKeyStore.getIdentityKeyPair().serialize()));
             json.writeArrayFieldStart("trustedKeys");
             json.writeStringField("identityKey",
                     Base64.encodeBytes(jsonIdentityKeyStore.getIdentityKeyPair().serialize()));
             json.writeArrayFieldStart("trustedKeys");

-            for (Identity trustedKey : jsonIdentityKeyStore.identities) {
+            for (IdentityInfo trustedKey : jsonIdentityKeyStore.identities) {

                 json.writeStartObject();
                 if (trustedKey.getAddress().getNumber().isPresent()) {
                     json.writeStringField("name", trustedKey.getAddress().getNumber().get());
                 json.writeStartObject();
                 if (trustedKey.getAddress().getNumber().isPresent()) {
                     json.writeStringField("name", trustedKey.getAddress().getNumber().get());


@@ -264,53 +264,4 @@ public class JsonIdentityKeyStore implements IdentityKeyStore {
         }
     }
 
         }
     }
 

-    public static class Identity {
-
-        SignalServiceAddress address;
-        IdentityKey identityKey;
-        TrustLevel trustLevel;
-        Date added;
-
-        public Identity(SignalServiceAddress address, IdentityKey identityKey, TrustLevel trustLevel) {
-            this.address = address;
-            this.identityKey = identityKey;
-            this.trustLevel = trustLevel;
-            this.added = new Date();
-        }
-
-        Identity(SignalServiceAddress address, IdentityKey identityKey, TrustLevel trustLevel, Date added) {
-            this.address = address;
-            this.identityKey = identityKey;
-            this.trustLevel = trustLevel;
-            this.added = added;
-        }
-
-        public SignalServiceAddress getAddress() {
-            return address;
-        }
-
-        public void setAddress(final SignalServiceAddress address) {
-            this.address = address;
-        }
-
-        boolean isTrusted() {
-            return trustLevel == TrustLevel.TRUSTED_UNVERIFIED || trustLevel == TrustLevel.TRUSTED_VERIFIED;
-        }
-
-        public IdentityKey getIdentityKey() {
-            return this.identityKey;
-        }
-
-        public TrustLevel getTrustLevel() {
-            return this.trustLevel;
-        }
-
-        public Date getDateAdded() {
-            return this.added;
-        }
-
-        public byte[] getFingerprint() {
-            return identityKey.getPublicKey().serialize();
-        }
-    }

 }
 }

diff --git a/src/main/java/org/asamk/signal/storage/protocol/JsonPreKeyStore.java b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonPreKeyStore.java
similarity index 98%
rename from src/main/java/org/asamk/signal/storage/protocol/JsonPreKeyStore.java
rename to src/main/java/org/asamk/signal/manager/storage/protocol/JsonPreKeyStore.java
index 523809c11ed46f1c8d9c689a16a798d22e301004..4d884c3e483168ee755f3f1f102709c1240bb409 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonPreKeyStore.java
+++ b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonPreKeyStore.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.storage.protocol;
+package org.asamk.signal.manager.storage.protocol;

 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;

diff --git a/src/main/java/org/asamk/signal/storage/protocol/JsonSessionStore.java b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSessionStore.java
similarity index 99%
rename from src/main/java/org/asamk/signal/storage/protocol/JsonSessionStore.java
rename to src/main/java/org/asamk/signal/manager/storage/protocol/JsonSessionStore.java
index 24e4594e651602a5c8b41aed7c321152cc0abe8e..f55aff14f63eb54615b85d6c7d02e1c65cc6311d 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonSessionStore.java
+++ b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSessionStore.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.storage.protocol;
+package org.asamk.signal.manager.storage.protocol;

 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;

diff --git a/src/main/java/org/asamk/signal/storage/protocol/JsonSignalProtocolStore.java b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSignalProtocolStore.java
similarity index 95%
rename from src/main/java/org/asamk/signal/storage/protocol/JsonSignalProtocolStore.java
rename to src/main/java/org/asamk/signal/manager/storage/protocol/JsonSignalProtocolStore.java
index 5939749d7df50e7654e1f16ed8b9a779a9d40767..41a630139a81755edcd4eddb6c29616469a8a409 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonSignalProtocolStore.java
+++ b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSignalProtocolStore.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.storage.protocol;
+package org.asamk.signal.manager.storage.protocol;

 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;


@@ -91,11 +91,11 @@ public class JsonSignalProtocolStore implements SignalProtocolStore {
         identityKeyStore.setIdentityTrustLevel(serviceAddress, identityKey, trustLevel);
     }
 
         identityKeyStore.setIdentityTrustLevel(serviceAddress, identityKey, trustLevel);
     }
 

-    public List<JsonIdentityKeyStore.Identity> getIdentities() {
+    public List<IdentityInfo> getIdentities() {

         return identityKeyStore.getIdentities();
     }
 
         return identityKeyStore.getIdentities();
     }
 

-    public List<JsonIdentityKeyStore.Identity> getIdentities(SignalServiceAddress serviceAddress) {
+    public List<IdentityInfo> getIdentities(SignalServiceAddress serviceAddress) {

         return identityKeyStore.getIdentities(serviceAddress);
     }
 
         return identityKeyStore.getIdentities(serviceAddress);
     }
 


@@ -109,7 +109,7 @@ public class JsonSignalProtocolStore implements SignalProtocolStore {
         return identityKeyStore.getIdentity(address);
     }
 
         return identityKeyStore.getIdentity(address);
     }
 

-    public JsonIdentityKeyStore.Identity getIdentity(SignalServiceAddress serviceAddress) {
+    public IdentityInfo getIdentity(SignalServiceAddress serviceAddress) {

         return identityKeyStore.getIdentity(serviceAddress);
     }
 
         return identityKeyStore.getIdentity(serviceAddress);
     }
 

diff --git a/src/main/java/org/asamk/signal/storage/protocol/JsonSignedPreKeyStore.java b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSignedPreKeyStore.java
similarity index 98%
rename from src/main/java/org/asamk/signal/storage/protocol/JsonSignedPreKeyStore.java
rename to src/main/java/org/asamk/signal/manager/storage/protocol/JsonSignedPreKeyStore.java
index 7accf5a1ed3342e9270751fb0aa33e62827e06d3..5eae4500399293e4fa101696bd46bcaad84263f2 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonSignedPreKeyStore.java
+++ b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSignedPreKeyStore.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.storage.protocol;
+package org.asamk.signal.manager.storage.protocol;

 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;

diff --git a/src/main/java/org/asamk/signal/storage/protocol/RecipientStore.java b/src/main/java/org/asamk/signal/manager/storage/protocol/RecipientStore.java
similarity index 98%
rename from src/main/java/org/asamk/signal/storage/protocol/RecipientStore.java
rename to src/main/java/org/asamk/signal/manager/storage/protocol/RecipientStore.java
index 701eca3441d5ed3c73d28974c21ce51a76614d0a..60634ae53cc561904ec1bfdf85fd0e4de93e70ce 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/RecipientStore.java
+++ b/src/main/java/org/asamk/signal/manager/storage/protocol/RecipientStore.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.storage.protocol;
+package org.asamk.signal.manager.storage.protocol;

 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonGenerator;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonGenerator;

diff --git a/src/main/java/org/asamk/signal/storage/protocol/SessionInfo.java b/src/main/java/org/asamk/signal/manager/storage/protocol/SessionInfo.java
similarity index 89%
rename from src/main/java/org/asamk/signal/storage/protocol/SessionInfo.java
rename to src/main/java/org/asamk/signal/manager/storage/protocol/SessionInfo.java
index 002212335d417ded82c8292e5173cec5dd16a834..802b896b37abbbe413ff23c7380e926ff5509e79 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/SessionInfo.java
+++ b/src/main/java/org/asamk/signal/manager/storage/protocol/SessionInfo.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.storage.protocol;
+package org.asamk.signal.manager.storage.protocol;

 
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 

diff --git a/src/main/java/org/asamk/signal/storage/protocol/SignalServiceAddressResolver.java b/src/main/java/org/asamk/signal/manager/storage/protocol/SignalServiceAddressResolver.java
similarity index 88%
rename from src/main/java/org/asamk/signal/storage/protocol/SignalServiceAddressResolver.java
rename to src/main/java/org/asamk/signal/manager/storage/protocol/SignalServiceAddressResolver.java
index b1c5fb3899ac4c620386fdf7438ea2163b44ce13..86eea05e2ffe9abd025a804d4dfdfd4529d6f9b0 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/SignalServiceAddressResolver.java
+++ b/src/main/java/org/asamk/signal/manager/storage/protocol/SignalServiceAddressResolver.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.storage.protocol;
+package org.asamk.signal.manager.storage.protocol;

 
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 

diff --git a/src/main/java/org/asamk/signal/storage/stickers/Sticker.java b/src/main/java/org/asamk/signal/manager/storage/stickers/Sticker.java
similarity index 93%
rename from src/main/java/org/asamk/signal/storage/stickers/Sticker.java
rename to src/main/java/org/asamk/signal/manager/storage/stickers/Sticker.java
index 386924c446ca4e87d73d03b17e2cbe59eeb372ab..54e95d0a9d4e31e56b56a5dc2bc42cf79e9e36c1 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/stickers/Sticker.java
+++ b/src/main/java/org/asamk/signal/manager/storage/stickers/Sticker.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.storage.stickers;
+package org.asamk.signal.manager.storage.stickers;

 
 public class Sticker {
 
 
 public class Sticker {
 

diff --git a/src/main/java/org/asamk/signal/storage/stickers/StickerStore.java b/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java
similarity index 98%
rename from src/main/java/org/asamk/signal/storage/stickers/StickerStore.java
rename to src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java
index e5d817d298639a223f65c6ff5867242a294130ab..10cd2e99a1a681db90832b4eda531041f88b7664 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/stickers/StickerStore.java
+++ b/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.storage.stickers;
+package org.asamk.signal.manager.storage.stickers;

 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;

diff --git a/src/main/java/org/asamk/signal/storage/threads/LegacyJsonThreadStore.java b/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java
similarity index 97%
rename from src/main/java/org/asamk/signal/storage/threads/LegacyJsonThreadStore.java
rename to src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java
index 24463933931e916546f48fa5291512b133416e94..f37360a2c438d57c69ed5b961f72c25b6ee38c62 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/threads/LegacyJsonThreadStore.java
+++ b/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.storage.threads;
+package org.asamk.signal.manager.storage.threads;

 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonGenerator;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonGenerator;

diff --git a/src/main/java/org/asamk/signal/storage/threads/ThreadInfo.java b/src/main/java/org/asamk/signal/manager/storage/threads/ThreadInfo.java
similarity index 78%
rename from src/main/java/org/asamk/signal/storage/threads/ThreadInfo.java
rename to src/main/java/org/asamk/signal/manager/storage/threads/ThreadInfo.java
index 67e6b4747a0a69942f2481ab726fcc0145cbedeb..b81a0051b1caa72b3fa00bae578552f4752ede5c 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/threads/ThreadInfo.java
+++ b/src/main/java/org/asamk/signal/manager/storage/threads/ThreadInfo.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.storage.threads;
+package org.asamk.signal.manager.storage.threads;

 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;