Modifying methods to be public to match package division

diff --git a/src/main/java/org/asamk/signal/GroupNotFoundException.java b/src/main/java/org/asamk/signal/GroupNotFoundException.java
index 0218c508df00e715166d43dfbf64fddb1e258860..d9b51fa0b772ec8e4d7f894c23427e88c193bedd 100644 (file)
--- a/src/main/java/org/asamk/signal/GroupNotFoundException.java
+++ b/src/main/java/org/asamk/signal/GroupNotFoundException.java
@@ -1,5 +1,6 @@
 package org.asamk.signal;
 
 package org.asamk.signal;
 

+import org.asamk.signal.util.Base64;

 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 
 public class GroupNotFoundException extends DBusExecutionException {
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 
 public class GroupNotFoundException extends DBusExecutionException {

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index b18b2e0a5667a09a61260469c4be5eab5c5c1087..571f9d42a706b6dd8588ee6b3d434b51c3e1d39a 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -21,6 +21,11 @@ import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.*;
 import org.apache.http.util.TextUtils;
 import org.asamk.Signal;
 import net.sourceforge.argparse4j.inf.*;
 import org.apache.http.util.TextUtils;
 import org.asamk.Signal;

+import org.asamk.signal.storage.contacts.ContactInfo;
+import org.asamk.signal.storage.groups.GroupInfo;
+import org.asamk.signal.storage.protocol.JsonIdentityKeyStore;
+import org.asamk.signal.util.Base64;
+import org.asamk.signal.util.Hex;

 import org.freedesktop.dbus.DBusConnection;
 import org.freedesktop.dbus.DBusSigHandler;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.DBusConnection;
 import org.freedesktop.dbus.DBusSigHandler;
 import org.freedesktop.dbus.exceptions.DBusException;


@@ -635,9 +640,9 @@ public class Main {
     }
 
     private static void printIdentityFingerprint(Manager m, String theirUsername, JsonIdentityKeyStore.Identity theirId) {
     }
 
     private static void printIdentityFingerprint(Manager m, String theirUsername, JsonIdentityKeyStore.Identity theirId) {

-        String digits = formatSafetyNumber(m.computeSafetyNumber(theirUsername, theirId.identityKey));
+        String digits = formatSafetyNumber(m.computeSafetyNumber(theirUsername, theirId.getIdentityKey()));

         System.out.println(String.format("%s: %s Added: %s Fingerprint: %s Safety Number: %s", theirUsername,
         System.out.println(String.format("%s: %s Added: %s Fingerprint: %s Safety Number: %s", theirUsername,

-                theirId.trustLevel, theirId.added, Hex.toStringCondensed(theirId.getFingerprint()), digits));
+                theirId.getTrustLevel(), theirId.getDateAdded(), Hex.toStringCondensed(theirId.getFingerprint()), digits));

     }
     
     private static void printGroup(GroupInfo group, boolean detailed) {
     }
     
     private static void printGroup(GroupInfo group, boolean detailed) {

diff --git a/src/main/java/org/asamk/signal/Manager.java b/src/main/java/org/asamk/signal/Manager.java
index 4a5d46805c8901c8df668b2ec516bc449ad9f52a..ce8ee00c77e68c55de240db13503c4376f4d5e88 100644 (file)
--- a/src/main/java/org/asamk/signal/Manager.java
+++ b/src/main/java/org/asamk/signal/Manager.java
@@ -16,18 +16,70 @@
  */
 package org.asamk.signal;
 
  */
 package org.asamk.signal;
 

-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import static java.nio.file.attribute.PosixFilePermission.OWNER_EXECUTE;
+import static java.nio.file.attribute.PosixFilePermission.OWNER_READ;
+import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InvalidObjectException;
+import java.io.OutputStream;
+import java.io.RandomAccessFile;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.nio.channels.Channels;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.PosixFilePermission;
+import java.nio.file.attribute.PosixFilePermissions;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+

 import org.apache.http.util.TextUtils;
 import org.asamk.Signal;
 import org.apache.http.util.TextUtils;
 import org.asamk.Signal;

-import org.whispersystems.libsignal.*;
+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.JsonGroupStore;
+import org.asamk.signal.storage.protocol.JsonIdentityKeyStore;
+import org.asamk.signal.storage.protocol.JsonSignalProtocolStore;
+import org.asamk.signal.storage.thread.JsonThreadStore;
+import org.asamk.signal.storage.thread.ThreadInfo;
+import org.asamk.signal.util.Base64;
+import org.asamk.signal.util.Util;
+import org.whispersystems.libsignal.DuplicateMessageException;
+import org.whispersystems.libsignal.IdentityKey;
+import org.whispersystems.libsignal.IdentityKeyPair;
+import org.whispersystems.libsignal.InvalidKeyException;
+import org.whispersystems.libsignal.InvalidKeyIdException;
+import org.whispersystems.libsignal.InvalidMessageException;
+import org.whispersystems.libsignal.InvalidVersionException;
+import org.whispersystems.libsignal.LegacyMessageException;
+import org.whispersystems.libsignal.NoSessionException;

 import org.whispersystems.libsignal.ecc.Curve;
 import org.whispersystems.libsignal.ecc.ECKeyPair;
 import org.whispersystems.libsignal.ecc.ECPublicKey;
 import org.whispersystems.libsignal.ecc.Curve;
 import org.whispersystems.libsignal.ecc.ECKeyPair;
 import org.whispersystems.libsignal.ecc.ECPublicKey;


@@ -44,36 +96,44 @@ import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
 import org.whispersystems.signalservice.api.crypto.SignalServiceCipher;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
 import org.whispersystems.signalservice.api.crypto.SignalServiceCipher;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;

-import org.whispersystems.signalservice.api.messages.*;
-import org.whispersystems.signalservice.api.messages.multidevice.*;
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
+import org.whispersystems.signalservice.api.messages.SignalServiceContent;
+import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
+import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
+import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
+import org.whispersystems.signalservice.api.messages.multidevice.DeviceContact;
+import org.whispersystems.signalservice.api.messages.multidevice.DeviceContactsInputStream;
+import org.whispersystems.signalservice.api.messages.multidevice.DeviceContactsOutputStream;
+import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroup;
+import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroupsInputStream;
+import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroupsOutputStream;
+import org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo;
+import org.whispersystems.signalservice.api.messages.multidevice.RequestMessage;
+import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;

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

-import org.whispersystems.signalservice.api.push.exceptions.*;
+import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
+import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
+import org.whispersystems.signalservice.api.push.exceptions.NetworkFailureException;
+import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
+import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;

 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
 import org.whispersystems.signalservice.internal.push.SignalServiceUrl;
 
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
 import org.whispersystems.signalservice.internal.push.SignalServiceUrl;
 

-import java.io.*;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.nio.channels.Channels;
-import java.nio.channels.FileChannel;
-import java.nio.channels.FileLock;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.nio.file.attribute.PosixFilePermission;
-import java.nio.file.attribute.PosixFilePermissions;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import static java.nio.file.attribute.PosixFilePermission.*;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.node.ObjectNode;

 
 class Manager implements Signal {
     private final static String URL = "https://textsecure-service.whispersystems.org";
 
 class Manager implements Signal {
     private final static String URL = "https://textsecure-service.whispersystems.org";


@@ -1532,11 +1592,11 @@ class Manager implements Signal {
             return false;
         }
         for (JsonIdentityKeyStore.Identity id : ids) {
             return false;
         }
         for (JsonIdentityKeyStore.Identity id : ids) {

-            if (!Arrays.equals(id.identityKey.serialize(), fingerprint)) {
+            if (!Arrays.equals(id.getIdentityKey().serialize(), fingerprint)) {

                 continue;
             }
 
                 continue;
             }
 

-            signalProtocolStore.saveIdentity(name, id.identityKey, TrustLevel.TRUSTED_VERIFIED);
+            signalProtocolStore.saveIdentity(name, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);

             save();
             return true;
         }
             save();
             return true;
         }


@@ -1555,11 +1615,11 @@ class Manager implements Signal {
             return false;
         }
         for (JsonIdentityKeyStore.Identity id : ids) {
             return false;
         }
         for (JsonIdentityKeyStore.Identity id : ids) {

-            if (!safetyNumber.equals(computeSafetyNumber(name, id.identityKey))) {
+            if (!safetyNumber.equals(computeSafetyNumber(name, id.getIdentityKey()))) {

                 continue;
             }
 
                 continue;
             }
 

-            signalProtocolStore.saveIdentity(name, id.identityKey, TrustLevel.TRUSTED_VERIFIED);
+            signalProtocolStore.saveIdentity(name, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);

             save();
             return true;
         }
             save();
             return true;
         }


@@ -1577,8 +1637,8 @@ class Manager implements Signal {
             return false;
         }
         for (JsonIdentityKeyStore.Identity id : ids) {
             return false;
         }
         for (JsonIdentityKeyStore.Identity id : ids) {

-            if (id.trustLevel == TrustLevel.UNTRUSTED) {
-                signalProtocolStore.saveIdentity(name, id.identityKey, TrustLevel.TRUSTED_UNVERIFIED);
+            if (id.getTrustLevel() == TrustLevel.UNTRUSTED) {
+                signalProtocolStore.saveIdentity(name, id.getIdentityKey(), TrustLevel.TRUSTED_UNVERIFIED);

             }
         }
         save();
             }
         }
         save();

diff --git a/src/main/java/org/asamk/signal/NotAGroupMemberException.java b/src/main/java/org/asamk/signal/NotAGroupMemberException.java
index 52ba4238b73a5765c3a28a33e313e6a0312bd0b2..d525d7e96c5a5c8e84577deb25c01f86b92159ff 100644 (file)
--- a/src/main/java/org/asamk/signal/NotAGroupMemberException.java
+++ b/src/main/java/org/asamk/signal/NotAGroupMemberException.java
@@ -1,5 +1,6 @@
 package org.asamk.signal;
 
 package org.asamk.signal;
 

+import org.asamk.signal.util.Base64;

 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 
 public class NotAGroupMemberException extends DBusExecutionException {
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 
 public class NotAGroupMemberException extends DBusExecutionException {

diff --git a/src/main/java/org/asamk/signal/storage/contacts/ContactInfo.java b/src/main/java/org/asamk/signal/storage/contacts/ContactInfo.java
index c607238f6f65c463e29f5f53a050a494e5746e94..f66792b25ccb4cc3f8c5c1c8ef53b7d9bbdb098e 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/contacts/ContactInfo.java
+++ b/src/main/java/org/asamk/signal/storage/contacts/ContactInfo.java
@@ -1,4 +1,4 @@
-package org.asamk.signal;
+package org.asamk.signal.storage.contacts;

 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 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/storage/contacts/JsonContactsStore.java
index 500684fe2974b46c9215160d88c30410d12d1409..702f78e3bcc8b6b5e890d2c2331020a4b3f318b3 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/contacts/JsonContactsStore.java
+++ b/src/main/java/org/asamk/signal/storage/contacts/JsonContactsStore.java
@@ -1,4 +1,4 @@
-package org.asamk.signal;
+package org.asamk.signal.storage.contacts;

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


@@ -21,15 +21,15 @@ public class JsonContactsStore {
 
     private static final ObjectMapper jsonProcessor = new ObjectMapper();
 
 
     private static final ObjectMapper jsonProcessor = new ObjectMapper();
 

-    void updateContact(ContactInfo contact) {
+    public void updateContact(ContactInfo contact) {

         contacts.put(contact.number, contact);
     }
 
         contacts.put(contact.number, contact);
     }
 

-    ContactInfo getContact(String number) {
+    public ContactInfo getContact(String number) {

         return contacts.get(number);
     }
 
         return contacts.get(number);
     }
 

-    List<ContactInfo> getContacts() {
+    public List<ContactInfo> getContacts() {

         return new ArrayList<>(contacts.values());
     }
 
         return new ArrayList<>(contacts.values());
     }
 

diff --git a/src/main/java/org/asamk/signal/storage/groups/GroupInfo.java b/src/main/java/org/asamk/signal/storage/groups/GroupInfo.java
index 610e8f9f275b0cafe4e1682e6af885123d372382..e28a5921fe6ca80b7ee2bfe12934a2e41d57f41e 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/groups/GroupInfo.java
+++ b/src/main/java/org/asamk/signal/storage/groups/GroupInfo.java
@@ -1,4 +1,4 @@
-package org.asamk.signal;
+package org.asamk.signal.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/JsonGroupStore.java b/src/main/java/org/asamk/signal/storage/groups/JsonGroupStore.java
index aa7e3a4501371986d07f497e61de70c20b5d3d1f..b5b0e54e2f58a1e014678913f6598112167cf361 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/groups/JsonGroupStore.java
+++ b/src/main/java/org/asamk/signal/storage/groups/JsonGroupStore.java
@@ -1,4 +1,4 @@
-package org.asamk.signal;
+package org.asamk.signal.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;


@@ -13,6 +13,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import java.util.List;
 import java.util.Map;
 

+import org.asamk.signal.util.Base64;
+

 public class JsonGroupStore {
     @JsonProperty("groups")
     @JsonSerialize(using = JsonGroupStore.MapToListSerializer.class)
 public class JsonGroupStore {
     @JsonProperty("groups")
     @JsonSerialize(using = JsonGroupStore.MapToListSerializer.class)


@@ -23,16 +25,16 @@ public class JsonGroupStore {
 
     private static final ObjectMapper jsonProcessor = new ObjectMapper();
 
 
     private static final ObjectMapper jsonProcessor = new ObjectMapper();
 

-    void updateGroup(GroupInfo group) {
+    public void updateGroup(GroupInfo group) {

         groups.put(Base64.encodeBytes(group.groupId), group);
     }
 
         groups.put(Base64.encodeBytes(group.groupId), group);
     }
 

-    GroupInfo getGroup(byte[] groupId) {
+    public GroupInfo getGroup(byte[] groupId) {

         GroupInfo g = groups.get(Base64.encodeBytes(groupId));
         return g;
     }
 
         GroupInfo g = groups.get(Base64.encodeBytes(groupId));
         return g;
     }
 

-    List<GroupInfo> getGroups() {
+    public List<GroupInfo> getGroups() {

         return new ArrayList<>(groups.values());
     }
 
         return new ArrayList<>(groups.values());
     }
 

diff --git a/src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java b/src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java
index d71e3581d6dc18e1f4f6dbd9d77a2d6701aed423..bda7b817c1966f16ce1a3f1e9348da571d1c17a7 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java
+++ b/src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java
@@ -1,9 +1,12 @@
-package org.asamk.signal;
+package org.asamk.signal.storage.protocol;

 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.*;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.*;

+
+import org.asamk.signal.TrustLevel;
+import org.asamk.signal.util.Base64;

 import org.whispersystems.libsignal.IdentityKey;
 import org.whispersystems.libsignal.IdentityKeyPair;
 import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.libsignal.IdentityKey;
 import org.whispersystems.libsignal.IdentityKeyPair;
 import org.whispersystems.libsignal.InvalidKeyException;


@@ -13,7 +16,7 @@ import org.whispersystems.libsignal.state.IdentityKeyStore;
 import java.io.IOException;
 import java.util.*;
 
 import java.io.IOException;
 import java.util.*;
 

-class JsonIdentityKeyStore implements IdentityKeyStore {
+public class JsonIdentityKeyStore implements IdentityKeyStore {

 
     private final Map<String, List<Identity>> trustedKeys = new HashMap<>();
 
 
     private final Map<String, List<Identity>> trustedKeys = new HashMap<>();
 


@@ -177,6 +180,18 @@ class JsonIdentityKeyStore implements IdentityKeyStore {
             return trustLevel == TrustLevel.TRUSTED_UNVERIFIED ||
                     trustLevel == TrustLevel.TRUSTED_VERIFIED;
         }
             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();
 
         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/storage/protocol/JsonPreKeyStore.java
index d4c8d521a7991a93f2ffd25fcac346e537882937..9be6cca35159359458d23611215bfb5f3a699b34 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonPreKeyStore.java
+++ b/src/main/java/org/asamk/signal/storage/protocol/JsonPreKeyStore.java
@@ -1,9 +1,11 @@
-package org.asamk.signal;
+package org.asamk.signal.storage.protocol;

 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.*;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.*;

+
+import org.asamk.signal.util.Base64;

 import org.whispersystems.libsignal.InvalidKeyIdException;
 import org.whispersystems.libsignal.state.PreKeyRecord;
 import org.whispersystems.libsignal.state.PreKeyStore;
 import org.whispersystems.libsignal.InvalidKeyIdException;
 import org.whispersystems.libsignal.state.PreKeyRecord;
 import org.whispersystems.libsignal.state.PreKeyStore;

diff --git a/src/main/java/org/asamk/signal/storage/protocol/JsonSessionStore.java b/src/main/java/org/asamk/signal/storage/protocol/JsonSessionStore.java
index cd4d55ad61dd12e790abee3dbbfd1105bd9843d0..c8377ada6ddfdafb568a3e0484e02c9bf486fcfd 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonSessionStore.java
+++ b/src/main/java/org/asamk/signal/storage/protocol/JsonSessionStore.java
@@ -1,9 +1,11 @@
-package org.asamk.signal;
+package org.asamk.signal.storage.protocol;

 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.*;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.*;

+
+import org.asamk.signal.util.Base64;

 import org.whispersystems.libsignal.SignalProtocolAddress;
 import org.whispersystems.libsignal.state.SessionRecord;
 import org.whispersystems.libsignal.state.SessionStore;
 import org.whispersystems.libsignal.SignalProtocolAddress;
 import org.whispersystems.libsignal.state.SessionRecord;
 import org.whispersystems.libsignal.state.SessionStore;

diff --git a/src/main/java/org/asamk/signal/storage/protocol/JsonSignalProtocolStore.java b/src/main/java/org/asamk/signal/storage/protocol/JsonSignalProtocolStore.java
index 79f49c7f827881d92038ff7c35bd19bd8b34829a..71a5e4b9438d87c128e49138a8f0f6267b749ebd 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonSignalProtocolStore.java
+++ b/src/main/java/org/asamk/signal/storage/protocol/JsonSignalProtocolStore.java
@@ -1,8 +1,10 @@
-package org.asamk.signal;
+package org.asamk.signal.storage.protocol;

 
 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.asamk.signal.TrustLevel;

 import org.whispersystems.libsignal.IdentityKey;
 import org.whispersystems.libsignal.IdentityKeyPair;
 import org.whispersystems.libsignal.InvalidKeyIdException;
 import org.whispersystems.libsignal.IdentityKey;
 import org.whispersystems.libsignal.IdentityKeyPair;
 import org.whispersystems.libsignal.InvalidKeyIdException;


@@ -15,7 +17,7 @@ import org.whispersystems.libsignal.state.SignedPreKeyRecord;
 import java.util.List;
 import java.util.Map;
 
 import java.util.List;
 import java.util.Map;
 

-class JsonSignalProtocolStore implements SignalProtocolStore {
+public class JsonSignalProtocolStore implements SignalProtocolStore {

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

diff --git a/src/main/java/org/asamk/signal/storage/protocol/JsonSignedPreKeyStore.java b/src/main/java/org/asamk/signal/storage/protocol/JsonSignedPreKeyStore.java
index cdcd506b2b55a1bf727b5d008ebf6074aa0ab77a..e1ff1228fbeb3bddd2adc31851df70e30cde2e03 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonSignedPreKeyStore.java
+++ b/src/main/java/org/asamk/signal/storage/protocol/JsonSignedPreKeyStore.java
@@ -1,9 +1,11 @@
-package org.asamk.signal;
+package org.asamk.signal.storage.protocol;

 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.*;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.*;

+
+import org.asamk.signal.util.Base64;

 import org.whispersystems.libsignal.InvalidKeyIdException;
 import org.whispersystems.libsignal.state.SignedPreKeyRecord;
 import org.whispersystems.libsignal.state.SignedPreKeyStore;
 import org.whispersystems.libsignal.InvalidKeyIdException;
 import org.whispersystems.libsignal.state.SignedPreKeyRecord;
 import org.whispersystems.libsignal.state.SignedPreKeyStore;

diff --git a/src/main/java/org/asamk/signal/storage/thread/JsonThreadStore.java b/src/main/java/org/asamk/signal/storage/thread/JsonThreadStore.java
index 3a8eb830c3687498ac9cc8cc1e9784254aa55a26..ce77a15fe20609b34c8eb86e54f3969ad09202ba 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/thread/JsonThreadStore.java
+++ b/src/main/java/org/asamk/signal/storage/thread/JsonThreadStore.java
@@ -1,4 +1,4 @@
-package org.asamk.signal;
+package org.asamk.signal.storage.thread;

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


@@ -21,15 +21,15 @@ public class JsonThreadStore {
 
     private static final ObjectMapper jsonProcessor = new ObjectMapper();
 
 
     private static final ObjectMapper jsonProcessor = new ObjectMapper();
 

-    void updateThread(ThreadInfo thread) {
+    public void updateThread(ThreadInfo thread) {

         threads.put(thread.id, thread);
     }
 
         threads.put(thread.id, thread);
     }
 

-    ThreadInfo getThread(String id) {
+    public ThreadInfo getThread(String id) {

         return threads.get(id);
     }
 
         return threads.get(id);
     }
 

-    List<ThreadInfo> getThreads() {
+    public List<ThreadInfo> getThreads() {

         return new ArrayList<>(threads.values());
     }
 
         return new ArrayList<>(threads.values());
     }
 

diff --git a/src/main/java/org/asamk/signal/storage/thread/ThreadInfo.java b/src/main/java/org/asamk/signal/storage/thread/ThreadInfo.java
index a664059b1c68982d78262a38f32c7bc435ba151d..da94f219a95fa6151f230f0a93578c8bf7773972 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/thread/ThreadInfo.java
+++ b/src/main/java/org/asamk/signal/storage/thread/ThreadInfo.java
@@ -1,4 +1,4 @@
-package org.asamk.signal;
+package org.asamk.signal.storage.thread;

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

diff --git a/src/main/java/org/asamk/signal/util/Base64.java b/src/main/java/org/asamk/signal/util/Base64.java
index 517bb7ddd7ef595b9ea1c7dfa5598bfbd9c27b2b..d5e523b16b7e6859d26134a58105c19e41cad997 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Base64.java
+++ b/src/main/java/org/asamk/signal/util/Base64.java
@@ -1,4 +1,4 @@
-package org.asamk.signal;
+package org.asamk.signal.util;

 
 /**
  * <p>Encodes and decodes to and from Base64 notation.</p>
 
 /**
  * <p>Encodes and decodes to and from Base64 notation.</p>

diff --git a/src/main/java/org/asamk/signal/util/Hex.java b/src/main/java/org/asamk/signal/util/Hex.java
index 696ca62b9aa4407d1266399787f81d80cea5e136..623c5cf84be3f816a6151322dc7eea45324a9f30 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Hex.java
+++ b/src/main/java/org/asamk/signal/util/Hex.java
@@ -1,4 +1,4 @@
-package org.asamk.signal;
+package org.asamk.signal.util;

 
 public class Hex {
 
 
 public class Hex {
 

diff --git a/src/main/java/org/asamk/signal/util/Util.java b/src/main/java/org/asamk/signal/util/Util.java
index 4eeabf1c91298b439e04f974904f5e1163a618dd..679e13847911e3c58bd6f93c6428cf80628d269d 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -1,11 +1,11 @@
-package org.asamk.signal;
+package org.asamk.signal.util;

 
 import java.io.File;
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 
 
 import java.io.File;
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 

-class Util {
+public class Util {

     public static String getSecret(int size) {
         byte[] secret = getSecretBytes(size);
         return Base64.encodeBytes(secret);
     public static String getSecret(int size) {
         byte[] secret = getSecretBytes(size);
         return Base64.encodeBytes(secret);