some small dbus return code fixes (#556)

[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 53ba530071f532df1069b7e38a76246ba27abd47..24a90662ab2eb567d7449c44a2574e81a547dfac 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -1,30 +1,28 @@
 package org.asamk.signal.dbus;
 
 import org.asamk.Signal;
 package org.asamk.signal.dbus;
 
 import org.asamk.Signal;

+import org.asamk.signal.BaseConfig;

 import org.asamk.signal.manager.AttachmentInvalidException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.AttachmentInvalidException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.groups.GroupId;

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

 import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;

-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
-import org.asamk.signal.manager.storage.protocol.IdentityInfo;

 import org.asamk.signal.util.ErrorUtils;
 import org.asamk.signal.util.ErrorUtils;

-import org.asamk.signal.manager.util.Utils;
-import org.asamk.signal.BaseConfig;

 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.whispersystems.libsignal.util.guava.Optional;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 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.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;

-import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;

 
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;

-import java.util.stream.Stream;

 import java.util.stream.Collectors;
 import java.util.stream.Collectors;

+import java.util.stream.Stream;

 
 public class DbusSignalImpl implements Signal {
 
 
 public class DbusSignalImpl implements Signal {
 


@@ -67,8 +65,9 @@ public class DbusSignalImpl implements Signal {
         }
     }
 
         }
     }
 

-    private static void checkSendMessageResults(long timestamp, List<SendMessageResult> results)
-            throws DBusExecutionException {
+    private static void checkSendMessageResults(
+            long timestamp, List<SendMessageResult> results
+    ) throws DBusExecutionException {

         if (results.size() == 1) {
             checkSendMessageResult(timestamp, results.get(0));
             return;
         if (results.size() == 1) {
             checkSendMessageResult(timestamp, results.get(0));
             return;


@@ -105,8 +104,9 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
     }
 
     @Override

-    public long sendNoteToSelfMessage(final String message, final List<String> attachments)
-            throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {
+    public long sendNoteToSelfMessage(
+            final String message, final List<String> attachments
+    ) throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {

         try {
             final var results = m.sendSelfMessage(message, attachments);
             checkSendMessageResult(results.first(), results.second());
         try {
             final var results = m.sendSelfMessage(message, attachments);
             checkSendMessageResult(results.first(), results.second());


@@ -149,13 +149,11 @@ public class DbusSignalImpl implements Signal {
     // the profile name
     @Override
     public String getContactName(final String number) {
     // the profile name
     @Override
     public String getContactName(final String number) {

-        String name="";

         try {
         try {

-            name = m.getContactOrProfileName(number);
+            return m.getContactOrProfileName(number);

         } catch (Exception e) {
             throw new Error.InvalidNumber(e.getMessage());
         }
         } catch (Exception e) {
             throw new Error.InvalidNumber(e.getMessage());
         }

-        return name;

     }
 
     @Override
     }
 
     @Override


@@ -211,8 +209,11 @@ public class DbusSignalImpl implements Signal {
         if (group == null) {
             return List.of();
         } else {
         if (group == null) {
             return List.of();
         } else {

-            return group.getMembers().stream().map(m::resolveSignalServiceAddress)
-                    .map(SignalServiceAddress::getLegacyIdentifier).collect(Collectors.toList());
+            return group.getMembers()
+                    .stream()
+                    .map(m::resolveSignalServiceAddress)
+                    .map(SignalServiceAddress::getLegacyIdentifier)
+                    .collect(Collectors.toList());

         }
     }
 
         }
     }
 


@@ -231,7 +232,9 @@ public class DbusSignalImpl implements Signal {
             if (avatar.isEmpty()) {
                 avatar = null;
             }
             if (avatar.isEmpty()) {
                 avatar = null;
             }

-            final var results = m.updateGroup(groupId == null ? null : GroupId.unknownVersion(groupId), name, members,
+            final var results = m.updateGroup(groupId == null ? null : GroupId.unknownVersion(groupId),
+                    name,
+                    members,

                     avatar == null ? null : new File(avatar));
             checkSendMessageResults(0, results.second());
             return results.first().serialize();
                     avatar == null ? null : new File(avatar));
             checkSendMessageResults(0, results.second());
             return results.first().serialize();


@@ -252,13 +255,19 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
     }
 
     @Override

-    public void updateProfile(final String name, final String about, final String aboutEmoji, String avatarPath,
-            final boolean removeAvatar) {
+    public void updateProfile(
+            final String name,
+            final String about,
+            final String aboutEmoji,
+            String avatarPath,
+            final boolean removeAvatar
+    ) {

         try {
             if (avatarPath.isEmpty()) {
                 avatarPath = null;
             }
         try {
             if (avatarPath.isEmpty()) {
                 avatarPath = null;
             }

-            Optional<File> avatarFile = removeAvatar ? Optional.absent()
+            Optional<File> avatarFile = removeAvatar
+                    ? Optional.absent()

                     : avatarPath == null ? null : Optional.of(new File(avatarPath));
             m.setProfile(name, about, aboutEmoji, avatarFile);
         } catch (IOException e) {
                     : avatarPath == null ? null : Optional.of(new File(avatarPath));
             m.setProfile(name, about, aboutEmoji, avatarFile);
         } catch (IOException e) {


@@ -277,7 +286,7 @@ public class DbusSignalImpl implements Signal {
     // all numbers the system knows
     @Override
     public List<String> listNumbers() {
     // all numbers the system knows
     @Override
     public List<String> listNumbers() {

-             return Stream.concat(m.getIdentities().stream().map(i -> i.getAddress().getNumber().orNull()),
+        return Stream.concat(m.getIdentities().stream().map(i -> i.getAddress().getNumber().orNull()),

                 m.getContacts().stream().map(c -> c.number))
                 .filter(Objects::nonNull)
                 .distinct()
                 m.getContacts().stream().map(c -> c.number))
                 .filter(Objects::nonNull)
                 .distinct()


@@ -286,29 +295,25 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public List<String> getContactNumber(final String name) {
 
     @Override
     public List<String> getContactNumber(final String name) {

-        // Contact names have precendence.
-        List<String> numbers=new ArrayList<>();
+        // Contact names have precedence.
+        var numbers = new ArrayList<String>();

         var contacts = m.getContacts();
         for (var c : contacts) {
         var contacts = m.getContacts();
         for (var c : contacts) {

-            if (c.name!=null && c.name.equals(name)) {
+            if (c.name != null && c.name.equals(name)) {

                 numbers.add(c.number);
             }
         }
         // Try profiles if no contact name was found
                 numbers.add(c.number);
             }
         }
         // Try profiles if no contact name was found

-        for (IdentityInfo identity : m.getIdentities()) {
-            String number = identity.getAddress().getNumber().orNull();
+        for (var identity : m.getIdentities()) {
+            final var address = identity.getAddress();
+            var number = address.getNumber().orNull();

             if (number != null) {
             if (number != null) {

-                var address = Utils.getSignalServiceAddressFromIdentifier(number);

                 var profile = m.getRecipientProfile(address);
                 var profile = m.getRecipientProfile(address);

-                String profileName = profile.getDisplayName();
-                if (profileName.equals(name)) {
+                if (profile != null && profile.getDisplayName().equals(name)) {

                     numbers.add(number);
                 }
             }
         }
                     numbers.add(number);
                 }
             }
         }

-        if (numbers.size()==0) {
-            throw new Error.Failure("Contact name not found");
-        }

         return numbers;
     }
 
         return numbers;
     }
 


@@ -326,9 +331,11 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public void joinGroup(final String groupLink) {
 
     @Override
     public void joinGroup(final String groupLink) {

-        final GroupInviteLinkUrl linkUrl;

         try {
         try {

-            linkUrl = GroupInviteLinkUrl.fromUri(groupLink);
+            final var linkUrl = GroupInviteLinkUrl.fromUri(groupLink);
+            if (linkUrl == null) {
+                throw new Error.Failure("Group link is invalid:");
+            }

             m.joinGroup(linkUrl);
         } catch (GroupInviteLinkUrl.InvalidGroupLinkException | GroupLinkNotActiveException e) {
             throw new Error.Failure("Group link is invalid: " + e.getMessage());
             m.joinGroup(linkUrl);
         } catch (GroupInviteLinkUrl.InvalidGroupLinkException | GroupLinkNotActiveException e) {
             throw new Error.Failure("Group link is invalid: " + e.getMessage());


@@ -369,5 +376,4 @@ public class DbusSignalImpl implements Signal {
             return group.isMember(m.getSelfAddress());
         }
     }
             return group.isMember(m.getSelfAddress());
         }
     }

-

 }
 }