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.Identity;
+import org.asamk.signal.manager.api.AttachmentInvalidException;
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.Pair;
+import org.asamk.signal.manager.api.NotPrimaryDeviceException;
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.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.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 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;
public class DbusSignalImpl implements Signal {
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
attachments,
List.of(),
Optional.empty(),
- Optional.empty()),
+ Optional.empty(),
+ List.of()),
getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
.map(RecipientIdentifier.class::cast)
.collect(Collectors.toSet()));
attachments,
List.of(),
Optional.empty(),
- Optional.empty()), Set.of(RecipientIdentifier.NoteToSelf.INSTANCE));
+ 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()), Set.of(getGroupRecipientIdentifier(groupId)));
checkSendMessageResults(results);
return results.timestamp();
} catch (IOException | InvalidStickerException e) {
public void setContactName(final String number, final String name) {
try {
m.setContactName(getSingleRecipientIdentifier(number, m.getSelfNumber()), name);
- } catch (NotMasterDeviceException e) {
+ } 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());
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;
- }).toList();
+ return numbers.stream().map(number -> registered.get(number).uuid() != null).toList();
}
@Override
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);
+ File avatarFile = removeAvatar || avatarPath == null ? null : new File(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
}
var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results);
- if (errors.size() < results.size()) {
+ if (errors.size() == 0 || errors.size() < results.size()) {
return;
}
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.");
}
}
() -> 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),
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
