package org.asamk.signal.dbus;
import org.asamk.Signal;
+import org.asamk.Signal.Error;
import org.asamk.signal.BaseConfig;
+import org.asamk.signal.commands.exceptions.IOErrorException;
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.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.DBusPath;
+import org.freedesktop.dbus.connections.impl.DBusConnection;
+import org.freedesktop.dbus.exceptions.DBusException;
import org.freedesktop.dbus.exceptions.DBusExecutionException;
+import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.libsignal.util.Pair;
import org.whispersystems.libsignal.util.guava.Optional;
import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
import java.io.File;
import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
+import java.util.UUID;
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;
+ private final DBusConnection connection;
private final String objectPath;
- public DbusSignalImpl(final Manager m, final String objectPath) {
+ private DBusPath thisDevice;
+ private final List<StructDevice> devices = new ArrayList<>();
+
+ public DbusSignalImpl(final Manager m, DBusConnection connection, final String objectPath) {
this.m = m;
+ this.connection = connection;
this.objectPath = objectPath;
}
- @Override
- public boolean isRemote() {
- return false;
+ public void initObjects() {
+ updateDevices();
+ }
+
+ public void close() {
+ unExportDevices();
}
@Override
return objectPath;
}
+ @Override
+ public String getSelfNumber() {
+ return m.getSelfNumber();
+ }
+
+ @Override
+ public void submitRateLimitChallenge(String challenge, String captchaString) throws IOErrorException {
+ final var captcha = captchaString == null ? null : captchaString.replace("signalcaptcha://", "");
+
+ try {
+ m.submitRateLimitRecaptchaChallenge(challenge, captcha);
+ } catch (IOException e) {
+ throw new IOErrorException("Submit challenge error: " + e.getMessage(), e);
+ }
+
+ }
+
+ @Override
+ public void addDevice(String uri) {
+ try {
+ m.addDeviceLink(new URI(uri));
+ } catch (IOException | InvalidKeyException e) {
+ throw new Error.Failure(e.getClass().getSimpleName() + " Add device link failed. " + e.getMessage());
+ } catch (URISyntaxException e) {
+ throw new Error.InvalidUri(e.getClass().getSimpleName()
+ + " Device link uri has invalid format: "
+ + e.getMessage());
+ }
+ }
+
+ @Override
+ public DBusPath getDevice(long deviceId) {
+ updateDevices();
+ return new DBusPath(getDeviceObjectPath(objectPath, deviceId));
+ }
+
+ @Override
+ public List<StructDevice> listDevices() {
+ updateDevices();
+ return this.devices;
+ }
+
+ @Override
+ public DBusPath getThisDevice() {
+ updateDevices();
+ return thisDevice;
+ }
+
@Override
public long sendMessage(final String message, final List<String> attachments, final String recipient) {
var recipients = new ArrayList<String>(1);
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()));
+ final var name = m.getContactOrProfileName(getSingleRecipientIdentifier(number, m.getSelfNumber()));
+ return name == null ? "" : name;
}
@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) {
@Override
public String getGroupName(final byte[] groupId) {
var group = m.getGroup(getGroupId(groupId));
- if (group == null) {
+ if (group == null || group.getTitle() == null) {
return "";
} else {
return group.getTitle();
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());
}
}
@Override
public byte[] updateGroup(byte[] groupId, String name, List<String> members, String avatar) {
try {
- if (groupId.length == 0) {
- groupId = null;
- }
- if (name.isEmpty()) {
- name = null;
- }
- if (avatar.isEmpty()) {
- avatar = null;
- }
- final var memberIdentifiers = getSingleRecipientIdentifiers(members, m.getUsername());
+ groupId = nullIfEmpty(groupId);
+ name = nullIfEmpty(name);
+ avatar = nullIfEmpty(avatar);
+ 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());
return true;
}
+ @Override
+ public boolean isRegistered(String number) {
+ var result = isRegistered(List.of(number));
+ return result.get(0);
+ }
+
+ @Override
+ public List<Boolean> isRegistered(List<String> numbers) {
+ var results = new ArrayList<Boolean>();
+ if (numbers.isEmpty()) {
+ return results;
+ }
+
+ Map<String, Pair<String, UUID>> registered;
+ try {
+ registered = m.areUsersRegistered(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());
+ }
+
@Override
public void updateProfile(
- final String name,
- final String about,
- final String aboutEmoji,
+ String givenName,
+ String familyName,
+ String about,
+ String aboutEmoji,
String avatarPath,
final boolean removeAvatar
) {
try {
- if (avatarPath.isEmpty()) {
- avatarPath = null;
- }
+ givenName = nullIfEmpty(givenName);
+ familyName = nullIfEmpty(familyName);
+ about = nullIfEmpty(about);
+ aboutEmoji = nullIfEmpty(aboutEmoji);
+ avatarPath = nullIfEmpty(avatarPath);
Optional<File> avatarFile = removeAvatar
? Optional.absent()
: avatarPath == null ? null : Optional.of(new File(avatarPath));
- m.setProfile(name, null, about, aboutEmoji, avatarFile);
+ m.setProfile(givenName, familyName, about, aboutEmoji, avatarFile);
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
}
}
+ @Override
+ public void updateProfile(
+ final String name,
+ final String about,
+ final String aboutEmoji,
+ String avatarPath,
+ final boolean removeAvatar
+ ) {
+ updateProfile(name, "", about, aboutEmoji, avatarPath, removeAvatar);
+ }
+
@Override
public void removePin() {
try {
// 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();
}
}
throw new Error.InvalidGroupId("Invalid group id: " + e.getMessage());
}
}
+
+ private byte[] nullIfEmpty(final byte[] array) {
+ return array.length == 0 ? null : array;
+ }
+
+ private String nullIfEmpty(final String name) {
+ return name.isEmpty() ? null : name;
+ }
+
+ private String emptyIfNull(final String string) {
+ return string == null ? "" : string;
+ }
+
+ private static String getDeviceObjectPath(String basePath, long deviceId) {
+ return basePath + "/Devices/" + deviceId;
+ }
+
+ private void updateDevices() {
+ List<org.asamk.signal.manager.api.Device> linkedDevices;
+ try {
+ linkedDevices = m.getLinkedDevices();
+ } catch (IOException e) {
+ throw new Error.Failure("Failed to get linked devices: " + e.getMessage());
+ }
+
+ unExportDevices();
+
+ linkedDevices.forEach(d -> {
+ final var object = new DbusSignalDeviceImpl(d);
+ final var deviceObjectPath = object.getObjectPath();
+ try {
+ connection.exportObject(object);
+ } catch (DBusException e) {
+ e.printStackTrace();
+ }
+ if (d.isThisDevice()) {
+ thisDevice = new DBusPath(deviceObjectPath);
+ }
+ this.devices.add(new StructDevice(new DBusPath(deviceObjectPath), d.getId(), emptyIfNull(d.getName())));
+ });
+ }
+
+ private void unExportDevices() {
+ this.devices.stream()
+ .map(StructDevice::getObjectPath)
+ .map(DBusPath::getPath)
+ .forEach(connection::unExportObject);
+ this.devices.clear();
+ }
+
+ public class DbusSignalDeviceImpl extends DbusProperties implements Signal.Device {
+
+ private final org.asamk.signal.manager.api.Device device;
+
+ public DbusSignalDeviceImpl(final org.asamk.signal.manager.api.Device device) {
+ super.addPropertiesHandler(new DbusInterfacePropertiesHandler("org.asamk.Signal.Device",
+ List.of(new DbusProperty<>("Id", device::getId),
+ new DbusProperty<>("Name", () -> emptyIfNull(device.getName()), this::setDeviceName),
+ new DbusProperty<>("Created", device::getCreated),
+ new DbusProperty<>("LastSeen", device::getLastSeen))));
+ this.device = device;
+ }
+
+ @Override
+ public String getObjectPath() {
+ return getDeviceObjectPath(objectPath, device.getId());
+ }
+
+ @Override
+ public void removeDevice() throws Error.Failure {
+ try {
+ m.removeLinkedDevices(device.getId());
+ updateDevices();
+ } catch (IOException e) {
+ throw new Error.Failure(e.getMessage());
+ }
+ }
+
+ private void setDeviceName(String name) {
+ if (!device.isThisDevice()) {
+ throw new Error.Failure("Only the name of this device can be changed");
+ }
+ try {
+ m.updateAccountAttributes(name);
+ // update device list
+ updateDevices();
+ } catch (IOException e) {
+ throw new Error.Failure(e.getMessage());
+ }
+ }
+ }
}
git.nmode.ca / signal-cli / blobdiff
