Move group classes to separate package

diff --git a/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java b/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
index 50eb9f9b5ffb1b21c5ed5f79df86798f3b027eb6..0cffd7b1dce73be67eb9b21ea655b70e846badc5 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
@@ -1,8 +1,8 @@
 package org.asamk.signal;
 
 import org.asamk.Signal;
 package org.asamk.signal;
 
 import org.asamk.Signal;

-import org.asamk.signal.manager.GroupUtils;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

+import org.asamk.signal.manager.groups.GroupUtils;

 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;

diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
index 99010e13be19cd86e82126202fb2c08786f32695..8dc38e4fe26ebd6f8c12c47f5773c39ecbada023 100644 (file)
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -1,8 +1,8 @@
 package org.asamk.signal;
 
 package org.asamk.signal;
 

-import org.asamk.signal.manager.GroupId;
-import org.asamk.signal.manager.GroupUtils;

 import org.asamk.signal.manager.Manager;
 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.util.DateUtils;
 import org.asamk.signal.storage.contacts.ContactInfo;
 import org.asamk.signal.storage.groups.GroupInfo;
 import org.asamk.signal.util.DateUtils;

diff --git a/src/main/java/org/asamk/signal/commands/BlockCommand.java b/src/main/java/org/asamk/signal/commands/BlockCommand.java
index 2a9bc4e939c1822d728a01a7484057cbcfb85707..627be5a9f2f62d1275e6256a4726fa1249ed0baa 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/BlockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/BlockCommand.java
@@ -3,10 +3,10 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 

-import org.asamk.signal.manager.GroupId;
-import org.asamk.signal.manager.GroupIdFormatException;
-import org.asamk.signal.manager.GroupNotFoundException;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

+import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.groups.GroupIdFormatException;
+import org.asamk.signal.manager.groups.GroupNotFoundException;

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

diff --git a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
index 8438e1fad635a6a5bada22df8c85b13a2356fba4..305bf55b85461b437969fc0be434cf00cb4e9f50 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
@@ -4,9 +4,9 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;

-import org.asamk.signal.manager.GroupId;
-import org.asamk.signal.manager.GroupInviteLinkUrl;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

+import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.groups.GroupInviteLinkUrl;

 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;

diff --git a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
index 4d1032a2a7b9382dac36683d3796a9cb8efffa6f..66ff3a00285e836a3ef09c0be05825193194446e 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
@@ -4,8 +4,8 @@ import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 

-import org.asamk.signal.manager.GroupInviteLinkUrl;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

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

 import org.asamk.signal.storage.groups.GroupInfo;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 import org.asamk.signal.storage.groups.GroupInfo;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 

diff --git a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
index efc63f8fa2cf389d7f31884565695091d6afcb02..c1f6bfbfe047e1c91b368c95e68e357de378f8dc 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
@@ -3,11 +3,11 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 

-import org.asamk.signal.manager.GroupId;
-import org.asamk.signal.manager.GroupIdFormatException;
-import org.asamk.signal.manager.GroupNotFoundException;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

-import org.asamk.signal.manager.NotAGroupMemberException;
+import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.groups.GroupIdFormatException;
+import org.asamk.signal.manager.groups.GroupNotFoundException;
+import org.asamk.signal.manager.groups.NotAGroupMemberException;

 import org.asamk.signal.util.Util;
 import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.asamk.signal.util.Util;
 import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;

diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index 04b064340c188cb4a90687c3638191db29ba3b06..ee51dd916326ab4f8f5ad1fe3923b2f81de358c2 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -5,7 +5,7 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;

-import org.asamk.signal.manager.GroupIdFormatException;
+import org.asamk.signal.manager.groups.GroupIdFormatException;

 import org.asamk.signal.util.IOUtils;
 import org.asamk.signal.util.Util;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.asamk.signal.util.IOUtils;
 import org.asamk.signal.util.Util;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;

diff --git a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
index 345c918014077658a00de2a77ab3f26755991560..c680bfd7b1784433bc4647bfd962fca563d14dcc 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
@@ -4,11 +4,11 @@ import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 

-import org.asamk.signal.manager.GroupId;
-import org.asamk.signal.manager.GroupIdFormatException;
-import org.asamk.signal.manager.GroupNotFoundException;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

-import org.asamk.signal.manager.NotAGroupMemberException;
+import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.groups.GroupIdFormatException;
+import org.asamk.signal.manager.groups.GroupNotFoundException;
+import org.asamk.signal.manager.groups.NotAGroupMemberException;

 import org.asamk.signal.util.Util;
 import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.asamk.signal.util.Util;
 import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;

diff --git a/src/main/java/org/asamk/signal/commands/UnblockCommand.java b/src/main/java/org/asamk/signal/commands/UnblockCommand.java
index 73e578ace26c176b354a9ca27f9bc04578d4f6c1..14ea2996ba6df565f262e83ccf202e9be67e638f 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UnblockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UnblockCommand.java
@@ -3,10 +3,10 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 

-import org.asamk.signal.manager.GroupId;
-import org.asamk.signal.manager.GroupIdFormatException;
-import org.asamk.signal.manager.GroupNotFoundException;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

+import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.groups.GroupIdFormatException;
+import org.asamk.signal.manager.groups.GroupNotFoundException;

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

diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
index dae06b86404630153f103ecad7c69e0e5f94964a..a6f40ef216a193345b64392fa24ddf925de8c631 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -4,7 +4,7 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;

-import org.asamk.signal.manager.GroupIdFormatException;
+import org.asamk.signal.manager.groups.GroupIdFormatException;

 import org.asamk.signal.util.Util;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.whispersystems.util.Base64;
 import org.asamk.signal.util.Util;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.whispersystems.util.Base64;

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index cbb7283504b6ace1efb6875f7a621a11625cf5d5..df3f12f27fc9ec429914dfeed04e6e28b92963f3 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -2,10 +2,10 @@ package org.asamk.signal.dbus;
 
 import org.asamk.Signal;
 import org.asamk.signal.manager.AttachmentInvalidException;
 
 import org.asamk.Signal;
 import org.asamk.signal.manager.AttachmentInvalidException;

-import org.asamk.signal.manager.GroupId;
-import org.asamk.signal.manager.GroupNotFoundException;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

-import org.asamk.signal.manager.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.util.ErrorUtils;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.asamk.signal.storage.groups.GroupInfo;
 import org.asamk.signal.util.ErrorUtils;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;

diff --git a/src/main/java/org/asamk/signal/json/JsonGroupInfo.java b/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
index 9709be2025e48716f08d883e95f547260e324b4a..79967955352a1d547909e75e0aec71fae929e92b 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
+++ b/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
@@ -1,6 +1,6 @@
 package org.asamk.signal.json;
 
 package org.asamk.signal.json;
 

-import org.asamk.signal.manager.GroupUtils;
+import org.asamk.signal.manager.groups.GroupUtils;

 import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;

diff --git a/src/main/java/org/asamk/signal/manager/HandleAction.java b/src/main/java/org/asamk/signal/manager/HandleAction.java
index aa25d8c5ae398d85a829ef11d408b226d364ba5f..0dd151a93b9fd8ade674613513849fc304674032 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/HandleAction.java
+++ b/src/main/java/org/asamk/signal/manager/HandleAction.java
@@ -1,5 +1,6 @@
 package org.asamk.signal.manager;
 
 package org.asamk.signal.manager;
 

+import org.asamk.signal.manager.groups.GroupIdV1;

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

diff --git a/src/main/java/org/asamk/signal/manager/KeyUtils.java b/src/main/java/org/asamk/signal/manager/KeyUtils.java
index 21f6037fe240fa8d960f66191f551e3d91b03736..6ac093db7d65a2dd0bd86cec713f6da4fbf6aec9 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/KeyUtils.java
+++ b/src/main/java/org/asamk/signal/manager/KeyUtils.java
@@ -5,7 +5,7 @@ import org.signal.zkgroup.InvalidInputException;
 import org.signal.zkgroup.profiles.ProfileKey;
 import org.whispersystems.util.Base64;
 
 import org.signal.zkgroup.profiles.ProfileKey;
 import org.whispersystems.util.Base64;
 

-class KeyUtils {
+public class KeyUtils {

 
     private KeyUtils() {
     }
 
     private KeyUtils() {
     }


@@ -35,7 +35,7 @@ class KeyUtils {
         return Base64.encodeBytes(secret);
     }
 
         return Base64.encodeBytes(secret);
     }
 

-    static byte[] getSecretBytes(int size) {
+    public static byte[] getSecretBytes(int size) {

         byte[] secret = new byte[size];
         RandomUtils.getSecureRandom().nextBytes(secret);
         return secret;
         byte[] secret = new byte[size];
         RandomUtils.getSecureRandom().nextBytes(secret);
         return secret;

diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index 761905dfeb59e98028390d7da4243eec2df56eb7..c958e0a4373c468ef1fa2f270c20bd9408274f18 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -18,6 +18,13 @@ package org.asamk.signal.manager;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 

+import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.groups.GroupIdV1;
+import org.asamk.signal.manager.groups.GroupIdV2;
+import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
+import org.asamk.signal.manager.groups.GroupNotFoundException;
+import org.asamk.signal.manager.groups.GroupUtils;
+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;

diff --git a/src/main/java/org/asamk/signal/manager/GroupId.java b/src/main/java/org/asamk/signal/manager/groups/GroupId.java
similarity index 97%
rename from src/main/java/org/asamk/signal/manager/GroupId.java
rename to src/main/java/org/asamk/signal/manager/groups/GroupId.java
index 34e18e8e972150f4534abb66d41d9dc946543aec..9a15de65e5a2f1bca706b25b4f78d0582bbd0aa4 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/GroupId.java
+++ b/src/main/java/org/asamk/signal/manager/groups/GroupId.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.groups;

 
 import org.whispersystems.util.Base64;
 
 
 import org.whispersystems.util.Base64;
 

diff --git a/src/main/java/org/asamk/signal/manager/GroupIdFormatException.java b/src/main/java/org/asamk/signal/manager/groups/GroupIdFormatException.java
similarity index 85%
rename from src/main/java/org/asamk/signal/manager/GroupIdFormatException.java
rename to src/main/java/org/asamk/signal/manager/groups/GroupIdFormatException.java
index 83afd15bc16a39acd1cb41e3bb4f57fe273499e5..8050da22dad0a93c5b2eafc09b9813a2728d71a8 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/GroupIdFormatException.java
+++ b/src/main/java/org/asamk/signal/manager/groups/GroupIdFormatException.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.groups;

 
 public class GroupIdFormatException extends Exception {
 
 
 public class GroupIdFormatException extends Exception {
 

diff --git a/src/main/java/org/asamk/signal/manager/GroupIdV1.java b/src/main/java/org/asamk/signal/manager/groups/GroupIdV1.java
similarity index 87%
rename from src/main/java/org/asamk/signal/manager/GroupIdV1.java
rename to src/main/java/org/asamk/signal/manager/groups/GroupIdV1.java
index 40862f073cbbb3e2f516ab2ea7b407e6b52c87f4..d865356ef262bac6ea30f8d56c905d8a028fea3b 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/GroupIdV1.java
+++ b/src/main/java/org/asamk/signal/manager/groups/GroupIdV1.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.groups;

 
 import static org.asamk.signal.manager.KeyUtils.getSecretBytes;
 
 
 import static org.asamk.signal.manager.KeyUtils.getSecretBytes;
 

diff --git a/src/main/java/org/asamk/signal/manager/GroupIdV2.java b/src/main/java/org/asamk/signal/manager/groups/GroupIdV2.java
similarity index 86%
rename from src/main/java/org/asamk/signal/manager/GroupIdV2.java
rename to src/main/java/org/asamk/signal/manager/groups/GroupIdV2.java
index b329be1d30fbe657cd8a6b8af1395860fb105a18..913a9e936a69973a6882405e83feca979cbd3a48 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/GroupIdV2.java
+++ b/src/main/java/org/asamk/signal/manager/groups/GroupIdV2.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.groups;

 
 import java.util.Base64;
 
 
 import java.util.Base64;
 

diff --git a/src/main/java/org/asamk/signal/manager/GroupInviteLinkUrl.java b/src/main/java/org/asamk/signal/manager/groups/GroupInviteLinkUrl.java
similarity index 99%
rename from src/main/java/org/asamk/signal/manager/GroupInviteLinkUrl.java
rename to src/main/java/org/asamk/signal/manager/groups/GroupInviteLinkUrl.java
index 67ce7892e9bf3136c3b24929ec9e0c1a0052ce59..bf9e0e55c633c56454f3fffa44607c0cc9237ad3 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/GroupInviteLinkUrl.java
+++ b/src/main/java/org/asamk/signal/manager/groups/GroupInviteLinkUrl.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.groups;

 
 import com.google.protobuf.ByteString;
 
 
 import com.google.protobuf.ByteString;
 

diff --git a/src/main/java/org/asamk/signal/manager/GroupLinkPassword.java b/src/main/java/org/asamk/signal/manager/groups/GroupLinkPassword.java
similarity index 90%
rename from src/main/java/org/asamk/signal/manager/GroupLinkPassword.java
rename to src/main/java/org/asamk/signal/manager/groups/GroupLinkPassword.java
index 38e2aaf4491ac2f5d3686632332a9e507aaa4347..41be672a7b65b386a3502e65f1038d095d0158fa 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/GroupLinkPassword.java
+++ b/src/main/java/org/asamk/signal/manager/groups/GroupLinkPassword.java
@@ -1,4 +1,6 @@
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.groups;
+
+import org.asamk.signal.manager.KeyUtils;

 
 import java.util.Arrays;
 
 
 import java.util.Arrays;
 

diff --git a/src/main/java/org/asamk/signal/manager/GroupNotFoundException.java b/src/main/java/org/asamk/signal/manager/groups/GroupNotFoundException.java
similarity index 81%
rename from src/main/java/org/asamk/signal/manager/GroupNotFoundException.java
rename to src/main/java/org/asamk/signal/manager/groups/GroupNotFoundException.java
index d7efa923ee20ad5ad7011df4bc5f2eaaaf6a928d..0fc0c444bc8f5e27facb52e5a722423e4f462e4e 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/GroupNotFoundException.java
+++ b/src/main/java/org/asamk/signal/manager/groups/GroupNotFoundException.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.groups;

 
 public class GroupNotFoundException extends Exception {
 
 
 public class GroupNotFoundException extends Exception {
 

diff --git a/src/main/java/org/asamk/signal/manager/GroupUtils.java b/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java
similarity index 98%
rename from src/main/java/org/asamk/signal/manager/GroupUtils.java
rename to src/main/java/org/asamk/signal/manager/groups/GroupUtils.java
index d86dfbe9cc179932a95a0143a1b7f4397b593b19..c5f727e19560e148d5dd5af67ecd4197cc451277 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/GroupUtils.java
+++ b/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager;
+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.GroupInfo;
 import org.asamk.signal.storage.groups.GroupInfoV1;

diff --git a/src/main/java/org/asamk/signal/manager/NotAGroupMemberException.java b/src/main/java/org/asamk/signal/manager/groups/NotAGroupMemberException.java
similarity index 85%
rename from src/main/java/org/asamk/signal/manager/NotAGroupMemberException.java
rename to src/main/java/org/asamk/signal/manager/groups/NotAGroupMemberException.java
index 2c9b3f330db5e2db353b8676fb81a2864a21378c..08cbcacd3131f25e8c975cff150dc8212d87c196 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/NotAGroupMemberException.java
+++ b/src/main/java/org/asamk/signal/manager/groups/NotAGroupMemberException.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.groups;

 
 public class NotAGroupMemberException extends Exception {
 
 
 public class NotAGroupMemberException extends Exception {
 

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 5a88bc667b3f08858cfec080a5573d46b51ec414..6a52e00ed9a817c2659f23df0dc5beed154e6959 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -2,9 +2,9 @@ package org.asamk.signal.manager.helper;
 
 import com.google.protobuf.InvalidProtocolBufferException;
 
 
 import com.google.protobuf.InvalidProtocolBufferException;
 

-import org.asamk.signal.manager.GroupIdV2;
-import org.asamk.signal.manager.GroupLinkPassword;
-import org.asamk.signal.manager.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.util.IOUtils;
 import org.asamk.signal.storage.groups.GroupInfoV2;
 import org.asamk.signal.storage.profiles.SignalProfile;
 import org.asamk.signal.util.IOUtils;

diff --git a/src/main/java/org/asamk/signal/storage/SignalAccount.java b/src/main/java/org/asamk/signal/storage/SignalAccount.java
index 3af52708b5cad9707ca0a9f0c5d312018ead7055..393d04490e0229f6140004e90a3d64707c7157eb 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/SignalAccount.java
+++ b/src/main/java/org/asamk/signal/storage/SignalAccount.java
@@ -10,7 +10,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 

-import org.asamk.signal.manager.GroupId;
+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.contacts.ContactInfo;
 import org.asamk.signal.storage.contacts.JsonContactsStore;
 import org.asamk.signal.storage.groups.GroupInfo;

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 40b8c8847c9204162dc610d3508fddd811f12c1f..fe72514172c8b3a945e6c4ed8aad2e690b19b285 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/groups/GroupInfo.java
+++ b/src/main/java/org/asamk/signal/storage/groups/GroupInfo.java
@@ -2,8 +2,8 @@ package org.asamk.signal.storage.groups;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 

-import org.asamk.signal.manager.GroupId;
-import org.asamk.signal.manager.GroupInviteLinkUrl;
+import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.groups.GroupInviteLinkUrl;

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

diff --git a/src/main/java/org/asamk/signal/storage/groups/GroupInfoV1.java b/src/main/java/org/asamk/signal/storage/groups/GroupInfoV1.java
index 90b26b81c4408a08a4d63ed7bcd62eba178e4535..e48fe297f71ddf8a48a80cbe60c2203c485c669b 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/groups/GroupInfoV1.java
+++ b/src/main/java/org/asamk/signal/storage/groups/GroupInfoV1.java
@@ -13,11 +13,11 @@ import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 

-import org.asamk.signal.manager.GroupId;
-import org.asamk.signal.manager.GroupIdV1;
-import org.asamk.signal.manager.GroupIdV2;
-import org.asamk.signal.manager.GroupInviteLinkUrl;
-import org.asamk.signal.manager.GroupUtils;
+import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.groups.GroupIdV1;
+import org.asamk.signal.manager.groups.GroupIdV2;
+import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
+import org.asamk.signal.manager.groups.GroupUtils;

 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 import java.io.IOException;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 import java.io.IOException;

diff --git a/src/main/java/org/asamk/signal/storage/groups/GroupInfoV2.java b/src/main/java/org/asamk/signal/storage/groups/GroupInfoV2.java
index 1b00caaaa68ee0262965f0ab84a090296f77eafb..0139f879dde864d9f147b0e60daf085301f129f8 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/groups/GroupInfoV2.java
+++ b/src/main/java/org/asamk/signal/storage/groups/GroupInfoV2.java
@@ -1,7 +1,7 @@
 package org.asamk.signal.storage.groups;
 
 package org.asamk.signal.storage.groups;
 

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

 import org.signal.storageservice.protos.groups.AccessControl;
 import org.signal.storageservice.protos.groups.local.DecryptedGroup;
 import org.signal.zkgroup.groups.GroupMasterKey;
 import org.signal.storageservice.protos.groups.AccessControl;
 import org.signal.storageservice.protos.groups.local.DecryptedGroup;
 import org.signal.zkgroup.groups.GroupMasterKey;

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 18bf5ed061c8319108417dd7fd73030411670ca4..1aae49f72d8b43b7e6cd144b4dfab55a5e75180e 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/groups/JsonGroupStore.java
+++ b/src/main/java/org/asamk/signal/storage/groups/JsonGroupStore.java
@@ -12,10 +12,10 @@ import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 

-import org.asamk.signal.manager.GroupId;
-import org.asamk.signal.manager.GroupIdV1;
-import org.asamk.signal.manager.GroupIdV2;
-import org.asamk.signal.manager.GroupUtils;
+import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.groups.GroupIdV1;
+import org.asamk.signal.manager.groups.GroupIdV2;
+import org.asamk.signal.manager.groups.GroupUtils;

 import org.asamk.signal.util.Hex;
 import org.asamk.signal.util.IOUtils;
 import org.signal.storageservice.protos.groups.local.DecryptedGroup;
 import org.asamk.signal.util.Hex;
 import org.asamk.signal.util.IOUtils;
 import org.signal.storageservice.protos.groups.local.DecryptedGroup;

diff --git a/src/main/java/org/asamk/signal/util/ErrorUtils.java b/src/main/java/org/asamk/signal/util/ErrorUtils.java
index 44d505bee56c4a01b0eb6968c6c02ecb4e32a205..e9553f98e8f5760cba9cf9470dcb5adbaf31e29e 100644 (file)
--- a/src/main/java/org/asamk/signal/util/ErrorUtils.java
+++ b/src/main/java/org/asamk/signal/util/ErrorUtils.java
@@ -1,8 +1,8 @@
 package org.asamk.signal.util;
 
 package org.asamk.signal.util;
 

-import org.asamk.signal.manager.GroupIdFormatException;
-import org.asamk.signal.manager.GroupNotFoundException;
-import org.asamk.signal.manager.NotAGroupMemberException;
+import org.asamk.signal.manager.groups.GroupIdFormatException;
+import org.asamk.signal.manager.groups.GroupNotFoundException;
+import org.asamk.signal.manager.groups.NotAGroupMemberException;

 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 

diff --git a/src/main/java/org/asamk/signal/util/Util.java b/src/main/java/org/asamk/signal/util/Util.java
index 3cd5619a382904b170f576c649ec6b1199ed0b5c..79a6587b5083733c442547f9e7c212601dffd06f 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -2,8 +2,8 @@ package org.asamk.signal.util;
 
 import com.fasterxml.jackson.databind.JsonNode;
 
 
 import com.fasterxml.jackson.databind.JsonNode;
 

-import org.asamk.signal.manager.GroupId;
-import org.asamk.signal.manager.GroupIdFormatException;
+import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.groups.GroupIdFormatException;

 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;