Move Exception classes to corresponding package

diff --git a/src/main/java/org/asamk/Signal.java b/src/main/java/org/asamk/Signal.java
index d56dbc9c2be1c34978b2990fd074c8cc7057bd02..c1acf13edfb8a3dce10878cebdd3c041310e0230 100644 (file)
--- a/src/main/java/org/asamk/Signal.java
+++ b/src/main/java/org/asamk/Signal.java
@@ -1,7 +1,7 @@
 package org.asamk;
 
 package org.asamk;
 

-import org.asamk.signal.AttachmentInvalidException;
-import org.asamk.signal.GroupNotFoundException;
+import org.asamk.signal.manager.AttachmentInvalidException;
+import org.asamk.signal.manager.GroupNotFoundException;

 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.interfaces.DBusInterface;
 import org.freedesktop.dbus.messages.DBusSignal;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.interfaces.DBusInterface;
 import org.freedesktop.dbus.messages.DBusSignal;

diff --git a/src/main/java/org/asamk/signal/commands/BlockCommand.java b/src/main/java/org/asamk/signal/commands/BlockCommand.java
index 305c5df2ea59ac154926509ce0e3c5775b7a0c20..05f5c9ce2c3f0a98d52ec81d17cfc63f3a541587 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/BlockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/BlockCommand.java
@@ -3,9 +3,9 @@ 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.GroupIdFormatException;
-import org.asamk.signal.GroupNotFoundException;
+import org.asamk.signal.manager.GroupNotFoundException;

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

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

 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/LinkCommand.java b/src/main/java/org/asamk/signal/commands/LinkCommand.java
index 917b674b26e70ab172fcf4818facb0d264513dc3..45f59082f7fbc748b25f0529b888f7c5b3122bc0 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/LinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/LinkCommand.java
@@ -3,8 +3,8 @@ 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.UserAlreadyExists;

 import org.asamk.signal.manager.ProvisioningManager;
 import org.asamk.signal.manager.ProvisioningManager;

+import org.asamk.signal.manager.UserAlreadyExists;

 import org.whispersystems.libsignal.InvalidKeyException;
 
 import java.io.IOException;
 import org.whispersystems.libsignal.InvalidKeyException;
 
 import java.io.IOException;

diff --git a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
index 6e53cb2aad025fb5cecb9ef5a23176ff19f8fb1d..6db230f5b5537708f8b1e5d609309aeabf1a37f9 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.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.GroupIdFormatException;
-import org.asamk.signal.GroupNotFoundException;
-import org.asamk.signal.NotAGroupMemberException;
+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.util.GroupIdFormatException;

 import org.asamk.signal.util.Util;
 import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
 
 import org.asamk.signal.util.Util;
 import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
 

diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index f431d7086b262ee5b33226325e6d7a337760e54c..a805a12cb66b9a84d0177b9e6320873f7f375026 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -5,10 +5,10 @@ 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.AttachmentInvalidException;
-import org.asamk.signal.GroupIdFormatException;
-import org.asamk.signal.GroupNotFoundException;
-import org.asamk.signal.NotAGroupMemberException;
+import org.asamk.signal.manager.AttachmentInvalidException;
+import org.asamk.signal.manager.GroupNotFoundException;
+import org.asamk.signal.manager.NotAGroupMemberException;
+import org.asamk.signal.util.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 eb1327ac25408c80dc5fef3449a5e875f72b0001..7e7488662d620d64918907138d91d28a4e6aed98 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
@@ -4,10 +4,10 @@ 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.GroupIdFormatException;
-import org.asamk.signal.GroupNotFoundException;
-import org.asamk.signal.NotAGroupMemberException;
+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.util.GroupIdFormatException;

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

diff --git a/src/main/java/org/asamk/signal/commands/UnblockCommand.java b/src/main/java/org/asamk/signal/commands/UnblockCommand.java
index 2fad39a57e07232116323a30cf85ffa18162a437..a95aa32876a8b87f8bbe34a0586567a0439e5d94 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UnblockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UnblockCommand.java
@@ -3,9 +3,9 @@ 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.GroupIdFormatException;
-import org.asamk.signal.GroupNotFoundException;
+import org.asamk.signal.manager.GroupNotFoundException;

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

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

 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 63f5252ef9cd9c941bef2c7fc4c2c498a8e511a1..7251a185445dcff30e9dcb891967b8a6653a5138 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -4,10 +4,10 @@ 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.AttachmentInvalidException;
-import org.asamk.signal.GroupIdFormatException;
-import org.asamk.signal.GroupNotFoundException;
-import org.asamk.signal.NotAGroupMemberException;
+import org.asamk.signal.manager.AttachmentInvalidException;
+import org.asamk.signal.manager.GroupNotFoundException;
+import org.asamk.signal.manager.NotAGroupMemberException;
+import org.asamk.signal.util.GroupIdFormatException;

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

diff --git a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
index fe25966cc60f210e2347378f0f34e968a3c60e60..77df2b22cde7fa870eda0f2f05d7cf9a89b221c4 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
@@ -3,8 +3,8 @@ 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.StickerPackInvalidException;

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

+import org.asamk.signal.manager.StickerPackInvalidException;

 
 import java.io.IOException;
 
 
 import java.io.IOException;
 

diff --git a/src/main/java/org/asamk/signal/AttachmentInvalidException.java b/src/main/java/org/asamk/signal/manager/AttachmentInvalidException.java
similarity index 57%
rename from src/main/java/org/asamk/signal/AttachmentInvalidException.java
rename to src/main/java/org/asamk/signal/manager/AttachmentInvalidException.java
index 839c79408cf91f3da0ae32565462f7b737dc0219..78fba6e0e696bd65e508a3b6457c9390fdbec59b 100644 (file)
--- a/src/main/java/org/asamk/signal/AttachmentInvalidException.java
+++ b/src/main/java/org/asamk/signal/manager/AttachmentInvalidException.java
@@ -1,8 +1,6 @@
-package org.asamk.signal;
+package org.asamk.signal.manager;

 
 

-import org.freedesktop.dbus.exceptions.DBusExecutionException;
-
-public class AttachmentInvalidException extends DBusExecutionException {
+public class AttachmentInvalidException extends Exception {

 
     public AttachmentInvalidException(String message) {
         super(message);
 
     public AttachmentInvalidException(String message) {
         super(message);

diff --git a/src/main/java/org/asamk/signal/GroupNotFoundException.java b/src/main/java/org/asamk/signal/manager/GroupNotFoundException.java
similarity index 51%
rename from src/main/java/org/asamk/signal/GroupNotFoundException.java
rename to src/main/java/org/asamk/signal/manager/GroupNotFoundException.java
index f09014a0cfcc7cf8e749ecfad846153325a192ee..0c0d6d2d016120ccf300f77caba9b688fbbb405a 100644 (file)
--- a/src/main/java/org/asamk/signal/GroupNotFoundException.java
+++ b/src/main/java/org/asamk/signal/manager/GroupNotFoundException.java
@@ -1,9 +1,8 @@
-package org.asamk.signal;
+package org.asamk.signal.manager;

 
 

-import org.freedesktop.dbus.exceptions.DBusExecutionException;

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

-public class GroupNotFoundException extends DBusExecutionException {
+public class GroupNotFoundException extends Exception {

 
     public GroupNotFoundException(byte[] groupId) {
         super("Group not found: " + Base64.encodeBytes(groupId));
 
     public GroupNotFoundException(byte[] groupId) {
         super("Group not found: " + Base64.encodeBytes(groupId));

diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index 7d15b8a17bd0fd2ae2322beec24fe0a499516343..9d79c46830bd89adff0b112100cdb909566f6be1 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -19,11 +19,6 @@ package org.asamk.signal.manager;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import org.asamk.Signal;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import org.asamk.Signal;

-import org.asamk.signal.AttachmentInvalidException;
-import org.asamk.signal.GroupNotFoundException;
-import org.asamk.signal.NotAGroupMemberException;
-import org.asamk.signal.StickerPackInvalidException;
-import org.asamk.signal.TrustLevel;

 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.SignalAccount;
 import org.asamk.signal.storage.contacts.ContactInfo;
 import org.asamk.signal.storage.groups.GroupInfo;


@@ -486,7 +481,7 @@ public class Manager implements Signal, Closeable {
     @Override
     public long sendGroupMessage(String messageText, List<String> attachments,
                                  byte[] groupId)
     @Override
     public long sendGroupMessage(String messageText, List<String> attachments,
                                  byte[] groupId)

-            throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException {
+            throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException {

         final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder().withBody(messageText);
         if (attachments != null) {
             messageBuilder.withAttachments(Utils.getSignalServiceAttachments(attachments));
         final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder().withBody(messageText);
         if (attachments != null) {
             messageBuilder.withAttachments(Utils.getSignalServiceAttachments(attachments));


@@ -507,7 +502,7 @@ public class Manager implements Signal, Closeable {
 
     public void sendGroupMessageReaction(String emoji, boolean remove, String targetAuthor,
                                          long targetSentTimestamp, byte[] groupId)
 
     public void sendGroupMessageReaction(String emoji, boolean remove, String targetAuthor,
                                          long targetSentTimestamp, byte[] groupId)

-            throws IOException, EncapsulatedExceptions, AttachmentInvalidException, InvalidNumberException {
+            throws IOException, EncapsulatedExceptions, InvalidNumberException, NotAGroupMemberException, GroupNotFoundException {

         SignalServiceDataMessage.Reaction reaction = new SignalServiceDataMessage.Reaction(emoji, remove, canonicalizeAndResolveSignalServiceAddress(targetAuthor), targetSentTimestamp);
         final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
                 .withReaction(reaction);
         SignalServiceDataMessage.Reaction reaction = new SignalServiceDataMessage.Reaction(emoji, remove, canonicalizeAndResolveSignalServiceAddress(targetAuthor), targetSentTimestamp);
         final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
                 .withReaction(reaction);


@@ -521,7 +516,7 @@ public class Manager implements Signal, Closeable {
         sendMessageLegacy(messageBuilder, g.getMembersWithout(account.getSelfAddress()));
     }
 
         sendMessageLegacy(messageBuilder, g.getMembersWithout(account.getSelfAddress()));
     }
 

-    public void sendQuitGroupMessage(byte[] groupId) throws GroupNotFoundException, IOException, EncapsulatedExceptions {
+    public void sendQuitGroupMessage(byte[] groupId) throws GroupNotFoundException, IOException, EncapsulatedExceptions, NotAGroupMemberException {

         SignalServiceGroup group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.QUIT)
                 .withId(groupId)
                 .build();
         SignalServiceGroup group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.QUIT)
                 .withId(groupId)
                 .build();


@@ -536,7 +531,7 @@ public class Manager implements Signal, Closeable {
         sendMessageLegacy(messageBuilder, g.getMembersWithout(account.getSelfAddress()));
     }
 
         sendMessageLegacy(messageBuilder, g.getMembersWithout(account.getSelfAddress()));
     }
 

-    private byte[] sendUpdateGroupMessage(byte[] groupId, String name, Collection<SignalServiceAddress> members, String avatarFile) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException {
+    private byte[] sendUpdateGroupMessage(byte[] groupId, String name, Collection<SignalServiceAddress> members, String avatarFile) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException {

         GroupInfo g;
         if (groupId == null) {
             // Create new group
         GroupInfo g;
         if (groupId == null) {
             // Create new group


@@ -587,7 +582,7 @@ public class Manager implements Signal, Closeable {
         return g.groupId;
     }
 
         return g.groupId;
     }
 

-    private void sendUpdateGroupMessage(byte[] groupId, SignalServiceAddress recipient) throws IOException, EncapsulatedExceptions {
+    private void sendUpdateGroupMessage(byte[] groupId, SignalServiceAddress recipient) throws IOException, EncapsulatedExceptions, NotAGroupMemberException, GroupNotFoundException, AttachmentInvalidException {

         if (groupId == null) {
             return;
         }
         if (groupId == null) {
             return;
         }


@@ -603,7 +598,7 @@ public class Manager implements Signal, Closeable {
         sendMessageLegacy(messageBuilder, Collections.singleton(recipient));
     }
 
         sendMessageLegacy(messageBuilder, Collections.singleton(recipient));
     }
 

-    private SignalServiceDataMessage.Builder getGroupUpdateMessageBuilder(GroupInfo g) {
+    private SignalServiceDataMessage.Builder getGroupUpdateMessageBuilder(GroupInfo g) throws AttachmentInvalidException {

         SignalServiceGroup.Builder group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.UPDATE)
                 .withId(g.groupId)
                 .withName(g.name)
         SignalServiceGroup.Builder group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.UPDATE)
                 .withId(g.groupId)
                 .withName(g.name)


@@ -680,7 +675,7 @@ public class Manager implements Signal, Closeable {
 
     public void sendMessageReaction(String emoji, boolean remove, String targetAuthor,
                                     long targetSentTimestamp, List<String> recipients)
 
     public void sendMessageReaction(String emoji, boolean remove, String targetAuthor,
                                     long targetSentTimestamp, List<String> recipients)

-            throws IOException, EncapsulatedExceptions, AttachmentInvalidException, InvalidNumberException {
+            throws IOException, EncapsulatedExceptions, InvalidNumberException {

         SignalServiceDataMessage.Reaction reaction = new SignalServiceDataMessage.Reaction(emoji, remove, canonicalizeAndResolveSignalServiceAddress(targetAuthor), targetSentTimestamp);
         final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
                 .withReaction(reaction);
         SignalServiceDataMessage.Reaction reaction = new SignalServiceDataMessage.Reaction(emoji, remove, canonicalizeAndResolveSignalServiceAddress(targetAuthor), targetSentTimestamp);
         final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
                 .withReaction(reaction);


@@ -791,7 +786,7 @@ public class Manager implements Signal, Closeable {
     }
 
     @Override
     }
 
     @Override

-    public byte[] updateGroup(byte[] groupId, String name, List<String> members, String avatar) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException, InvalidNumberException {
+    public byte[] updateGroup(byte[] groupId, String name, List<String> members, String avatar) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException, InvalidNumberException, NotAGroupMemberException {

         if (groupId.length == 0) {
             groupId = null;
         }
         if (groupId.length == 0) {
             groupId = null;
         }


@@ -1286,9 +1281,9 @@ public class Manager implements Signal, Closeable {
                     if (group != null) {
                         try {
                             sendUpdateGroupMessage(groupInfo.getGroupId(), source);
                     if (group != null) {
                         try {
                             sendUpdateGroupMessage(groupInfo.getGroupId(), source);

-                        } catch (IOException | EncapsulatedExceptions e) {
+                        } catch (IOException | EncapsulatedExceptions | AttachmentInvalidException e) {

                             e.printStackTrace();
                             e.printStackTrace();

-                        } catch (NotAGroupMemberException e) {
+                        } catch (GroupNotFoundException | NotAGroupMemberException e) {

                             // We have left this group, so don't send a group update message
                         }
                     }
                             // We have left this group, so don't send a group update message
                         }
                     }

diff --git a/src/main/java/org/asamk/signal/NotAGroupMemberException.java b/src/main/java/org/asamk/signal/manager/NotAGroupMemberException.java
similarity index 58%
rename from src/main/java/org/asamk/signal/NotAGroupMemberException.java
rename to src/main/java/org/asamk/signal/manager/NotAGroupMemberException.java
index cfdc7855e4ab59a701984c5fa7b7113870c082de..8c0e9be04e887c1ca3fb2331fdbf89970566e071 100644 (file)
--- a/src/main/java/org/asamk/signal/NotAGroupMemberException.java
+++ b/src/main/java/org/asamk/signal/manager/NotAGroupMemberException.java
@@ -1,9 +1,8 @@
-package org.asamk.signal;
+package org.asamk.signal.manager;

 
 

-import org.freedesktop.dbus.exceptions.DBusExecutionException;

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

-public class NotAGroupMemberException extends DBusExecutionException {
+public class NotAGroupMemberException extends Exception {

 
     public NotAGroupMemberException(byte[] groupId, String groupName) {
         super("User is not a member in group: " + groupName + " (" + Base64.encodeBytes(groupId) + ")");
 
     public NotAGroupMemberException(byte[] groupId, String groupName) {
         super("User is not a member in group: " + groupName + " (" + Base64.encodeBytes(groupId) + ")");

diff --git a/src/main/java/org/asamk/signal/manager/ProvisioningManager.java b/src/main/java/org/asamk/signal/manager/ProvisioningManager.java
index e7693f21028a3b8de464836d6b5283eb0286bbb4..db6f42385250e2ffcdcc64bc24368eacb9078911 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,6 @@
  */
 package org.asamk.signal.manager;
 
  */
 package org.asamk.signal.manager;
 

-import org.asamk.signal.UserAlreadyExists;

 import org.asamk.signal.storage.SignalAccount;
 import org.signal.zkgroup.InvalidInputException;
 import org.signal.zkgroup.profiles.ProfileKey;
 import org.asamk.signal.storage.SignalAccount;
 import org.signal.zkgroup.InvalidInputException;
 import org.signal.zkgroup.profiles.ProfileKey;

diff --git a/src/main/java/org/asamk/signal/StickerPackInvalidException.java b/src/main/java/org/asamk/signal/manager/StickerPackInvalidException.java
similarity index 81%
rename from src/main/java/org/asamk/signal/StickerPackInvalidException.java
rename to src/main/java/org/asamk/signal/manager/StickerPackInvalidException.java
index 5fea30fe09011f3dea7806c4bde68fc2f11b694c..52869acde3deea1d8e9f7b95533ccef3bad6e61e 100644 (file)
--- a/src/main/java/org/asamk/signal/StickerPackInvalidException.java
+++ b/src/main/java/org/asamk/signal/manager/StickerPackInvalidException.java
@@ -1,4 +1,4 @@
-package org.asamk.signal;
+package org.asamk.signal.manager;

 
 public class StickerPackInvalidException extends Exception {
 
 
 public class StickerPackInvalidException extends Exception {
 

diff --git a/src/main/java/org/asamk/signal/TrustLevel.java b/src/main/java/org/asamk/signal/manager/TrustLevel.java
similarity index 97%
rename from src/main/java/org/asamk/signal/TrustLevel.java
rename to src/main/java/org/asamk/signal/manager/TrustLevel.java
index 5eaf960af924fcea0bd7fb3256c97bbc444e1370..c9fa7a5eb007db81cf6266987e8df19145d2fdc7 100644 (file)
--- a/src/main/java/org/asamk/signal/TrustLevel.java
+++ b/src/main/java/org/asamk/signal/manager/TrustLevel.java
@@ -1,4 +1,4 @@
-package org.asamk.signal;
+package org.asamk.signal.manager;

 
 import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage;
 
 
 import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage;
 

diff --git a/src/main/java/org/asamk/signal/UserAlreadyExists.java b/src/main/java/org/asamk/signal/manager/UserAlreadyExists.java
similarity index 92%
rename from src/main/java/org/asamk/signal/UserAlreadyExists.java
rename to src/main/java/org/asamk/signal/manager/UserAlreadyExists.java
index 28836f28bdf2eedce7dcc34624f55143dbb9cb55..a07c455b2a8153717fcb428e743bb5ac9a599967 100644 (file)
--- a/src/main/java/org/asamk/signal/UserAlreadyExists.java
+++ b/src/main/java/org/asamk/signal/manager/UserAlreadyExists.java
@@ -1,4 +1,4 @@
-package org.asamk.signal;
+package org.asamk.signal.manager;

 
 public class UserAlreadyExists extends Exception {
 
 
 public class UserAlreadyExists extends Exception {
 

diff --git a/src/main/java/org/asamk/signal/manager/Utils.java b/src/main/java/org/asamk/signal/manager/Utils.java
index a5b37b0585f135970192ff435f354532e38622c2..894bd58d9c7991faf0a49007f1a7bea676583c86 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/Utils.java
+++ b/src/main/java/org/asamk/signal/manager/Utils.java
@@ -1,6 +1,5 @@
 package org.asamk.signal.manager;
 
 package org.asamk.signal.manager;
 

-import org.asamk.signal.AttachmentInvalidException;

 import org.signal.libsignal.metadata.certificate.CertificateValidator;
 import org.whispersystems.libsignal.IdentityKey;
 import org.whispersystems.libsignal.InvalidKeyException;
 import org.signal.libsignal.metadata.certificate.CertificateValidator;
 import org.whispersystems.libsignal.IdentityKey;
 import org.whispersystems.libsignal.InvalidKeyException;

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 ddb6909613f9075cbbaa224eb72daccbf464d5e1..fcb71c5ef7f5b82a1b17ded652d0e8f3e7be1580 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java
+++ b/src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java
@@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 

-import org.asamk.signal.TrustLevel;
+import org.asamk.signal.manager.TrustLevel;

 import org.asamk.signal.util.Util;
 import org.whispersystems.libsignal.IdentityKey;
 import org.whispersystems.libsignal.IdentityKeyPair;
 import org.asamk.signal.util.Util;
 import org.whispersystems.libsignal.IdentityKey;
 import org.whispersystems.libsignal.IdentityKeyPair;

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 3dc15cca256dbbf359baf8b719c0bd7baaed82c3..9a8802b47e9938e4af80a42dc4903118ec71efef 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonSignalProtocolStore.java
+++ b/src/main/java/org/asamk/signal/storage/protocol/JsonSignalProtocolStore.java
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 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.TrustLevel;
+import org.asamk.signal.manager.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;

diff --git a/src/main/java/org/asamk/signal/util/ErrorUtils.java b/src/main/java/org/asamk/signal/util/ErrorUtils.java
index 44d98cd2dc7d098ab7150042e1ae86507089fd66..53a3920589fe5e0fb94c500a85d08dc15c905c56 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,7 @@
 package org.asamk.signal.util;
 
 package org.asamk.signal.util;
 

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

 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
 import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
 import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;

diff --git a/src/main/java/org/asamk/signal/GroupIdFormatException.java b/src/main/java/org/asamk/signal/util/GroupIdFormatException.java
similarity index 89%
rename from src/main/java/org/asamk/signal/GroupIdFormatException.java
rename to src/main/java/org/asamk/signal/util/GroupIdFormatException.java
index 62add535d1b894e2d28b879e09acc302e963f495..5a5c457063d2918555b9a3e99995c397cece5179 100644 (file)
--- a/src/main/java/org/asamk/signal/GroupIdFormatException.java
+++ b/src/main/java/org/asamk/signal/util/GroupIdFormatException.java
@@ -1,4 +1,4 @@
-package org.asamk.signal;
+package org.asamk.signal.util;

 
 import java.io.IOException;
 
 
 import java.io.IOException;
 

diff --git a/src/main/java/org/asamk/signal/util/Util.java b/src/main/java/org/asamk/signal/util/Util.java
index 847abcc2c48467cfa35714be66292edf6b24581f..d6b467b04bbfc9abfe7a284507a362b2c44815c4 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -2,7 +2,6 @@ package org.asamk.signal.util;
 
 import com.fasterxml.jackson.databind.JsonNode;
 
 
 import com.fasterxml.jackson.databind.JsonNode;
 

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