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.NotMasterDeviceException;
-import org.asamk.signal.manager.StickerPackInvalidException;
+import org.asamk.signal.manager.api.AttachmentInvalidException;
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.api.InvalidNumberException;
+import org.asamk.signal.manager.api.InvalidStickerException;
import org.asamk.signal.manager.api.Message;
+import org.asamk.signal.manager.api.NotMasterDeviceException;
import org.asamk.signal.manager.api.Pair;
import org.asamk.signal.manager.api.RecipientIdentifier;
import org.asamk.signal.manager.api.SendMessageResult;
+import org.asamk.signal.manager.api.SendMessageResults;
+import org.asamk.signal.manager.api.StickerPackInvalidException;
import org.asamk.signal.manager.api.TypingAction;
+import org.asamk.signal.manager.api.UnregisteredRecipientException;
import org.asamk.signal.manager.api.UpdateGroup;
+import org.asamk.signal.manager.api.UserStatus;
import org.asamk.signal.manager.groups.GroupId;
import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
import org.asamk.signal.manager.groups.GroupLinkState;
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;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
-import java.util.UUID;
import java.util.stream.Collectors;
import java.util.stream.Stream;
this.connection = connection;
this.objectPath = objectPath;
this.noReceiveOnStart = noReceiveOnStart;
+
+ m.addAddressChangedListener(() -> {
+ unExportObjects();
+ exportObjects();
+ });
}
public void initObjects() {
+ exportObjects();
if (!noReceiveOnStart) {
subscribeReceive();
}
+ }
+
+ private void exportObjects() {
+ exportObject(this);
updateDevices();
updateGroups();
m.removeReceiveHandler(dbusMessageHandler);
dbusMessageHandler = null;
}
+ unExportObjects();
+ }
+
+ private void unExportObjects() {
unExportDevices();
unExportGroups();
unExportConfiguration();
+ connection.unExportObject(this.objectPath);
}
@Override
@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(),
+ Optional.empty()),
getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
.map(RecipientIdentifier.class::cast)
.collect(Collectors.toSet()));
- checkSendMessageResults(results.timestamp(), results.results());
+ checkSendMessageResults(results);
return results.timestamp();
} catch (AttachmentInvalidException e) {
throw new Error.AttachmentInvalid(e.getMessage());
- } catch (IOException e) {
+ } catch (IOException | InvalidStickerException e) {
throw new Error.Failure(e);
} catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
throw new Error.GroupNotFound(e.getMessage());
+ } catch (UnregisteredRecipientException e) {
+ throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");
}
}
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
getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
.map(RecipientIdentifier.class::cast)
.collect(Collectors.toSet()));
- 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 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());
+ checkSendMessageResults(results);
return results.timestamp();
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
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
getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
.map(RecipientIdentifier.class::cast)
.collect(Collectors.toSet()));
- checkSendMessageResults(results.timestamp(), results.results());
+ checkSendMessageResults(results);
return results.timestamp();
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
} catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
throw new Error.GroupNotFound(e.getMessage());
+ } catch (UnregisteredRecipientException e) {
+ throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");
}
}
final String recipient, final boolean stop
) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity {
try {
- var recipients = new ArrayList<String>(1);
- recipients.add(recipient);
final var results = m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START,
- getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
+ getSingleRecipientIdentifiers(List.of(recipient), m.getSelfNumber()).stream()
.map(RecipientIdentifier.class::cast)
.collect(Collectors.toSet()));
- checkSendMessageResults(results.timestamp(), results.results());
+ checkSendMessageResults(results);
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
} catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
try {
final var results = m.sendReadReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()),
messageIds);
- checkSendMessageResults(results.timestamp(), results.results());
+ checkSendMessageResults(results);
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
}
try {
final var results = m.sendViewedReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()),
messageIds);
- checkSendMessageResults(results.timestamp(), results.results());
+ checkSendMessageResults(results);
} catch (IOException e) {
throw new Error.Failure(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()),
- Set.of(RecipientIdentifier.NoteToSelf.INSTANCE));
- checkSendMessageResults(results.timestamp(), results.results());
+ final var results = m.sendMessage(new Message(message,
+ attachments,
+ List.of(),
+ Optional.empty(),
+ Optional.empty()), Set.of(RecipientIdentifier.NoteToSelf.INSTANCE));
+ checkSendMessageResults(results);
return results.timestamp();
} catch (AttachmentInvalidException e) {
throw new Error.AttachmentInvalid(e.getMessage());
- } catch (IOException e) {
+ } catch (IOException | InvalidStickerException e) {
throw new Error.Failure(e.getMessage());
} catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
throw new Error.GroupNotFound(e.getMessage());
+ } catch (UnregisteredRecipientException e) {
+ throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");
}
}
public void sendEndSessionMessage(final List<String> recipients) {
try {
final var results = m.sendEndSessionMessage(getSingleRecipientIdentifiers(recipients, m.getSelfNumber()));
- checkSendMessageResults(results.timestamp(), results.results());
+ checkSendMessageResults(results);
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
}
}
+ @Override
+ public void deleteRecipient(final String recipient) throws Error.Failure {
+ m.deleteRecipient(getSingleRecipientIdentifier(recipient, m.getSelfNumber()));
+ }
+
+ @Override
+ public void deleteContact(final String recipient) throws Error.Failure {
+ m.deleteContact(getSingleRecipientIdentifier(recipient, m.getSelfNumber()));
+ }
+
@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))));
- checkSendMessageResults(results.timestamp(), results.results());
+ var results = m.sendMessage(new Message(message,
+ attachments,
+ List.of(),
+ Optional.empty(),
+ Optional.empty()), Set.of(getGroupRecipientIdentifier(groupId)));
+ checkSendMessageResults(results);
return results.timestamp();
- } catch (IOException e) {
+ } catch (IOException | InvalidStickerException e) {
throw new Error.Failure(e.getMessage());
} catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
throw new Error.GroupNotFound(e.getMessage());
} catch (AttachmentInvalidException e) {
throw new Error.AttachmentInvalid(e.getMessage());
+ } catch (UnregisteredRecipientException e) {
+ throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");
+ }
+ }
+
+ @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);
+ } 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);
+ return results.timestamp();
+ } catch (IOException e) {
+ throw new Error.Failure(e.getMessage());
+ } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
+ throw new Error.GroupNotFound(e.getMessage());
}
}
remove,
getSingleRecipientIdentifier(targetAuthor, m.getSelfNumber()),
targetSentTimestamp,
- Set.of(new RecipientIdentifier.Group(getGroupId(groupId))));
- checkSendMessageResults(results.timestamp(), results.results());
+ Set.of(getGroupRecipientIdentifier(groupId)));
+ checkSendMessageResults(results);
return results.timestamp();
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
} catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
throw new Error.GroupNotFound(e.getMessage());
+ } catch (UnregisteredRecipientException e) {
+ throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");
}
}
throw new Error.Failure("This command doesn't work on linked devices.");
} catch (IOException e) {
throw new Error.Failure("Contact is not registered.");
+ } catch (UnregisteredRecipientException e) {
+ throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");
}
}
m.setExpirationTimer(getSingleRecipientIdentifier(number, m.getSelfNumber()), expiration);
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
+ } catch (UnregisteredRecipientException e) {
+ throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");
}
}
@Override
public void setContactBlocked(final String number, final boolean blocked) {
try {
- m.setContactBlocked(getSingleRecipientIdentifier(number, m.getSelfNumber()), blocked);
+ m.setContactsBlocked(List.of(getSingleRecipientIdentifier(number, m.getSelfNumber())), 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());
+ } catch (UnregisteredRecipientException e) {
+ throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");
}
}
@Override
public void setGroupBlocked(final byte[] groupId, final boolean blocked) {
try {
- m.setGroupBlocked(getGroupId(groupId), blocked);
+ m.setGroupsBlocked(List.of(getGroupId(groupId)), blocked);
} catch (NotMasterDeviceException e) {
throw new Error.Failure("This command doesn't work on linked devices.");
} catch (GroupNotFoundException 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));
- checkSendMessageResults(results.second().timestamp(), results.second().results());
+ updateGroups();
+ checkGroupSendMessageResults(results.second().timestamp(), results.second().results());
return results.first().serialize();
} else {
final var results = m.updateGroup(getGroupId(groupId),
.withAvatarFile(avatar == null ? null : new File(avatar))
.build());
if (results != null) {
- checkSendMessageResults(results.timestamp(), results.results());
+ checkGroupSendMessageResults(results.timestamp(), results.results());
}
return groupId;
}
throw new Error.GroupNotFound(e.getMessage());
} catch (AttachmentInvalidException e) {
throw new Error.AttachmentInvalid(e.getMessage());
+ } catch (UnregisteredRecipientException e) {
+ throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");
}
}
@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;
+ Map<String, UserStatus> registered;
try {
- registered = m.areUsersRegistered(new HashSet<>(numbers));
+ registered = m.getUserStatus(new HashSet<>(numbers));
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
}
- return numbers.stream().map(number -> {
- var uuid = registered.get(number).second();
- return uuid != null;
- }).collect(Collectors.toList());
+ return numbers.stream().map(number -> registered.get(number).uuid() != null).toList();
}
@Override
m.setRegistrationLockPin(Optional.empty());
} catch (IOException e) {
throw new Error.Failure("Remove pin error: " + e.getMessage());
+ } catch (NotMasterDeviceException e) {
+ throw new Error.Failure("This command doesn't work on linked devices.");
}
}
m.setRegistrationLockPin(Optional.of(registrationLockPin));
} catch (IOException e) {
throw new Error.Failure("Set pin error: " + e.getMessage());
+ } catch (NotMasterDeviceException e) {
+ throw new Error.Failure("This command doesn't work on linked devices.");
}
}
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 {
profile = m.getRecipientProfile(RecipientIdentifier.Single.fromAddress(address));
- } catch (IOException ignored) {
+ } catch (IOException | UnregisteredRecipientException ignored) {
}
if (profile != null && profile.getDisplayName().equals(name)) {
numbers.add(number);
throw new Error.GroupNotFound(e.getMessage());
} catch (IOException | LastGroupAdminException e) {
throw new Error.Failure(e.getMessage());
+ } catch (UnregisteredRecipientException e) {
+ throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");
}
}
}
private static void checkSendMessageResult(long timestamp, SendMessageResult result) throws DBusExecutionException {
- var error = ErrorUtils.getErrorMessageFromSendMessageResult(result);
+ var error = SendMessageResultUtils.getErrorMessageFromSendMessageResult(result);
if (error == null) {
return;
}
- final var message = timestamp + "\nFailed to send message:\n" + error + '\n';
+ final var message = "\nFailed to send message:\n" + error + '\n' + timestamp;
if (result.isIdentityFailure()) {
throw new Error.UntrustedIdentity(message);
}
}
- private static void checkSendMessageResults(
- long timestamp, Map<RecipientIdentifier, List<SendMessageResult>> results
- ) throws DBusExecutionException {
- final var sendMessageResults = results.values().stream().findFirst();
- if (results.size() == 1 && sendMessageResults.get().size() == 1) {
- checkSendMessageResult(timestamp, sendMessageResults.get().stream().findFirst().get());
+ private void checkSendMessageResults(final SendMessageResults results) {
+ final var sendMessageResults = results.results().values().stream().findFirst();
+ if (results.results().size() == 1 && sendMessageResults.get().size() == 1) {
+ checkSendMessageResult(results.timestamp(), sendMessageResults.get().stream().findFirst().get());
return;
}
- var errors = ErrorUtils.getErrorMessagesFromSendMessageResults(results);
- if (errors.size() == 0) {
+ if (results.hasSuccess()) {
return;
}
var message = new StringBuilder();
- message.append(timestamp).append('\n');
- message.append("Failed to send (some) messages:\n");
+ message.append("Failed to send messages:\n");
+ var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results.results());
for (var error : errors) {
message.append(error).append('\n');
}
+ message.append(results.timestamp());
throw new Error.Failure(message.toString());
}
- private static void checkSendMessageResults(
+ private static void checkGroupSendMessageResults(
long timestamp, Collection<SendMessageResult> results
) throws DBusExecutionException {
if (results.size() == 1) {
return;
}
- var errors = ErrorUtils.getErrorMessagesFromSendMessageResults(results);
- if (errors.size() == 0) {
+ var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results);
+ if (errors.size() == 0 || errors.size() < results.size()) {
return;
}
var message = new StringBuilder();
- message.append(timestamp).append('\n');
- message.append("Failed to send (some) messages:\n");
+ message.append("Failed to send message:\n");
for (var error : errors) {
message.append(error).append('\n');
}
+ message.append(timestamp);
throw new Error.Failure(message.toString());
}
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);
if (d.isThisDevice()) {
thisDevice = new DBusPath(deviceObjectPath);
}
- this.devices.add(new StructDevice(new DBusPath(deviceObjectPath), d.id(), emptyIfNull(d.name())));
+ this.devices.add(new StructDevice(new DBusPath(deviceObjectPath), (long) d.id(), emptyIfNull(d.name())));
});
}
() -> new Variant<>(getRecipientStrings(getGroup().requestingMembers()), "as")),
new DbusProperty<>("Admins",
() -> new Variant<>(getRecipientStrings(getGroup().adminMembers()), "as")),
+ new DbusProperty<>("Banned",
+ () -> new Variant<>(getRecipientStrings(getGroup().bannedMembers()), "as")),
new DbusProperty<>("PermissionAddMember",
() -> getGroup().permissionAddMember().name(),
this::setGroupPermissionAddMember),
throw new Error.Failure(e.getMessage());
} catch (LastGroupAdminException e) {
throw new Error.LastGroupAdmin(e.getMessage());
+ } catch (UnregisteredRecipientException e) {
+ throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");
+ }
+ }
+
+ @Override
+ public void deleteGroup() throws Error.Failure, Error.LastGroupAdmin {
+ try {
+ m.deleteGroup(groupId);
+ } catch (IOException e) {
+ throw new Error.Failure(e.getMessage());
}
+ updateGroups();
}
@Override
private void setIsBlocked(final boolean isBlocked) {
try {
- m.setGroupBlocked(groupId, isBlocked);
+ m.setGroupsBlocked(List.of(groupId), isBlocked);
} catch (NotMasterDeviceException e) {
throw new Error.Failure("This command doesn't work on linked devices.");
} catch (GroupNotFoundException e) {
throw new Error.GroupNotFound(e.getMessage());
} catch (AttachmentInvalidException e) {
throw new Error.AttachmentInvalid(e.getMessage());
+ } catch (UnregisteredRecipientException e) {
+ throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");
}
}
}
git.nmode.ca / signal-cli / blobdiff
