import org.asamk.signal.BaseConfig;
import org.asamk.signal.manager.Manager;
import org.asamk.signal.manager.api.AttachmentInvalidException;
-import org.asamk.signal.manager.api.Identity;
+import org.asamk.signal.manager.api.DeviceLinkUrl;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.GroupLinkState;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupPermission;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
+import org.asamk.signal.manager.api.IdentityVerificationCode;
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.LastGroupAdminException;
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.NotAGroupMemberException;
+import org.asamk.signal.manager.api.NotPrimaryDeviceException;
+import org.asamk.signal.manager.api.PendingAdminApprovalException;
+import org.asamk.signal.manager.api.RecipientAddress;
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.TypingAction;
import org.asamk.signal.manager.api.UnregisteredRecipientException;
import org.asamk.signal.manager.api.UpdateGroup;
+import org.asamk.signal.manager.api.UpdateProfile;
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.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupPermission;
-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.recipients.Profile;
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
import org.asamk.signal.util.SendMessageResultUtils;
import org.freedesktop.dbus.DBusPath;
import org.freedesktop.dbus.connections.impl.DBusConnection;
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;
+
+import static org.asamk.signal.dbus.DbusUtils.makeValidObjectPathElement;
public class DbusSignalImpl implements Signal {
private DBusPath thisDevice;
private final List<StructDevice> devices = new ArrayList<>();
private final List<StructGroup> groups = new ArrayList<>();
+ private final List<StructIdentity> identities = new ArrayList<>();
private DbusReceiveMessageHandler dbusMessageHandler;
private int subscriberCount;
updateDevices();
updateGroups();
updateConfiguration();
+ updateIdentities();
}
public void close() {
unExportDevices();
unExportGroups();
unExportConfiguration();
+ unExportIdentities();
connection.unExportObject(this.objectPath);
}
@Override
public void addDevice(String uri) {
try {
- m.addDeviceLink(new URI(uri));
+ var deviceLinkUrl = DeviceLinkUrl.parseDeviceLinkUri(new URI(uri));
+ m.addDeviceLink(deviceLinkUrl);
} catch (IOException | InvalidDeviceLinkException e) {
throw new Error.Failure(e.getClass().getSimpleName() + " Add device link failed. " + e.getMessage());
+ } catch (NotPrimaryDeviceException e) {
+ throw new Error.Failure("This command doesn't work on linked devices.");
} catch (URISyntaxException e) {
throw new Error.InvalidUri(e.getClass().getSimpleName()
+ " Device link uri has invalid format: "
attachments,
List.of(),
Optional.empty(),
- Optional.empty()),
+ Optional.empty(),
+ List.of(),
+ Optional.empty(),
+ List.of()),
getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
.map(RecipientIdentifier.class::cast)
.collect(Collectors.toSet()));
targetSentTimestamp,
getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
.map(RecipientIdentifier.class::cast)
- .collect(Collectors.toSet()));
+ .collect(Collectors.toSet()),
+ false);
checkSendMessageResults(results);
return results.timestamp();
} catch (IOException e) {
}
}
+ @Override
+ public long sendPaymentNotification(
+ final byte[] receipt, final String note, final String recipient
+ ) throws Error.Failure {
+ try {
+ final var results = m.sendPaymentNotificationMessage(receipt,
+ note,
+ getSingleRecipientIdentifier(recipient, m.getSelfNumber()));
+ checkSendMessageResults(results);
+ return results.timestamp();
+ } catch (IOException e) {
+ throw new Error.Failure(e.getMessage());
+ }
+ }
+
@Override
public void sendTyping(
final String recipient, final boolean stop
attachments,
List.of(),
Optional.empty(),
- Optional.empty()), Set.of(RecipientIdentifier.NoteToSelf.INSTANCE));
+ Optional.empty(),
+ List.of(),
+ Optional.empty(),
+ List.of()), Set.of(RecipientIdentifier.NoteToSelf.INSTANCE));
checkSendMessageResults(results);
return results.timestamp();
} catch (AttachmentInvalidException e) {
attachments,
List.of(),
Optional.empty(),
- Optional.empty()), Set.of(getGroupRecipientIdentifier(groupId)));
+ Optional.empty(),
+ List.of(),
+ Optional.empty(),
+ List.of()), Set.of(getGroupRecipientIdentifier(groupId)));
checkSendMessageResults(results);
return results.timestamp();
} catch (IOException | InvalidStickerException e) {
remove,
getSingleRecipientIdentifier(targetAuthor, m.getSelfNumber()),
targetSentTimestamp,
- Set.of(getGroupRecipientIdentifier(groupId)));
+ Set.of(getGroupRecipientIdentifier(groupId)),
+ false);
checkSendMessageResults(results);
return results.timestamp();
} catch (IOException e) {
@Override
public void setContactName(final String number, final String name) {
try {
- m.setContactName(getSingleRecipientIdentifier(number, m.getSelfNumber()), name);
- } catch (NotMasterDeviceException e) {
+ m.setContactName(getSingleRecipientIdentifier(number, m.getSelfNumber()), name, "");
+ } catch (NotPrimaryDeviceException e) {
throw new Error.Failure("This command doesn't work on linked devices.");
} catch (IOException e) {
throw new Error.Failure("Contact is not registered.");
@Override
public void setContactBlocked(final String number, final boolean blocked) {
try {
- m.setContactBlocked(getSingleRecipientIdentifier(number, m.getSelfNumber()), blocked);
- } catch (NotMasterDeviceException e) {
+ m.setContactsBlocked(List.of(getSingleRecipientIdentifier(number, m.getSelfNumber())), blocked);
+ } catch (NotPrimaryDeviceException e) {
throw new Error.Failure("This command doesn't work on linked devices.");
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
@Override
public void setGroupBlocked(final byte[] groupId, final boolean blocked) {
try {
- m.setGroupBlocked(getGroupId(groupId), blocked);
- } catch (NotMasterDeviceException e) {
+ m.setGroupsBlocked(List.of(getGroupId(groupId)), blocked);
+ } catch (NotPrimaryDeviceException e) {
throw new Error.Failure("This command doesn't work on linked devices.");
} catch (GroupNotFoundException e) {
throw new Error.GroupNotFound(e.getMessage());
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));
+ final var results = m.createGroup(name, memberIdentifiers, avatar);
updateGroups();
checkGroupSendMessageResults(results.second().timestamp(), results.second().results());
return results.first().serialize();
UpdateGroup.newBuilder()
.withName(name)
.withMembers(memberIdentifiers)
- .withAvatarFile(avatar == null ? null : new File(avatar))
+ .withAvatarFile(avatar)
.build());
if (results != null) {
checkGroupSendMessageResults(results.timestamp(), results.results());
about = nullIfEmpty(about);
aboutEmoji = nullIfEmpty(aboutEmoji);
avatarPath = nullIfEmpty(avatarPath);
- Optional<File> avatarFile = removeAvatar
- ? Optional.empty()
- : avatarPath == null ? null : Optional.of(new File(avatarPath));
- m.setProfile(givenName, familyName, about, aboutEmoji, avatarFile);
+ final var avatarFile = removeAvatar || avatarPath == null ? null : avatarPath;
+ m.updateProfile(UpdateProfile.newBuilder()
+ .withGivenName(givenName)
+ .withFamilyName(familyName)
+ .withAbout(about)
+ .withAboutEmoji(aboutEmoji)
+ .withAvatar(avatarFile)
+ .withDeleteAvatar(removeAvatar)
+ .build());
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
}
m.setRegistrationLockPin(Optional.empty());
} catch (IOException e) {
throw new Error.Failure("Remove pin error: " + e.getMessage());
- } catch (NotMasterDeviceException e) {
+ } catch (NotPrimaryDeviceException 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) {
+ } catch (NotPrimaryDeviceException e) {
throw new Error.Failure("This command doesn't work on linked devices.");
}
}
// all numbers the system knows
@Override
public List<String> listNumbers() {
- return Stream.concat(m.getIdentities().stream().map(Identity::recipient),
- m.getContacts().stream().map(Pair::first))
- .map(a -> a.number().orElse(null))
+ return m.getRecipients(false, Optional.empty(), Set.of(), Optional.empty())
+ .stream()
+ .map(r -> r.getAddress().number().orElse(null))
.filter(Objects::nonNull)
.distinct()
.toList();
@Override
public List<String> getContactNumber(final String name) {
- // Contact names have precedence.
- var numbers = new ArrayList<String>();
- var contacts = m.getContacts();
- for (var c : contacts) {
- if (name.equals(c.second().getName())) {
- numbers.add(c.first().getLegacyIdentifier());
- }
- }
- // Try profiles if no contact name was found
- for (var identity : m.getIdentities()) {
- final var address = identity.recipient();
- var number = address.number().orElse(null);
- if (number != null) {
- Profile profile = null;
- try {
- profile = m.getRecipientProfile(RecipientIdentifier.Single.fromAddress(address));
- } catch (IOException | UnregisteredRecipientException ignored) {
- }
- if (profile != null && profile.getDisplayName().equals(name)) {
- numbers.add(number);
- }
- }
- }
- return numbers;
+ return m.getRecipients(false, Optional.empty(), Set.of(), Optional.of(name))
+ .stream()
+ .map(r -> r.getAddress().getLegacyIdentifier())
+ .toList();
}
@Override
}
final var result = m.joinGroup(linkUrl);
return result.first().serialize();
+ } catch (PendingAdminApprovalException e) {
+ throw new Error.Failure("Pending admin approval: " + e.getMessage());
} catch (GroupInviteLinkUrl.InvalidGroupLinkException | InactiveGroupLinkException e) {
throw new Error.Failure("Group link is invalid: " + e.getMessage());
} catch (GroupInviteLinkUrl.UnknownGroupLinkVersionException e) {
}
private static String getGroupObjectPath(String basePath, byte[] groupId) {
- return basePath + "/Groups/" + Base64.getEncoder()
- .encodeToString(groupId)
- .replace("+", "_")
- .replace("/", "_")
- .replace("=", "_");
+ return basePath + "/Groups/" + makeValidObjectPathElement(Base64.getEncoder().encodeToString(groupId));
}
private void updateGroups() {
}
}
+ private void updateIdentities() {
+ List<org.asamk.signal.manager.api.Identity> identities;
+ identities = m.getIdentities();
+
+ unExportIdentities();
+
+ identities.forEach(i -> {
+ final var object = new DbusSignalIdentityImpl(i);
+ exportObject(object);
+ this.identities.add(new StructIdentity(new DBusPath(object.getObjectPath()),
+ i.recipient().uuid().map(UUID::toString).orElse(""),
+ i.recipient().number().orElse("")));
+ });
+ }
+
+ private static String getIdentityObjectPath(String basePath, String id) {
+ return basePath + "/Identities/" + makeValidObjectPathElement(id);
+ }
+
+ private void unExportIdentities() {
+ this.identities.stream()
+ .map(StructIdentity::getObjectPath)
+ .map(DBusPath::getPath)
+ .forEach(connection::unExportObject);
+ this.identities.clear();
+ }
+
+ @Override
+ public DBusPath getIdentity(String number) throws Error.Failure {
+ final var found = identities.stream()
+ .filter(identity -> identity.getNumber().equals(number) || identity.getUuid().equals(number))
+ .findFirst();
+
+ if (found.isEmpty()) {
+ throw new Error.Failure("Identity for " + number + " unknown");
+ }
+ return found.get().getObjectPath();
+ }
+
+ @Override
+ public List<StructIdentity> listIdentities() {
+ updateIdentities();
+ return this.identities;
+ }
+
+ public class DbusSignalIdentityImpl extends DbusProperties implements Signal.Identity {
+
+ private final org.asamk.signal.manager.api.Identity identity;
+
+ public DbusSignalIdentityImpl(final org.asamk.signal.manager.api.Identity identity) {
+ this.identity = identity;
+ super.addPropertiesHandler(new DbusInterfacePropertiesHandler("org.asamk.Signal.Identity",
+ List.of(new DbusProperty<>("Number", () -> identity.recipient().number().orElse("")),
+ new DbusProperty<>("Uuid",
+ () -> identity.recipient().uuid().map(UUID::toString).orElse("")),
+ new DbusProperty<>("Fingerprint", identity::getFingerprint),
+ new DbusProperty<>("SafetyNumber", identity::safetyNumber),
+ new DbusProperty<>("ScannableSafetyNumber", identity::scannableSafetyNumber),
+ new DbusProperty<>("TrustLevel", identity::trustLevel),
+ new DbusProperty<>("AddedDate", identity::dateAddedTimestamp))));
+ }
+
+ @Override
+ public String getObjectPath() {
+ return getIdentityObjectPath(objectPath, identity.recipient().getLegacyIdentifier());
+ }
+
+ @Override
+ public void trust() throws Error.Failure {
+ var recipient = RecipientIdentifier.Single.fromAddress(identity.recipient());
+ try {
+ m.trustIdentityAllKeys(recipient);
+ } catch (UnregisteredRecipientException e) {
+ throw new Error.Failure("The user " + e.getSender().getIdentifier() + " is not registered.");
+ }
+ updateIdentities();
+ }
+
+ @Override
+ public void trustVerified(String safetyNumber) throws Error.Failure {
+ var recipient = RecipientIdentifier.Single.fromAddress(identity.recipient());
+
+ if (safetyNumber == null) {
+ throw new Error.Failure("You need to specify a fingerprint/safety number");
+ }
+ final IdentityVerificationCode verificationCode;
+ try {
+ verificationCode = IdentityVerificationCode.parse(safetyNumber);
+ } catch (Exception e) {
+ throw new Error.Failure(
+ "Safety number has invalid format, either specify the old hex fingerprint or the new safety number");
+ }
+
+ try {
+ final var res = m.trustIdentityVerified(recipient, verificationCode);
+ if (!res) {
+ throw new Error.Failure(
+ "Failed to set the trust for this number, make sure the number and the fingerprint/safety number are correct.");
+ }
+ } catch (UnregisteredRecipientException e) {
+ throw new Error.Failure("The user " + e.getSender().getIdentifier() + " is not registered.");
+ }
+ updateIdentities();
+ }
+ }
+
public class DbusSignalDeviceImpl extends DbusProperties implements Signal.Device {
private final org.asamk.signal.manager.api.Device device;
public class DbusSignalConfigurationImpl extends DbusProperties implements Signal.Configuration {
- public DbusSignalConfigurationImpl(
- ) {
+ public DbusSignalConfigurationImpl() {
super.addPropertiesHandler(new DbusInterfacePropertiesHandler("org.asamk.Signal.Configuration",
List.of(new DbusProperty<>("ReadReceipts", this::getReadReceipts, this::setReadReceipts),
new DbusProperty<>("UnidentifiedDeliveryIndicators",
Optional.ofNullable(linkPreviews)));
} catch (IOException e) {
throw new Error.Failure("UpdateAccount error: " + e.getMessage());
- } catch (NotMasterDeviceException e) {
+ } catch (NotPrimaryDeviceException e) {
throw new Error.Failure("This command doesn't work on linked devices.");
}
}
public void quitGroup() throws Error.Failure {
try {
m.quitGroup(groupId, Set.of());
- } catch (GroupNotFoundException | NotAGroupMemberException e) {
+ } catch (GroupNotFoundException e) {
throw new Error.GroupNotFound(e.getMessage());
+ } catch (NotAGroupMemberException e) {
+ throw new Error.NotAGroupMember(e.getMessage());
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
} catch (LastGroupAdminException e) {
}
private void setGroupAvatar(final String avatar) {
- updateGroup(UpdateGroup.newBuilder().withAvatarFile(new File(avatar)).build());
+ updateGroup(UpdateGroup.newBuilder().withAvatarFile(avatar).build());
}
private void setMessageExpirationTime(final int expirationTime) {
private void setIsBlocked(final boolean isBlocked) {
try {
- m.setGroupBlocked(groupId, isBlocked);
- } catch (NotMasterDeviceException e) {
+ m.setGroupsBlocked(List.of(groupId), isBlocked);
+ } catch (NotPrimaryDeviceException e) {
throw new Error.Failure("This command doesn't work on linked devices.");
} catch (GroupNotFoundException e) {
throw new Error.GroupNotFound(e.getMessage());
git.nmode.ca / signal-cli / blobdiff
