import org.asamk.signal.manager.api.InvalidDeviceLinkException;
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.NotPrimaryDeviceException;
import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.api.ReceiveConfig;
import org.asamk.signal.manager.api.RecipientIdentifier;
import org.asamk.signal.manager.api.SendGroupMessageResults;
import org.asamk.signal.manager.api.SendMessageResult;
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.config.ServiceEnvironmentConfig;
import org.asamk.signal.manager.groups.GroupId;
import org.slf4j.LoggerFactory;
import org.whispersystems.signalservice.api.SignalSessionLock;
import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
+import org.whispersystems.signalservice.api.messages.SignalServicePreview;
import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage;
import org.whispersystems.signalservice.api.push.ACI;
logger.trace("Archiving old sessions for {}", recipientId);
account.getSessionStore().archiveSessions(recipientId);
account.getSenderKeyStore().deleteSharedWith(recipientId);
- final var profile = account.getRecipientStore().getProfile(recipientId);
+ final var profile = account.getProfileStore().getProfile(recipientId);
if (profile != null) {
- account.getRecipientStore()
+ account.getProfileStore()
.storeProfile(recipientId,
Profile.newBuilder(profile)
.withUnidentifiedAccessMode(Profile.UnidentifiedAccessMode.UNKNOWN)
final var aci = registeredUsers.get(number);
final var profile = aci == null
? null
- : context.getProfileHelper().getRecipientProfile(account.getRecipientStore().resolveRecipient(aci));
+ : context.getProfileHelper()
+ .getRecipientProfile(account.getRecipientResolver().resolveRecipient(aci));
return new UserStatus(number.isEmpty() ? null : number,
aci == null ? null : aci.uuid(),
profile != null
@Override
public void updateConfiguration(
Configuration configuration
- ) throws NotMasterDeviceException {
- if (!account.isMasterDevice()) {
- throw new NotMasterDeviceException();
+ ) throws NotPrimaryDeviceException {
+ if (!account.isPrimaryDevice()) {
+ throw new NotPrimaryDeviceException();
}
final var configurationStore = account.getConfigurationStore();
}
@Override
- public void setProfile(
- String givenName, final String familyName, String about, String aboutEmoji, Optional<File> avatar
- ) throws IOException {
- context.getProfileHelper().setProfile(givenName, familyName, about, aboutEmoji, avatar);
+ public void updateProfile(UpdateProfile updateProfile) throws IOException {
+ context.getProfileHelper()
+ .setProfile(updateProfile.getGivenName(),
+ updateProfile.getFamilyName(),
+ updateProfile.getAbout(),
+ updateProfile.getAboutEmoji(),
+ updateProfile.isDeleteAvatar()
+ ? Optional.empty()
+ : updateProfile.getAvatar() == null ? null : Optional.of(updateProfile.getAvatar()),
+ updateProfile.getMobileCoinAddress());
context.getSyncHelper().sendSyncFetchProfileMessage();
}
}
@Override
- public void setRegistrationLockPin(Optional<String> pin) throws IOException, NotMasterDeviceException {
- if (!account.isMasterDevice()) {
- throw new NotMasterDeviceException();
+ public void setRegistrationLockPin(Optional<String> pin) throws IOException, NotPrimaryDeviceException {
+ if (!account.isPrimaryDevice()) {
+ throw new NotPrimaryDeviceException();
}
if (pin.isPresent()) {
context.getAccountHelper().setRegistrationPin(pin.get());
return null;
}
- return Group.from(groupInfo,
- account.getRecipientStore()::resolveRecipientAddress,
- account.getSelfRecipientId());
+ return Group.from(groupInfo, account.getRecipientAddressResolver(), account.getSelfRecipientId());
}
@Override
}
private SendMessageResult toSendMessageResult(final org.whispersystems.signalservice.api.messages.SendMessageResult result) {
- return SendMessageResult.from(result,
- account.getRecipientStore(),
- account.getRecipientStore()::resolveRecipientAddress);
+ return SendMessageResult.from(result, account.getRecipientResolver(), account.getRecipientAddressResolver());
}
private SendMessageResults sendTypingMessage(
final SignalServiceDataMessage.Builder messageBuilder, final Message message
) throws AttachmentInvalidException, IOException, UnregisteredRecipientException, InvalidStickerException {
messageBuilder.withBody(message.messageText());
- final var attachments = message.attachments();
- if (attachments != null) {
- messageBuilder.withAttachments(context.getAttachmentHelper().uploadAttachments(attachments));
+ if (message.attachments().size() > 0) {
+ messageBuilder.withAttachments(context.getAttachmentHelper().uploadAttachments(message.attachments()));
}
if (message.mentions().size() > 0) {
messageBuilder.withMentions(resolveMentions(message.mentions()));
stickerPack.getPackKey(),
stickerId,
manifestSticker.emoji(),
- AttachmentUtils.createAttachment(streamDetails, Optional.empty())));
+ AttachmentUtils.createAttachmentStream(streamDetails, Optional.empty())));
+ }
+ if (message.previews().size() > 0) {
+ final var previews = new ArrayList<SignalServicePreview>(message.previews().size());
+ for (final var p : message.previews()) {
+ final var image = p.image().isPresent() ? context.getAttachmentHelper()
+ .uploadAttachment(p.image().get()) : null;
+ previews.add(new SignalServicePreview(p.url(),
+ p.title(),
+ p.description(),
+ 0,
+ Optional.ofNullable(image)));
+ }
+ messageBuilder.withPreviews(previews);
}
}
return sendMessage(messageBuilder, recipients);
}
+ @Override
+ public SendMessageResults sendPaymentNotificationMessage(
+ byte[] receipt, String note, RecipientIdentifier.Single recipient
+ ) throws IOException {
+ final var paymentNotification = new SignalServiceDataMessage.PaymentNotification(receipt, note);
+ final var payment = new SignalServiceDataMessage.Payment(paymentNotification);
+ final var messageBuilder = SignalServiceDataMessage.newBuilder().withPayment(payment);
+ try {
+ return sendMessage(messageBuilder, Set.of(recipient));
+ } catch (NotAGroupMemberException | GroupNotFoundException | GroupSendingNotAllowedException e) {
+ throw new AssertionError(e);
+ }
+ }
+
@Override
public SendMessageResults sendEndSessionMessage(Set<RecipientIdentifier.Single> recipients) throws IOException {
var messageBuilder = SignalServiceDataMessage.newBuilder().asEndSessionMessage();
@Override
public void deleteRecipient(final RecipientIdentifier.Single recipient) {
- account.removeRecipient(account.getRecipientStore().resolveRecipient(recipient.toPartialRecipientAddress()));
+ account.removeRecipient(account.getRecipientResolver().resolveRecipient(recipient.toPartialRecipientAddress()));
}
@Override
public void deleteContact(final RecipientIdentifier.Single recipient) {
account.getContactStore()
- .deleteContact(account.getRecipientStore().resolveRecipient(recipient.toPartialRecipientAddress()));
+ .deleteContact(account.getRecipientResolver().resolveRecipient(recipient.toPartialRecipientAddress()));
}
@Override
public void setContactName(
- RecipientIdentifier.Single recipient, String name
- ) throws NotMasterDeviceException, UnregisteredRecipientException {
- if (!account.isMasterDevice()) {
- throw new NotMasterDeviceException();
+ RecipientIdentifier.Single recipient, String givenName, final String familyName
+ ) throws NotPrimaryDeviceException, UnregisteredRecipientException {
+ if (!account.isPrimaryDevice()) {
+ throw new NotPrimaryDeviceException();
}
- context.getContactHelper().setContactName(context.getRecipientHelper().resolveRecipient(recipient), name);
+ context.getContactHelper()
+ .setContactName(context.getRecipientHelper().resolveRecipient(recipient), givenName, familyName);
}
@Override
public void setContactsBlocked(
Collection<RecipientIdentifier.Single> recipients, boolean blocked
- ) throws NotMasterDeviceException, IOException, UnregisteredRecipientException {
- if (!account.isMasterDevice()) {
- throw new NotMasterDeviceException();
+ ) throws NotPrimaryDeviceException, IOException, UnregisteredRecipientException {
+ if (!account.isPrimaryDevice()) {
+ throw new NotPrimaryDeviceException();
}
if (recipients.size() == 0) {
return;
@Override
public void setGroupsBlocked(
final Collection<GroupId> groupIds, final boolean blocked
- ) throws GroupNotFoundException, NotMasterDeviceException, IOException {
- if (!account.isMasterDevice()) {
- throw new NotMasterDeviceException();
+ ) throws GroupNotFoundException, NotPrimaryDeviceException, IOException {
+ if (!account.isPrimaryDevice()) {
+ throw new NotPrimaryDeviceException();
}
if (groupIds.size() == 0) {
return;
}
void retrieveRemoteStorage() throws IOException {
- if (account.getStorageKey() != null) {
- context.getStorageHelper().readDataFromStorage();
- }
+ context.getStorageHelper().readDataFromStorage();
}
@Override
logger.debug("Starting receiving messages");
context.getReceiveHelper().receiveMessagesContinuously((envelope, e) -> {
synchronized (messageHandlers) {
- Stream.concat(messageHandlers.stream(), weakHandlers.stream()).forEach(h -> {
+ final var handlers = Stream.concat(messageHandlers.stream(), weakHandlers.stream()).toList();
+ handlers.forEach(h -> {
try {
h.handleMessage(envelope, e);
} catch (Throwable ex) {
}
@Override
- public void setIgnoreAttachments(final boolean ignoreAttachments) {
- context.getReceiveHelper().setIgnoreAttachments(ignoreAttachments);
+ public void setReceiveConfig(final ReceiveConfig receiveConfig) {
+ context.getReceiveHelper().setReceiveConfig(receiveConfig);
}
@Override
return null;
}
}).filter(Objects::nonNull).collect(Collectors.toSet());
+ if (!recipients.isEmpty() && recipientIds.isEmpty()) {
+ return List.of();
+ }
// refresh profiles of explicitly given recipients
context.getProfileHelper().refreshRecipientProfiles(recipientIds);
return account.getRecipientStore().getRecipients(onlyContacts, blocked, recipientIds, name);
return null;
}
- final var address = account.getRecipientStore().resolveRecipientAddress(identityInfo.getRecipientId());
+ final var address = account.getRecipientAddressResolver()
+ .resolveRecipientAddress(identityInfo.getRecipientId());
final var scannableFingerprint = context.getIdentityHelper()
.computeSafetyNumberForScanning(identityInfo.getRecipientId(), identityInfo.getIdentityKey());
return new Identity(address,
IdentityInfo identity;
try {
identity = account.getIdentityKeyStore()
- .getIdentity(context.getRecipientHelper().resolveRecipient(recipient));
+ .getIdentityInfo(context.getRecipientHelper().resolveRecipient(recipient));
} catch (UnregisteredRecipientException e) {
identity = null;
}
git.nmode.ca / signal-cli / blobdiff
