import org.asamk.Signal;
import org.asamk.signal.BaseConfig;
-import org.asamk.signal.DbusReceiveMessageHandler;
import org.asamk.signal.manager.AttachmentInvalidException;
import org.asamk.signal.manager.Manager;
import org.asamk.signal.manager.NotMasterDeviceException;
import org.asamk.signal.manager.StickerPackInvalidException;
-import org.asamk.signal.manager.UntrustedIdentityException;
import org.asamk.signal.manager.api.Identity;
import org.asamk.signal.manager.api.InactiveGroupLinkException;
import org.asamk.signal.manager.api.InvalidDeviceLinkException;
import org.asamk.signal.manager.groups.NotAGroupMemberException;
import org.asamk.signal.manager.storage.recipients.Profile;
import org.asamk.signal.manager.storage.recipients.RecipientAddress;
-import org.asamk.signal.util.ErrorUtils;
+import org.asamk.signal.util.SendMessageResultUtils;
import org.freedesktop.dbus.DBusPath;
import org.freedesktop.dbus.connections.impl.DBusConnection;
import org.freedesktop.dbus.exceptions.DBusException;
@Override
public void subscribeReceive() {
if (dbusMessageHandler == null) {
- dbusMessageHandler = new DbusReceiveMessageHandler(m, connection, objectPath);
+ dbusMessageHandler = new DbusReceiveMessageHandler(connection, objectPath);
m.addReceiveHandler(dbusMessageHandler);
}
subscriberCount++;
@Override
public long sendMessage(final String message, final List<String> attachments, final String recipient) {
- var recipients = new ArrayList<String>(1);
- recipients.add(recipient);
- return sendMessage(message, attachments, recipients);
+ return sendMessage(message, attachments, List.of(recipient));
}
@Override
public long sendMessage(final String message, final List<String> attachments, final List<String> recipients) {
try {
- final var results = m.sendMessage(new Message(message, attachments, List.of()),
+ final var results = m.sendMessage(new Message(message, attachments, List.of(), Optional.empty()),
getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
.map(RecipientIdentifier.class::cast)
.collect(Collectors.toSet()));
public long sendRemoteDeleteMessage(
final long targetSentTimestamp, final String recipient
) {
- var recipients = new ArrayList<String>(1);
- recipients.add(recipient);
- return sendRemoteDeleteMessage(targetSentTimestamp, recipients);
+ return sendRemoteDeleteMessage(targetSentTimestamp, List.of(recipient));
}
@Override
}
}
- @Override
- public long sendGroupRemoteDeleteMessage(
- final long targetSentTimestamp, final byte[] groupId
- ) {
- try {
- final var results = m.sendRemoteDeleteMessage(targetSentTimestamp,
- Set.of(new RecipientIdentifier.Group(getGroupId(groupId))));
- checkSendMessageResults(results.timestamp(), results.results());
- return results.timestamp();
- } catch (IOException e) {
- throw new Error.Failure(e.getMessage());
- } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
- throw new Error.GroupNotFound(e.getMessage());
- }
- }
-
@Override
public long sendMessageReaction(
final String emoji,
final long targetSentTimestamp,
final String recipient
) {
- var recipients = new ArrayList<String>(1);
- recipients.add(recipient);
- return sendMessageReaction(emoji, remove, targetAuthor, targetSentTimestamp, recipients);
+ return sendMessageReaction(emoji, remove, targetAuthor, targetSentTimestamp, List.of(recipient));
}
@Override
final String recipient, final boolean stop
) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity {
try {
- var recipients = new ArrayList<String>(1);
- recipients.add(recipient);
- m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START,
- getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
+ final var results = m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START,
+ getSingleRecipientIdentifiers(List.of(recipient), m.getSelfNumber()).stream()
.map(RecipientIdentifier.class::cast)
.collect(Collectors.toSet()));
+ checkSendMessageResults(results.timestamp(), results.results());
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
} catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
throw new Error.GroupNotFound(e.getMessage());
- } catch (UntrustedIdentityException e) {
- throw new Error.UntrustedIdentity(e.getMessage());
}
}
final String recipient, final List<Long> messageIds
) throws Error.Failure, Error.UntrustedIdentity {
try {
- m.sendReadReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()), messageIds);
+ final var results = m.sendReadReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()),
+ messageIds);
+ checkSendMessageResults(results.timestamp(), results.results());
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
- } catch (UntrustedIdentityException e) {
- throw new Error.UntrustedIdentity(e.getMessage());
}
}
final String recipient, final List<Long> messageIds
) throws Error.Failure, Error.UntrustedIdentity {
try {
- m.sendViewedReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()), messageIds);
+ final var results = m.sendViewedReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()),
+ messageIds);
+ checkSendMessageResults(results.timestamp(), results.results());
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
- } catch (UntrustedIdentityException e) {
- throw new Error.UntrustedIdentity(e.getMessage());
}
}
final String message, final List<String> attachments
) throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {
try {
- final var results = m.sendMessage(new Message(message, attachments, List.of()),
+ final var results = m.sendMessage(new Message(message, attachments, List.of(), Optional.empty()),
Set.of(RecipientIdentifier.NoteToSelf.INSTANCE));
checkSendMessageResults(results.timestamp(), results.results());
return results.timestamp();
}
}
+ @Override
+ public void deleteRecipient(final String recipient) throws Error.Failure {
+ try {
+ m.deleteRecipient(getSingleRecipientIdentifier(recipient, m.getSelfNumber()));
+ } catch (IOException e) {
+ throw new Error.Failure("Recipient not found");
+ }
+ }
+
+ @Override
+ public void deleteContact(final String recipient) throws Error.Failure {
+ try {
+ m.deleteContact(getSingleRecipientIdentifier(recipient, m.getSelfNumber()));
+ } catch (IOException e) {
+ throw new Error.Failure("Contact not found");
+ }
+ }
+
@Override
public long sendGroupMessage(final String message, final List<String> attachments, final byte[] groupId) {
try {
- var results = m.sendMessage(new Message(message, attachments, List.of()),
- Set.of(new RecipientIdentifier.Group(getGroupId(groupId))));
+ var results = m.sendMessage(new Message(message, attachments, List.of(), Optional.empty()),
+ Set.of(getGroupRecipientIdentifier(groupId)));
checkSendMessageResults(results.timestamp(), results.results());
return results.timestamp();
} catch (IOException e) {
}
}
+ @Override
+ public void sendGroupTyping(
+ final byte[] groupId, final boolean stop
+ ) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity {
+ try {
+ final var results = m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START,
+ Set.of(getGroupRecipientIdentifier(groupId)));
+ checkSendMessageResults(results.timestamp(), results.results());
+ } catch (IOException e) {
+ throw new Error.Failure(e.getMessage());
+ } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
+ throw new Error.GroupNotFound(e.getMessage());
+ }
+ }
+
+ @Override
+ public long sendGroupRemoteDeleteMessage(
+ final long targetSentTimestamp, final byte[] groupId
+ ) {
+ try {
+ final var results = m.sendRemoteDeleteMessage(targetSentTimestamp,
+ Set.of(getGroupRecipientIdentifier(groupId)));
+ checkSendMessageResults(results.timestamp(), results.results());
+ return results.timestamp();
+ } catch (IOException e) {
+ throw new Error.Failure(e.getMessage());
+ } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
+ throw new Error.GroupNotFound(e.getMessage());
+ }
+ }
+
@Override
public long sendGroupMessageReaction(
final String emoji,
remove,
getSingleRecipientIdentifier(targetAuthor, m.getSelfNumber()),
targetSentTimestamp,
- Set.of(new RecipientIdentifier.Group(getGroupId(groupId))));
+ Set.of(getGroupRecipientIdentifier(groupId)));
checkSendMessageResults(results.timestamp(), results.results());
return results.timestamp();
} catch (IOException e) {
@Override
public List<byte[]> getGroupIds() {
var groups = m.getGroups();
- var ids = new ArrayList<byte[]>(groups.size());
- for (var group : groups) {
- ids.add(group.groupId().serialize());
- }
- return ids;
+ return groups.stream().map(g -> g.groupId().serialize()).toList();
}
@Override
final var memberIdentifiers = getSingleRecipientIdentifiers(members, m.getSelfNumber());
if (groupId == null) {
final var results = m.createGroup(name, memberIdentifiers, avatar == null ? null : new File(avatar));
+ updateGroups();
checkSendMessageResults(results.second().timestamp(), results.second().results());
return results.first().serialize();
} else {
@Override
public List<Boolean> isRegistered(List<String> numbers) {
- var results = new ArrayList<Boolean>();
if (numbers.isEmpty()) {
- return results;
+ return List.of();
}
Map<String, Pair<String, UUID>> registered;
return numbers.stream().map(number -> {
var uuid = registered.get(number).second();
return uuid != null;
- }).collect(Collectors.toList());
+ }).toList();
}
@Override
public List<String> listNumbers() {
return Stream.concat(m.getIdentities().stream().map(Identity::recipient),
m.getContacts().stream().map(Pair::first))
- .map(a -> a.getNumber().orElse(null))
+ .map(a -> a.number().orElse(null))
.filter(Objects::nonNull)
.distinct()
- .collect(Collectors.toList());
+ .toList();
}
@Override
// Try profiles if no contact name was found
for (var identity : m.getIdentities()) {
final var address = identity.recipient();
- var number = address.getNumber().orElse(null);
+ var number = address.number().orElse(null);
if (number != null) {
Profile profile = null;
try {
}
private static void checkSendMessageResult(long timestamp, SendMessageResult result) throws DBusExecutionException {
- var error = ErrorUtils.getErrorMessageFromSendMessageResult(result);
+ var error = SendMessageResultUtils.getErrorMessageFromSendMessageResult(result);
if (error == null) {
return;
return;
}
- var errors = ErrorUtils.getErrorMessagesFromSendMessageResults(results);
+ var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results);
if (errors.size() == 0) {
return;
}
return;
}
- var errors = ErrorUtils.getErrorMessagesFromSendMessageResults(results);
+ var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results);
if (errors.size() == 0) {
return;
}
}
private static List<String> getRecipientStrings(final Set<RecipientAddress> members) {
- return members.stream().map(RecipientAddress::getLegacyIdentifier).collect(Collectors.toList());
+ return members.stream().map(RecipientAddress::getLegacyIdentifier).toList();
}
private static Set<RecipientIdentifier.Single> getSingleRecipientIdentifiers(
}
}
+ private RecipientIdentifier.Group getGroupRecipientIdentifier(final byte[] groupId) {
+ return new RecipientIdentifier.Group(getGroupId(groupId));
+ }
+
private static GroupId getGroupId(byte[] groupId) throws DBusExecutionException {
try {
return GroupId.unknownVersion(groupId);
}
}
+ @Override
+ public void deleteGroup() throws Error.Failure, Error.LastGroupAdmin {
+ try {
+ m.deleteGroup(groupId);
+ } catch (IOException e) {
+ throw new Error.Failure(e.getMessage());
+ }
+ updateGroups();
+ }
+
@Override
public void addMembers(final List<String> recipients) throws Error.Failure {
final var memberIdentifiers = getSingleRecipientIdentifiers(recipients, m.getSelfNumber());
git.nmode.ca / signal-cli / blobdiff
