import org.asamk.signal.BaseConfig;
import org.asamk.signal.manager.AttachmentInvalidException;
import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.NotMasterDeviceException;
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.LastGroupAdminException;
import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.manager.storage.identities.IdentityInfo;
import org.asamk.signal.util.ErrorUtils;
import org.freedesktop.dbus.exceptions.DBusExecutionException;
+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 java.util.ArrayList;
import java.util.List;
import java.util.Objects;
+import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
}
}
+ @Override
+ public long sendRemoteDeleteMessage(
+ final long targetSentTimestamp, final String recipient
+ ) {
+ var recipients = new ArrayList<String>(1);
+ recipients.add(recipient);
+ return sendRemoteDeleteMessage(targetSentTimestamp, recipients);
+ }
+
+ @Override
+ public long sendRemoteDeleteMessage(
+ final long targetSentTimestamp, final List<String> recipients
+ ) {
+ try {
+ final var results = m.sendRemoteDeleteMessage(targetSentTimestamp, recipients);
+ checkSendMessageResults(results.first(), results.second());
+ return results.first();
+ } catch (IOException e) {
+ throw new Error.Failure(e.getMessage());
+ } catch (InvalidNumberException e) {
+ throw new Error.InvalidNumber(e.getMessage());
+ }
+ }
+
+ @Override
+ public long sendGroupRemoteDeleteMessage(
+ final long targetSentTimestamp, final byte[] groupId
+ ) {
+ try {
+ final var results = m.sendGroupRemoteDeleteMessage(targetSentTimestamp, GroupId.unknownVersion(groupId));
+ checkSendMessageResults(results.first(), results.second());
+ return results.first();
+ } catch (IOException e) {
+ throw new Error.Failure(e.getMessage());
+ } catch (GroupNotFoundException | NotAGroupMemberException e) {
+ throw new Error.GroupNotFound(e.getMessage());
+ }
+ }
+
+ @Override
+ public long sendMessageReaction(
+ final String emoji,
+ final boolean remove,
+ final String targetAuthor,
+ final long targetSentTimestamp,
+ final String recipient
+ ) {
+ var recipients = new ArrayList<String>(1);
+ recipients.add(recipient);
+ return sendMessageReaction(emoji, remove, targetAuthor, targetSentTimestamp, recipients);
+ }
+
+ @Override
+ public long sendMessageReaction(
+ final String emoji,
+ final boolean remove,
+ final String targetAuthor,
+ final long targetSentTimestamp,
+ final List<String> recipients
+ ) {
+ try {
+ final var results = m.sendMessageReaction(emoji, remove, targetAuthor, targetSentTimestamp, recipients);
+ checkSendMessageResults(results.first(), results.second());
+ return results.first();
+ } catch (InvalidNumberException e) {
+ throw new Error.InvalidNumber(e.getMessage());
+ } catch (IOException e) {
+ throw new Error.Failure(e.getMessage());
+ }
+ }
+
@Override
public long sendNoteToSelfMessage(
final String message, final List<String> attachments
}
}
+ @Override
+ public long sendGroupMessageReaction(
+ final String emoji,
+ final boolean remove,
+ final String targetAuthor,
+ final long targetSentTimestamp,
+ final byte[] groupId
+ ) {
+ try {
+ final var results = m.sendGroupMessageReaction(emoji,
+ remove,
+ targetAuthor,
+ targetSentTimestamp,
+ GroupId.unknownVersion(groupId));
+ checkSendMessageResults(results.first(), results.second());
+ return results.first();
+ } catch (IOException e) {
+ throw new Error.Failure(e.getMessage());
+ } catch (InvalidNumberException e) {
+ throw new Error.InvalidNumber(e.getMessage());
+ } catch (GroupNotFoundException | NotAGroupMemberException e) {
+ throw new Error.GroupNotFound(e.getMessage());
+ }
+ }
+
// Since contact names might be empty if not defined, also potentially return
// the profile name
@Override
public String getContactName(final String number) {
try {
return m.getContactOrProfileName(number);
- } catch (Exception e) {
+ } catch (InvalidNumberException e) {
throw new Error.InvalidNumber(e.getMessage());
}
}
m.setContactName(number, name);
} catch (InvalidNumberException e) {
throw new Error.InvalidNumber(e.getMessage());
+ } catch (NotMasterDeviceException e) {
+ throw new Error.Failure("This command doesn't work on linked devices.");
}
}
m.setContactBlocked(number, blocked);
} catch (InvalidNumberException e) {
throw new Error.InvalidNumber(e.getMessage());
+ } catch (NotMasterDeviceException e) {
+ throw new Error.Failure("This command doesn't work on linked devices.");
}
}
if (avatar.isEmpty()) {
avatar = null;
}
- 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();
+ if (groupId == null) {
+ final var results = m.createGroup(name, members, avatar == null ? null : new File(avatar));
+ checkSendMessageResults(0, results.second());
+ return results.first().serialize();
+ } else {
+ final var results = m.updateGroup(GroupId.unknownVersion(groupId),
+ name,
+ null,
+ members,
+ null,
+ null,
+ null,
+ false,
+ null,
+ null,
+ null,
+ avatar == null ? null : new File(avatar),
+ null);
+ if (results != null) {
+ checkSendMessageResults(results.first(), results.second());
+ }
+ return groupId;
+ }
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
} catch (GroupNotFoundException | NotAGroupMemberException e) {
Optional<File> avatarFile = removeAvatar
? Optional.absent()
: avatarPath == null ? null : Optional.of(new File(avatarPath));
- m.setProfile(name, about, aboutEmoji, avatarFile);
+ m.setProfile(name, null, about, aboutEmoji, avatarFile);
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
}
// all numbers the system knows
@Override
public List<String> listNumbers() {
- return Stream.concat(m.getIdentities().stream().map(i -> i.getAddress().getNumber().orNull()),
- m.getContacts().stream().map(c -> c.number))
+ return Stream.concat(m.getIdentities().stream().map(IdentityInfo::getRecipientId),
+ m.getContacts().stream().map(Pair::first))
+ .map(m::resolveSignalServiceAddress)
+ .map(a -> a.getNumber().orNull())
.filter(Objects::nonNull)
.distinct()
.collect(Collectors.toList());
var numbers = new ArrayList<String>();
var contacts = m.getContacts();
for (var c : contacts) {
- if (c.name != null && c.name.equals(name)) {
- numbers.add(c.number);
+ if (name.equals(c.second().getName())) {
+ numbers.add(m.resolveSignalServiceAddress(c.first()).getLegacyIdentifier());
}
}
// Try profiles if no contact name was found
for (var identity : m.getIdentities()) {
- final var address = identity.getAddress();
+ final var recipientId = identity.getRecipientId();
+ final var address = m.resolveSignalServiceAddress(recipientId);
var number = address.getNumber().orNull();
if (number != null) {
- var profile = m.getRecipientProfile(address);
+ var profile = m.getRecipientProfile(recipientId);
if (profile != null && profile.getDisplayName().equals(name)) {
numbers.add(number);
}
public void quitGroup(final byte[] groupId) {
var group = GroupId.unknownVersion(groupId);
try {
- m.sendQuitGroupMessage(group);
+ m.sendQuitGroupMessage(group, Set.of());
} catch (GroupNotFoundException | NotAGroupMemberException e) {
throw new Error.GroupNotFound(e.getMessage());
- } catch (IOException e) {
+ } catch (IOException | LastGroupAdminException e) {
throw new Error.Failure(e.getMessage());
+ } catch (InvalidNumberException e) {
+ throw new Error.InvalidNumber(e.getMessage());
}
}
@Override
public boolean isContactBlocked(final String number) {
- var contacts = m.getContacts();
- for (var c : contacts) {
- if (c.number.equals(number)) {
- return c.blocked;
- }
+ try {
+ return m.isContactBlocked(number);
+ } catch (InvalidNumberException e) {
+ throw new Error.InvalidNumber(e.getMessage());
}
- return false;
}
@Override
if (group == null) {
return false;
} else {
- return group.isMember(m.getSelfAddress());
+ return group.isMember(m.getSelfRecipientId());
}
}
}
git.nmode.ca / signal-cli / blobdiff
