Add missing isActive check

[signal-cli] / src / main / java / org / asamk / signal / dbus / DbusSignalImpl.java

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 315e1d8eb4e8c046533c1d86a3b5f851c267c2a2..0bb0c43534c33cab1b1101322da8b7dc8e4af2a1 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -21,6 +21,7 @@ import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.libsignal.util.guava.Optional;
 import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.libsignal.util.guava.Optional;
 import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;

+import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;

 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import java.io.File;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import java.io.File;


@@ -244,6 +245,8 @@ public class DbusSignalImpl implements Signal {
             m.setContactName(getSingleRecipientIdentifier(number, m.getUsername()), name);
         } catch (NotMasterDeviceException e) {
             throw new Error.Failure("This command doesn't work on linked devices.");
             m.setContactName(getSingleRecipientIdentifier(number, m.getUsername()), name);
         } catch (NotMasterDeviceException e) {
             throw new Error.Failure("This command doesn't work on linked devices.");

+        } catch (UnregisteredUserException e) {
+            throw new Error.Failure("Contact is not registered.");

         }
     }
 
         }
     }
 


@@ -253,6 +256,8 @@ public class DbusSignalImpl implements Signal {
             m.setContactBlocked(getSingleRecipientIdentifier(number, m.getUsername()), blocked);
         } catch (NotMasterDeviceException e) {
             throw new Error.Failure("This command doesn't work on linked devices.");
             m.setContactBlocked(getSingleRecipientIdentifier(number, m.getUsername()), blocked);
         } catch (NotMasterDeviceException e) {
             throw new Error.Failure("This command doesn't work on linked devices.");

+        } catch (IOException e) {
+            throw new Error.Failure(e.getMessage());

         }
     }
 
         }
     }
 


@@ -262,6 +267,8 @@ public class DbusSignalImpl implements Signal {
             m.setGroupBlocked(getGroupId(groupId), blocked);
         } catch (GroupNotFoundException e) {
             throw new Error.GroupNotFound(e.getMessage());
             m.setGroupBlocked(getGroupId(groupId), blocked);
         } catch (GroupNotFoundException e) {
             throw new Error.GroupNotFound(e.getMessage());

+        } catch (IOException e) {
+            throw new Error.Failure(e.getMessage());

         }
     }
 
         }
     }
 


@@ -420,7 +427,7 @@ public class DbusSignalImpl implements Signal {
     public void quitGroup(final byte[] groupId) {
         var group = getGroupId(groupId);
         try {
     public void quitGroup(final byte[] groupId) {
         var group = getGroupId(groupId);
         try {

-            m.sendQuitGroupMessage(group, Set.of());
+            m.quitGroup(group, Set.of());

         } catch (GroupNotFoundException | NotAGroupMemberException e) {
             throw new Error.GroupNotFound(e.getMessage());
         } catch (IOException | LastGroupAdminException e) {
         } catch (GroupNotFoundException | NotAGroupMemberException e) {
             throw new Error.GroupNotFound(e.getMessage());
         } catch (IOException | LastGroupAdminException e) {