import org.asamk.signal.manager.StickerPackInvalidException;
import org.asamk.signal.manager.UntrustedIdentityException;
import org.asamk.signal.manager.api.Device;
+import org.asamk.signal.manager.api.Identity;
import org.asamk.signal.manager.api.Message;
import org.asamk.signal.manager.api.RecipientIdentifier;
import org.asamk.signal.manager.api.TypingAction;
import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
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.manager.storage.recipients.Profile;
+import org.asamk.signal.manager.storage.recipients.RecipientAddress;
import org.asamk.signal.util.ErrorUtils;
-import org.asamk.signal.util.Util;
import org.freedesktop.dbus.exceptions.DBusExecutionException;
import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.libsignal.util.Pair;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import static org.asamk.signal.util.Util.getLegacyIdentifier;
-
public class DbusSignalImpl implements Signal {
private final Manager m;
return objectPath;
}
+ @Override
+ public String getNumber() {
+ return m.getSelfNumber();
+ }
+
@Override
public void addDevice(String uri) {
try {
public long sendMessage(final String message, final List<String> attachments, final List<String> recipients) {
try {
final var results = m.sendMessage(new Message(message, attachments),
- getSingleRecipientIdentifiers(recipients, m.getUsername()).stream()
+ getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
.map(RecipientIdentifier.class::cast)
.collect(Collectors.toSet()));
) {
try {
final var results = m.sendRemoteDeleteMessage(targetSentTimestamp,
- getSingleRecipientIdentifiers(recipients, m.getUsername()).stream()
+ getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
.map(RecipientIdentifier.class::cast)
.collect(Collectors.toSet()));
checkSendMessageResults(results.getTimestamp(), results.getResults());
try {
final var results = m.sendMessageReaction(emoji,
remove,
- getSingleRecipientIdentifier(targetAuthor, m.getUsername()),
+ getSingleRecipientIdentifier(targetAuthor, m.getSelfNumber()),
targetSentTimestamp,
- getSingleRecipientIdentifiers(recipients, m.getUsername()).stream()
+ getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
.map(RecipientIdentifier.class::cast)
.collect(Collectors.toSet()));
checkSendMessageResults(results.getTimestamp(), results.getResults());
var recipients = new ArrayList<String>(1);
recipients.add(recipient);
m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START,
- getSingleRecipientIdentifiers(recipients, m.getUsername()).stream()
+ getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
.map(RecipientIdentifier.class::cast)
.collect(Collectors.toSet()));
} catch (IOException e) {
@Override
public void sendReadReceipt(
- final String recipient, final List<Long> timestamps
+ final String recipient, final List<Long> messageIds
) throws Error.Failure, Error.UntrustedIdentity {
try {
- m.sendReadReceipt(getSingleRecipientIdentifier(recipient, m.getUsername()), timestamps);
+ m.sendReadReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()), messageIds);
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
} catch (UntrustedIdentityException e) {
) throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {
try {
final var results = m.sendMessage(new Message(message, attachments),
- Set.of(new RecipientIdentifier.NoteToSelf()));
+ Set.of(RecipientIdentifier.NoteToSelf.INSTANCE));
checkSendMessageResults(results.getTimestamp(), results.getResults());
return results.getTimestamp();
} catch (AttachmentInvalidException e) {
@Override
public void sendEndSessionMessage(final List<String> recipients) {
try {
- final var results = m.sendEndSessionMessage(getSingleRecipientIdentifiers(recipients, m.getUsername()));
+ final var results = m.sendEndSessionMessage(getSingleRecipientIdentifiers(recipients, m.getSelfNumber()));
checkSendMessageResults(results.getTimestamp(), results.getResults());
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
try {
final var results = m.sendMessageReaction(emoji,
remove,
- getSingleRecipientIdentifier(targetAuthor, m.getUsername()),
+ getSingleRecipientIdentifier(targetAuthor, m.getSelfNumber()),
targetSentTimestamp,
Set.of(new RecipientIdentifier.Group(getGroupId(groupId))));
checkSendMessageResults(results.getTimestamp(), results.getResults());
// the profile name
@Override
public String getContactName(final String number) {
- return m.getContactOrProfileName(getSingleRecipientIdentifier(number, m.getUsername()));
+ return m.getContactOrProfileName(getSingleRecipientIdentifier(number, m.getSelfNumber()));
}
@Override
public void setContactName(final String number, final String name) {
try {
- m.setContactName(getSingleRecipientIdentifier(number, m.getUsername()), name);
+ m.setContactName(getSingleRecipientIdentifier(number, m.getSelfNumber()), name);
} catch (NotMasterDeviceException e) {
throw new Error.Failure("This command doesn't work on linked devices.");
} catch (UnregisteredUserException e) {
@Override
public void setExpirationTimer(final String number, final int expiration) {
try {
- m.setExpirationTimer(getSingleRecipientIdentifier(number, m.getUsername()), expiration);
+ m.setExpirationTimer(getSingleRecipientIdentifier(number, m.getSelfNumber()), expiration);
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
}
@Override
public void setContactBlocked(final String number, final boolean blocked) {
try {
- m.setContactBlocked(getSingleRecipientIdentifier(number, m.getUsername()), blocked);
+ m.setContactBlocked(getSingleRecipientIdentifier(number, m.getSelfNumber()), blocked);
} catch (NotMasterDeviceException e) {
throw new Error.Failure("This command doesn't work on linked devices.");
} catch (IOException e) {
if (group == null) {
return List.of();
} else {
- return group.getMembers()
- .stream()
- .map(m::resolveSignalServiceAddress)
- .map(Util::getLegacyIdentifier)
- .collect(Collectors.toList());
+ return group.getMembers().stream().map(RecipientAddress::getLegacyIdentifier).collect(Collectors.toList());
}
}
if (avatar.isEmpty()) {
avatar = null;
}
- final var memberIdentifiers = getSingleRecipientIdentifiers(members, m.getUsername());
+ 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().getTimestamp(), results.second().getResults());
@Override
public boolean isRegistered() {
- var result = isRegistered(List.of(m.getUsername()));
- return result.get(0);
+ return true;
}
@Override
@Override
public List<Boolean> isRegistered(List<String> numbers) {
- var results = new ArrayList<Boolean> ();
- Map<String, Pair<String, UUID>> registered;
+ var results = new ArrayList<Boolean>();
if (numbers.isEmpty()) {
return results;
}
+
+ Map<String, Pair<String, UUID>> registered;
try {
- registered = m.areUsersRegistered(new HashSet<String>(numbers));
+ registered = m.areUsersRegistered(new HashSet<>(numbers));
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
}
- for (String number : numbers) {
- UUID uuid = registered.get(number).second();
- results.add(uuid != null);
+
+ return numbers.stream().map(number -> {
+ var uuid = registered.get(number).second();
+ return uuid != null;
+ }).collect(Collectors.toList());
+ }
+
+ @Override
+ public void updateProfile(
+ final String givenName,
+ final String familyName,
+ final String about,
+ final String aboutEmoji,
+ String avatarPath,
+ final boolean removeAvatar
+ ) {
+ try {
+ if (avatarPath.isEmpty()) {
+ avatarPath = null;
+ }
+ Optional<File> avatarFile = removeAvatar
+ ? Optional.absent()
+ : avatarPath == null ? null : Optional.of(new File(avatarPath));
+ m.setProfile(givenName, familyName, about, aboutEmoji, avatarFile);
+ } catch (IOException e) {
+ throw new Error.Failure(e.getMessage());
}
- return results;
}
@Override
// all numbers the system knows
@Override
public List<String> listNumbers() {
- return Stream.concat(m.getIdentities().stream().map(IdentityInfo::getRecipientId),
+ return Stream.concat(m.getIdentities().stream().map(Identity::getRecipient),
m.getContacts().stream().map(Pair::first))
- .map(m::resolveSignalServiceAddress)
- .map(a -> a.getNumber().orNull())
+ .map(a -> a.getNumber().orElse(null))
.filter(Objects::nonNull)
.distinct()
.collect(Collectors.toList());
var contacts = m.getContacts();
for (var c : contacts) {
if (name.equals(c.second().getName())) {
- numbers.add(getLegacyIdentifier(m.resolveSignalServiceAddress(c.first())));
+ numbers.add(c.first().getLegacyIdentifier());
}
}
// Try profiles if no contact name was found
for (var identity : m.getIdentities()) {
- final var recipientId = identity.getRecipientId();
- final var address = m.resolveSignalServiceAddress(recipientId);
- var number = address.getNumber().orNull();
+ final var address = identity.getRecipient();
+ var number = address.getNumber().orElse(null);
if (number != null) {
- var profile = m.getRecipientProfile(recipientId);
+ Profile profile = null;
+ try {
+ profile = m.getRecipientProfile(RecipientIdentifier.Single.fromAddress(address));
+ } catch (UnregisteredUserException ignored) {
+ }
if (profile != null && profile.getDisplayName().equals(name)) {
numbers.add(number);
}
@Override
public boolean isContactBlocked(final String number) {
- return m.isContactBlocked(getSingleRecipientIdentifier(number, m.getUsername()));
+ return m.isContactBlocked(getSingleRecipientIdentifier(number, m.getSelfNumber()));
}
@Override
if (group == null) {
return false;
} else {
- return group.isMember(m.getSelfRecipientId());
+ return group.isMember();
}
}
git.nmode.ca / signal-cli / blobdiff
