package org.asamk.signal.manager;
import org.asamk.signal.manager.api.Device;
+import org.asamk.signal.manager.api.Message;
+import org.asamk.signal.manager.api.RecipientIdentifier;
+import org.asamk.signal.manager.api.SendGroupMessageResults;
+import org.asamk.signal.manager.api.SendMessageResults;
+import org.asamk.signal.manager.api.TypingAction;
import org.asamk.signal.manager.config.ServiceConfig;
import org.asamk.signal.manager.config.ServiceEnvironment;
import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
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.GroupUtils;
import org.asamk.signal.manager.groups.LastGroupAdminException;
import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.manager.helper.GroupHelper;
import org.asamk.signal.manager.helper.GroupV2Helper;
import org.asamk.signal.manager.helper.PinHelper;
import org.asamk.signal.manager.helper.ProfileHelper;
+import org.asamk.signal.manager.helper.SendHelper;
import org.asamk.signal.manager.helper.UnidentifiedAccessHelper;
+import org.asamk.signal.manager.jobs.Context;
+import org.asamk.signal.manager.jobs.Job;
+import org.asamk.signal.manager.jobs.RetrieveStickerPackJob;
import org.asamk.signal.manager.storage.SignalAccount;
import org.asamk.signal.manager.storage.groups.GroupInfo;
import org.asamk.signal.manager.storage.groups.GroupInfoV1;
-import org.asamk.signal.manager.storage.groups.GroupInfoV2;
import org.asamk.signal.manager.storage.identities.IdentityInfo;
+import org.asamk.signal.manager.storage.identities.TrustNewIdentity;
import org.asamk.signal.manager.storage.messageCache.CachedMessage;
import org.asamk.signal.manager.storage.recipients.Contact;
import org.asamk.signal.manager.storage.recipients.Profile;
import org.asamk.signal.manager.util.ProfileUtils;
import org.asamk.signal.manager.util.StickerUtils;
import org.asamk.signal.manager.util.Utils;
-import org.signal.libsignal.metadata.InvalidMetadataMessageException;
-import org.signal.libsignal.metadata.InvalidMetadataVersionException;
-import org.signal.libsignal.metadata.ProtocolDuplicateMessageException;
-import org.signal.libsignal.metadata.ProtocolInvalidKeyException;
-import org.signal.libsignal.metadata.ProtocolInvalidKeyIdException;
import org.signal.libsignal.metadata.ProtocolInvalidMessageException;
-import org.signal.libsignal.metadata.ProtocolInvalidVersionException;
-import org.signal.libsignal.metadata.ProtocolLegacyMessageException;
-import org.signal.libsignal.metadata.ProtocolNoSessionException;
import org.signal.libsignal.metadata.ProtocolUntrustedIdentityException;
-import org.signal.libsignal.metadata.SelfSendException;
-import org.signal.libsignal.metadata.certificate.CertificateValidator;
-import org.signal.storageservice.protos.groups.GroupChange;
-import org.signal.storageservice.protos.groups.local.DecryptedGroup;
import org.signal.zkgroup.InvalidInputException;
-import org.signal.zkgroup.VerificationFailedException;
-import org.signal.zkgroup.groups.GroupMasterKey;
-import org.signal.zkgroup.groups.GroupSecretParams;
-import org.signal.zkgroup.profiles.ClientZkProfileOperations;
import org.signal.zkgroup.profiles.ProfileKey;
import org.signal.zkgroup.profiles.ProfileKeyCredential;
import org.slf4j.Logger;
import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.libsignal.InvalidMessageException;
import org.whispersystems.libsignal.ecc.ECPublicKey;
+import org.whispersystems.libsignal.fingerprint.Fingerprint;
+import org.whispersystems.libsignal.fingerprint.FingerprintParsingException;
+import org.whispersystems.libsignal.fingerprint.FingerprintVersionMismatchException;
import org.whispersystems.libsignal.state.PreKeyRecord;
import org.whispersystems.libsignal.state.SignedPreKeyRecord;
import org.whispersystems.libsignal.util.Pair;
import org.whispersystems.libsignal.util.guava.Optional;
-import org.whispersystems.signalservice.api.SignalServiceAccountManager;
-import org.whispersystems.signalservice.api.SignalServiceMessagePipe;
-import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
-import org.whispersystems.signalservice.api.SignalServiceMessageSender;
import org.whispersystems.signalservice.api.SignalSessionLock;
-import org.whispersystems.signalservice.api.crypto.SignalServiceCipher;
import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
-import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
-import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api;
-import org.whispersystems.signalservice.api.groupsv2.GroupsV2AuthorizationString;
-import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
import org.whispersystems.signalservice.api.messages.SendMessageResult;
import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
-import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2;
import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
+import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage;
import org.whispersystems.signalservice.api.messages.multidevice.BlockedListMessage;
import org.whispersystems.signalservice.api.messages.multidevice.ContactsMessage;
import org.whispersystems.signalservice.api.messages.multidevice.DeviceContact;
import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroupsInputStream;
import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroupsOutputStream;
import org.whispersystems.signalservice.api.messages.multidevice.RequestMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage;
import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
import org.whispersystems.signalservice.api.messages.multidevice.StickerPackOperationMessage;
import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage;
import org.whispersystems.signalservice.api.profiles.ProfileAndCredential;
import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
import org.whispersystems.signalservice.api.push.SignalServiceAddress;
-import org.whispersystems.signalservice.api.push.exceptions.ConflictException;
import org.whispersystems.signalservice.api.push.exceptions.MissingConfigurationException;
-import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;
import org.whispersystems.signalservice.api.util.DeviceNameUtil;
import org.whispersystems.signalservice.api.util.InvalidNumberException;
import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
-import org.whispersystems.signalservice.api.util.SleepTimer;
-import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
-import org.whispersystems.signalservice.api.util.UuidUtil;
+import org.whispersystems.signalservice.api.websocket.WebSocketUnavailableException;
import org.whispersystems.signalservice.internal.contacts.crypto.Quote;
import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedQuoteException;
import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
-import org.whispersystems.signalservice.internal.push.UnsupportedDataMessageException;
import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;
import org.whispersystems.signalservice.internal.util.Hex;
import org.whispersystems.signalservice.internal.util.Util;
import java.util.Base64;
import java.util.Collection;
import java.util.Date;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
private final static Logger logger = LoggerFactory.getLogger(Manager.class);
- private final CertificateValidator certificateValidator;
-
private final ServiceEnvironmentConfig serviceEnvironmentConfig;
- private final String userAgent;
+ private final SignalDependencies dependencies;
private SignalAccount account;
- private final SignalServiceAccountManager accountManager;
- private final GroupsV2Api groupsV2Api;
- private final GroupsV2Operations groupsV2Operations;
- private final SignalServiceMessageReceiver messageReceiver;
- private final ClientZkProfileOperations clientZkProfileOperations;
private final ExecutorService executor = Executors.newCachedThreadPool();
- private SignalServiceMessagePipe messagePipe = null;
- private SignalServiceMessagePipe unidentifiedMessagePipe = null;
-
- private final UnidentifiedAccessHelper unidentifiedAccessHelper;
private final ProfileHelper profileHelper;
- private final GroupV2Helper groupV2Helper;
private final PinHelper pinHelper;
+ private final SendHelper sendHelper;
+ private final GroupHelper groupHelper;
+
private final AvatarStore avatarStore;
private final AttachmentStore attachmentStore;
+ private final StickerPackStore stickerPackStore;
private final SignalSessionLock sessionLock = new SignalSessionLock() {
private final ReentrantLock LEGACY_LOCK = new ReentrantLock();
) {
this.account = account;
this.serviceEnvironmentConfig = serviceEnvironmentConfig;
- this.certificateValidator = new CertificateValidator(serviceEnvironmentConfig.getUnidentifiedSenderTrustRoot());
- this.userAgent = userAgent;
- this.groupsV2Operations = capabilities.isGv2() ? new GroupsV2Operations(ClientZkOperations.create(
- serviceEnvironmentConfig.getSignalServiceConfiguration())) : null;
- final SleepTimer timer = new UptimeSleepTimer();
- this.accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.getSignalServiceConfiguration(),
- new DynamicCredentialsProvider(account.getUuid(),
- account.getUsername(),
- account.getPassword(),
- account.getDeviceId()),
- userAgent,
- groupsV2Operations,
- ServiceConfig.AUTOMATIC_NETWORK_RETRY,
- timer);
- this.groupsV2Api = accountManager.getGroupsV2Api();
- final var keyBackupService = accountManager.getKeyBackupService(ServiceConfig.getIasKeyStore(),
- serviceEnvironmentConfig.getKeyBackupConfig().getEnclaveName(),
- serviceEnvironmentConfig.getKeyBackupConfig().getServiceId(),
- serviceEnvironmentConfig.getKeyBackupConfig().getMrenclave(),
- 10);
-
- this.pinHelper = new PinHelper(keyBackupService);
- this.clientZkProfileOperations = capabilities.isGv2()
- ? ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration())
- .getProfileOperations()
- : null;
- this.messageReceiver = new SignalServiceMessageReceiver(serviceEnvironmentConfig.getSignalServiceConfiguration(),
- account.getUuid(),
+
+ final var credentialsProvider = new DynamicCredentialsProvider(account.getUuid(),
account.getUsername(),
account.getPassword(),
- account.getDeviceId(),
+ account.getDeviceId());
+ this.dependencies = new SignalDependencies(account.getSelfAddress(),
+ serviceEnvironmentConfig,
userAgent,
- null,
- timer,
- clientZkProfileOperations,
- ServiceConfig.AUTOMATIC_NETWORK_RETRY);
+ credentialsProvider,
+ account.getSignalProtocolStore(),
+ executor,
+ sessionLock);
+ this.pinHelper = new PinHelper(dependencies.getKeyBackupService());
- this.unidentifiedAccessHelper = new UnidentifiedAccessHelper(account::getProfileKey,
+ final var unidentifiedAccessHelper = new UnidentifiedAccessHelper(account::getProfileKey,
account.getProfileStore()::getProfileKey,
this::getRecipientProfile,
this::getSenderCertificate);
this.profileHelper = new ProfileHelper(account.getProfileStore()::getProfileKey,
unidentifiedAccessHelper::getAccessFor,
- unidentified -> unidentified ? getOrCreateUnidentifiedMessagePipe() : getOrCreateMessagePipe(),
- () -> messageReceiver,
+ dependencies::getProfileService,
+ dependencies::getMessageReceiver,
this::resolveSignalServiceAddress);
- this.groupV2Helper = new GroupV2Helper(this::getRecipientProfileKeyCredential,
+ final GroupV2Helper groupV2Helper = new GroupV2Helper(this::getRecipientProfileKeyCredential,
this::getRecipientProfile,
account::getSelfRecipientId,
- groupsV2Operations,
- groupsV2Api,
- this::getGroupAuthForToday,
+ dependencies.getGroupsV2Operations(),
+ dependencies.getGroupsV2Api(),
this::resolveSignalServiceAddress);
this.avatarStore = new AvatarStore(pathConfig.getAvatarsPath());
this.attachmentStore = new AttachmentStore(pathConfig.getAttachmentsPath());
+ this.stickerPackStore = new StickerPackStore(pathConfig.getStickerPacksPath());
+ this.sendHelper = new SendHelper(account,
+ dependencies,
+ unidentifiedAccessHelper,
+ this::resolveSignalServiceAddress,
+ this::resolveRecipient,
+ this::handleIdentityFailure,
+ this::getGroup,
+ this::refreshRegisteredUser);
+ this.groupHelper = new GroupHelper(account,
+ dependencies,
+ sendHelper,
+ groupV2Helper,
+ avatarStore,
+ this::resolveSignalServiceAddress,
+ this::resolveRecipient);
}
public String getUsername() {
}
public static Manager init(
- String username, File settingsPath, ServiceEnvironment serviceEnvironment, String userAgent
+ String username,
+ File settingsPath,
+ ServiceEnvironment serviceEnvironment,
+ String userAgent,
+ final TrustNewIdentity trustNewIdentity
) throws IOException, NotRegisteredException {
var pathConfig = PathConfig.createDefault(settingsPath);
throw new NotRegisteredException();
}
- var account = SignalAccount.load(pathConfig.getDataPath(), username, true);
+ var account = SignalAccount.load(pathConfig.getDataPath(), username, true, trustNewIdentity);
if (!account.isRegistered()) {
throw new NotRegisteredException();
public void checkAccountState() throws IOException {
if (account.getLastReceiveTimestamp() == 0) {
- logger.warn("The Signal protocol expects that incoming messages are regularly received.");
+ logger.info("The Signal protocol expects that incoming messages are regularly received.");
} else {
var diffInMilliseconds = System.currentTimeMillis() - account.getLastReceiveTimestamp();
long days = TimeUnit.DAYS.convert(diffInMilliseconds, TimeUnit.MILLISECONDS);
days);
}
}
- if (accountManager.getPreKeysCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
+ if (dependencies.getAccountManager().getPreKeysCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
refreshPreKeys();
}
if (account.getUuid() == null) {
- account.setUuid(accountManager.getOwnUuid());
+ account.setUuid(dependencies.getAccountManager().getOwnUuid());
}
updateAccountAttributes();
}
* This is used for checking a set of phone numbers for registration on Signal
*
* @param numbers The set of phone number in question
- * @return A map of numbers to booleans. True if registered, false otherwise. Should never be null
+ * @return A map of numbers to canonicalized number and uuid. If a number is not registered the uuid is null.
* @throws IOException if its unable to get the contacts to check if they're registered
*/
- public Map<String, Boolean> areUsersRegistered(Set<String> numbers) throws IOException {
- // Note "contactDetails" has no optionals. It only gives us info on users who are registered
- var contactDetails = getRegisteredUsers(numbers);
+ public Map<String, Pair<String, UUID>> areUsersRegistered(Set<String> numbers) throws IOException {
+ Map<String, String> canonicalizedNumbers = numbers.stream().collect(Collectors.toMap(n -> n, n -> {
+ try {
+ return canonicalizePhoneNumber(n);
+ } catch (InvalidNumberException e) {
+ return "";
+ }
+ }));
- var registeredUsers = contactDetails.keySet();
+ // Note "contactDetails" has no optionals. It only gives us info on users who are registered
+ var contactDetails = getRegisteredUsers(canonicalizedNumbers.values()
+ .stream()
+ .filter(s -> !s.isEmpty())
+ .collect(Collectors.toSet()));
- return numbers.stream().collect(Collectors.toMap(x -> x, registeredUsers::contains));
+ return numbers.stream().collect(Collectors.toMap(n -> n, n -> {
+ final var number = canonicalizedNumbers.get(n);
+ final var uuid = contactDetails.get(number);
+ return new Pair<>(number.isEmpty() ? null : number, uuid);
+ }));
}
public void updateAccountAttributes() throws IOException {
- accountManager.setAccountAttributes(account.getEncryptedDeviceName(),
- null,
- account.getLocalRegistrationId(),
- true,
- // set legacy pin only if no KBS master key is set
- account.getPinMasterKey() == null ? account.getRegistrationLockPin() : null,
- account.getPinMasterKey() == null ? null : account.getPinMasterKey().deriveRegistrationLock(),
- account.getSelfUnidentifiedAccessKey(),
- account.isUnrestrictedUnidentifiedAccess(),
- capabilities,
- account.isDiscoverableByPhoneNumber());
+ dependencies.getAccountManager()
+ .setAccountAttributes(account.getEncryptedDeviceName(),
+ null,
+ account.getLocalRegistrationId(),
+ true,
+ // set legacy pin only if no KBS master key is set
+ account.getPinMasterKey() == null ? account.getRegistrationLockPin() : null,
+ account.getPinMasterKey() == null ? null : account.getPinMasterKey().deriveRegistrationLock(),
+ account.getSelfUnidentifiedAccessKey(),
+ account.isUnrestrictedUnidentifiedAccess(),
+ capabilities,
+ account.isDiscoverableByPhoneNumber());
}
/**
try (final var streamDetails = avatar == null
? avatarStore.retrieveProfileAvatar(getSelfAddress())
: avatar.isPresent() ? Utils.createStreamDetailsFromFile(avatar.get()) : null) {
- accountManager.setVersionedProfile(account.getUuid(),
- account.getProfileKey(),
- newProfile.getInternalServiceName(),
- newProfile.getAbout() == null ? "" : newProfile.getAbout(),
- newProfile.getAboutEmoji() == null ? "" : newProfile.getAboutEmoji(),
- Optional.absent(),
- streamDetails);
+ dependencies.getAccountManager()
+ .setVersionedProfile(account.getUuid(),
+ account.getProfileKey(),
+ newProfile.getInternalServiceName(),
+ newProfile.getAbout() == null ? "" : newProfile.getAbout(),
+ newProfile.getAboutEmoji() == null ? "" : newProfile.getAboutEmoji(),
+ Optional.absent(),
+ streamDetails);
}
if (avatar != null) {
}
account.getProfileStore().storeProfile(account.getSelfRecipientId(), newProfile);
- try {
- sendSyncMessage(SignalServiceSyncMessage.forFetchLatest(SignalServiceSyncMessage.FetchType.LOCAL_PROFILE));
- } catch (UntrustedIdentityException ignored) {
- }
+ sendHelper.sendSyncMessage(SignalServiceSyncMessage.forFetchLatest(SignalServiceSyncMessage.FetchType.LOCAL_PROFILE));
}
public void unregister() throws IOException {
// When setting an empty GCM id, the Signal-Server also sets the fetchesMessages property to false.
// If this is the master device, other users can't send messages to this number anymore.
// If this is a linked device, other users can still send messages, but this device doesn't receive them anymore.
- accountManager.setGcmId(Optional.absent());
+ dependencies.getAccountManager().setGcmId(Optional.absent());
account.setRegistered(false);
}
public void deleteAccount() throws IOException {
- accountManager.deleteAccount();
+ dependencies.getAccountManager().deleteAccount();
account.setRegistered(false);
}
public List<Device> getLinkedDevices() throws IOException {
- var devices = accountManager.getDevices();
+ var devices = dependencies.getAccountManager().getDevices();
account.setMultiDevice(devices.size() > 1);
var identityKey = account.getIdentityKeyPair().getPrivateKey();
return devices.stream().map(d -> {
}
public void removeLinkedDevices(int deviceId) throws IOException {
- accountManager.removeDevice(deviceId);
- var devices = accountManager.getDevices();
+ dependencies.getAccountManager().removeDevice(deviceId);
+ var devices = dependencies.getAccountManager().getDevices();
account.setMultiDevice(devices.size() > 1);
}
private void addDevice(String deviceIdentifier, ECPublicKey deviceKey) throws IOException, InvalidKeyException {
var identityKeyPair = getIdentityKeyPair();
- var verificationCode = accountManager.getNewDeviceVerificationCode();
-
- accountManager.addDevice(deviceIdentifier,
- deviceKey,
- identityKeyPair,
- Optional.of(account.getProfileKey().serialize()),
- verificationCode);
+ var verificationCode = dependencies.getAccountManager().getNewDeviceVerificationCode();
+
+ dependencies.getAccountManager()
+ .addDevice(deviceIdentifier,
+ deviceKey,
+ identityKeyPair,
+ Optional.of(account.getProfileKey().serialize()),
+ verificationCode);
account.setMultiDevice(true);
}
account.setRegistrationLockPin(pin.get(), masterKey);
} else {
- // Remove legacy registration lock
- accountManager.removeRegistrationLockV1();
-
// Remove KBS Pin
pinHelper.removeRegistrationLockPin();
final var identityKeyPair = getIdentityKeyPair();
var signedPreKeyRecord = generateSignedPreKey(identityKeyPair);
- accountManager.setPreKeys(identityKeyPair.getPublicKey(), signedPreKeyRecord, oneTimePreKeys);
+ dependencies.getAccountManager().setPreKeys(identityKeyPair.getPublicKey(), signedPreKeyRecord, oneTimePreKeys);
}
private List<PreKeyRecord> generatePreKeys() {
return record;
}
- private SignalServiceMessagePipe getOrCreateMessagePipe() {
- if (messagePipe == null) {
- messagePipe = messageReceiver.createMessagePipe();
- }
- return messagePipe;
- }
-
- private SignalServiceMessagePipe getOrCreateUnidentifiedMessagePipe() {
- if (unidentifiedMessagePipe == null) {
- unidentifiedMessagePipe = messageReceiver.createUnidentifiedMessagePipe();
- }
- return unidentifiedMessagePipe;
- }
-
- private SignalServiceMessageSender createMessageSender() {
- return new SignalServiceMessageSender(serviceEnvironmentConfig.getSignalServiceConfiguration(),
- account.getUuid(),
- account.getUsername(),
- account.getPassword(),
- account.getDeviceId(),
- account.getSignalProtocolStore(),
- sessionLock,
- userAgent,
- account.isMultiDevice(),
- Optional.fromNullable(messagePipe),
- Optional.fromNullable(unidentifiedMessagePipe),
- Optional.absent(),
- clientZkProfileOperations,
- executor,
- ServiceConfig.MAX_ENVELOPE_SIZE,
- ServiceConfig.AUTOMATIC_NETWORK_RETRY);
- }
-
public Profile getRecipientProfile(
RecipientId recipientId
) {
return null;
}
+ profile = decryptProfileIfKeyKnown(recipientId, encryptedProfile);
+ account.getProfileStore().storeProfile(recipientId, profile);
+
+ return profile;
+ }
+
+ private Profile decryptProfileIfKeyKnown(
+ final RecipientId recipientId, final SignalServiceProfile encryptedProfile
+ ) {
var profileKey = account.getProfileStore().getProfileKey(recipientId);
if (profileKey == null) {
- profile = new Profile(System.currentTimeMillis(),
+ return new Profile(System.currentTimeMillis(),
null,
null,
null,
null,
ProfileUtils.getUnidentifiedAccessMode(encryptedProfile, null),
ProfileUtils.getCapabilities(encryptedProfile));
- } else {
- profile = decryptProfileAndDownloadAvatar(recipientId, profileKey, encryptedProfile);
}
- account.getProfileStore().storeProfile(recipientId, profile);
- return profile;
+ return decryptProfileAndDownloadAvatar(recipientId, profileKey, encryptedProfile);
}
private SignalServiceProfile retrieveEncryptedProfile(RecipientId recipientId) {
return ProfileUtils.decryptProfile(profileKey, encryptedProfile);
}
- private Optional<SignalServiceAttachmentStream> createGroupAvatarAttachment(GroupId groupId) throws IOException {
- final var streamDetails = avatarStore.retrieveGroupAvatar(groupId);
- if (streamDetails == null) {
- return Optional.absent();
- }
-
- return Optional.of(AttachmentUtils.createAttachment(streamDetails, Optional.absent()));
- }
-
private Optional<SignalServiceAttachmentStream> createContactAvatarAttachment(SignalServiceAddress address) throws IOException {
final var streamDetails = avatarStore.retrieveContactAvatar(address);
if (streamDetails == null) {
return Optional.of(AttachmentUtils.createAttachment(streamDetails, Optional.absent()));
}
- private GroupInfo getGroupForSending(GroupId groupId) throws GroupNotFoundException, NotAGroupMemberException {
- var g = getGroup(groupId);
- if (g == null) {
- throw new GroupNotFoundException(groupId);
- }
- if (!g.isMember(account.getSelfRecipientId())) {
- throw new NotAGroupMemberException(groupId, g.getTitle());
- }
- return g;
- }
-
- private GroupInfo getGroupForUpdating(GroupId groupId) throws GroupNotFoundException, NotAGroupMemberException {
- var g = getGroup(groupId);
- if (g == null) {
- throw new GroupNotFoundException(groupId);
- }
- if (!g.isMember(account.getSelfRecipientId()) && !g.isPendingMember(account.getSelfRecipientId())) {
- throw new NotAGroupMemberException(groupId, g.getTitle());
- }
- return g;
- }
-
public List<GroupInfo> getGroups() {
return account.getGroupStore().getGroups();
}
- public Pair<Long, List<SendMessageResult>> sendGroupMessage(
- String messageText, List<String> attachments, GroupId groupId
- ) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException {
- final var messageBuilder = SignalServiceDataMessage.newBuilder().withBody(messageText);
- if (attachments != null) {
- messageBuilder.withAttachments(AttachmentUtils.getSignalServiceAttachments(attachments));
- }
-
- return sendGroupMessage(messageBuilder, groupId);
- }
-
- public Pair<Long, List<SendMessageResult>> sendGroupMessageReaction(
- String emoji, boolean remove, String targetAuthor, long targetSentTimestamp, GroupId groupId
- ) throws IOException, InvalidNumberException, NotAGroupMemberException, GroupNotFoundException {
- var targetAuthorRecipientId = canonicalizeAndResolveRecipient(targetAuthor);
- var reaction = new SignalServiceDataMessage.Reaction(emoji,
- remove,
- resolveSignalServiceAddress(targetAuthorRecipientId),
- targetSentTimestamp);
- final var messageBuilder = SignalServiceDataMessage.newBuilder().withReaction(reaction);
-
- return sendGroupMessage(messageBuilder, groupId);
+ public SendGroupMessageResults sendQuitGroupMessage(
+ GroupId groupId, Set<RecipientIdentifier.Single> groupAdmins
+ ) throws GroupNotFoundException, IOException, NotAGroupMemberException, LastGroupAdminException {
+ final var newAdmins = getRecipientIds(groupAdmins);
+ return groupHelper.quitGroup(groupId, newAdmins);
}
- public Pair<Long, List<SendMessageResult>> sendGroupMessage(
- SignalServiceDataMessage.Builder messageBuilder, GroupId groupId
- ) throws IOException, GroupNotFoundException, NotAGroupMemberException {
- final var g = getGroupForSending(groupId);
-
- GroupUtils.setGroupContext(messageBuilder, g);
- messageBuilder.withExpiration(g.getMessageExpirationTime());
-
- return sendMessage(messageBuilder, g.getMembersWithout(account.getSelfRecipientId()));
+ public void deleteGroup(GroupId groupId) throws IOException {
+ account.getGroupStore().deleteGroup(groupId);
+ avatarStore.deleteGroupAvatar(groupId);
}
- public Pair<Long, List<SendMessageResult>> sendQuitGroupMessage(
- GroupId groupId, Set<String> groupAdmins
- ) throws GroupNotFoundException, IOException, NotAGroupMemberException, InvalidNumberException, LastGroupAdminException {
- SignalServiceDataMessage.Builder messageBuilder;
-
- final var g = getGroupForUpdating(groupId);
- if (g instanceof GroupInfoV1) {
- var groupInfoV1 = (GroupInfoV1) g;
- var group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.QUIT).withId(groupId.serialize()).build();
- messageBuilder = SignalServiceDataMessage.newBuilder().asGroupMessage(group);
- groupInfoV1.removeMember(account.getSelfRecipientId());
- account.getGroupStore().updateGroup(groupInfoV1);
- } else {
- final var groupInfoV2 = (GroupInfoV2) g;
- final var currentAdmins = g.getAdminMembers();
- final var newAdmins = getSignalServiceAddresses(groupAdmins);
- newAdmins.removeAll(currentAdmins);
- newAdmins.retainAll(g.getMembers());
- if (currentAdmins.contains(getSelfRecipientId())
- && currentAdmins.size() == 1
- && g.getMembers().size() > 1
- && newAdmins.size() == 0) {
- // Last admin can't leave the group, unless she's also the last member
- throw new LastGroupAdminException(g.getGroupId(), g.getTitle());
- }
- final var groupGroupChangePair = groupV2Helper.leaveGroup(groupInfoV2, newAdmins);
- groupInfoV2.setGroup(groupGroupChangePair.first(), this::resolveRecipient);
- messageBuilder = getGroupUpdateMessageBuilder(groupInfoV2, groupGroupChangePair.second().toByteArray());
- account.getGroupStore().updateGroup(groupInfoV2);
- }
-
- return sendMessage(messageBuilder, g.getMembersWithout(account.getSelfRecipientId()));
- }
-
- public Pair<GroupId, List<SendMessageResult>> createGroup(
- String name, List<String> members, File avatarFile
- ) throws IOException, AttachmentInvalidException, InvalidNumberException {
- return createGroup(name, members == null ? null : getSignalServiceAddresses(members), avatarFile);
- }
-
- private Pair<GroupId, List<SendMessageResult>> createGroup(
- String name, Set<RecipientId> members, File avatarFile
+ public Pair<GroupId, SendGroupMessageResults> createGroup(
+ String name, Set<RecipientIdentifier.Single> members, File avatarFile
) throws IOException, AttachmentInvalidException {
- final var selfRecipientId = account.getSelfRecipientId();
- if (members != null && members.contains(selfRecipientId)) {
- members = new HashSet<>(members);
- members.remove(selfRecipientId);
- }
-
- var gv2Pair = groupV2Helper.createGroup(name == null ? "" : name,
- members == null ? Set.of() : members,
- avatarFile);
-
- SignalServiceDataMessage.Builder messageBuilder;
- if (gv2Pair == null) {
- // Failed to create v2 group, creating v1 group instead
- var gv1 = new GroupInfoV1(GroupIdV1.createRandom());
- gv1.addMembers(List.of(selfRecipientId));
- final var result = updateGroupV1(gv1, name, members, avatarFile);
- return new Pair<>(gv1.getGroupId(), result.second());
- }
-
- final var gv2 = gv2Pair.first();
- final var decryptedGroup = gv2Pair.second();
-
- gv2.setGroup(decryptedGroup, this::resolveRecipient);
- if (avatarFile != null) {
- avatarStore.storeGroupAvatar(gv2.getGroupId(),
- outputStream -> IOUtils.copyFileToStream(avatarFile, outputStream));
- }
- messageBuilder = getGroupUpdateMessageBuilder(gv2, null);
- account.getGroupStore().updateGroup(gv2);
-
- final var result = sendMessage(messageBuilder, gv2.getMembersIncludingPendingWithout(selfRecipientId));
- return new Pair<>(gv2.getGroupId(), result.second());
+ return groupHelper.createGroup(name, members == null ? null : getRecipientIds(members), avatarFile);
}
- public Pair<Long, List<SendMessageResult>> updateGroup(
+ public SendGroupMessageResults updateGroup(
GroupId groupId,
String name,
String description,
- List<String> members,
- List<String> removeMembers,
- List<String> admins,
- List<String> removeAdmins,
+ Set<RecipientIdentifier.Single> members,
+ Set<RecipientIdentifier.Single> removeMembers,
+ Set<RecipientIdentifier.Single> admins,
+ Set<RecipientIdentifier.Single> removeAdmins,
boolean resetGroupLink,
GroupLinkState groupLinkState,
GroupPermission addMemberPermission,
GroupPermission editDetailsPermission,
File avatarFile,
- Integer expirationTimer
- ) throws IOException, GroupNotFoundException, AttachmentInvalidException, InvalidNumberException, NotAGroupMemberException {
- return updateGroup(groupId,
+ Integer expirationTimer,
+ Boolean isAnnouncementGroup
+ ) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException, GroupSendingNotAllowedException {
+ return groupHelper.updateGroup(groupId,
name,
description,
- members == null ? null : getSignalServiceAddresses(members),
- removeMembers == null ? null : getSignalServiceAddresses(removeMembers),
- admins == null ? null : getSignalServiceAddresses(admins),
- removeAdmins == null ? null : getSignalServiceAddresses(removeAdmins),
+ members == null ? null : getRecipientIds(members),
+ removeMembers == null ? null : getRecipientIds(removeMembers),
+ admins == null ? null : getRecipientIds(admins),
+ removeAdmins == null ? null : getRecipientIds(removeAdmins),
resetGroupLink,
groupLinkState,
addMemberPermission,
editDetailsPermission,
avatarFile,
- expirationTimer);
- }
-
- private Pair<Long, List<SendMessageResult>> updateGroup(
- final GroupId groupId,
- final String name,
- final String description,
- final Set<RecipientId> members,
- final Set<RecipientId> removeMembers,
- final Set<RecipientId> admins,
- final Set<RecipientId> removeAdmins,
- final boolean resetGroupLink,
- final GroupLinkState groupLinkState,
- final GroupPermission addMemberPermission,
- final GroupPermission editDetailsPermission,
- final File avatarFile,
- final Integer expirationTimer
- ) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException {
- var group = getGroupForUpdating(groupId);
-
- if (group instanceof GroupInfoV2) {
- try {
- return updateGroupV2((GroupInfoV2) group,
- name,
- description,
- members,
- removeMembers,
- admins,
- removeAdmins,
- resetGroupLink,
- groupLinkState,
- addMemberPermission,
- editDetailsPermission,
- avatarFile,
- expirationTimer);
- } catch (ConflictException e) {
- // Detected conflicting update, refreshing group and trying again
- group = getGroup(groupId, true);
- return updateGroupV2((GroupInfoV2) group,
- name,
- description,
- members,
- removeMembers,
- admins,
- removeAdmins,
- resetGroupLink,
- groupLinkState,
- addMemberPermission,
- editDetailsPermission,
- avatarFile,
- expirationTimer);
- }
- }
-
- final var gv1 = (GroupInfoV1) group;
- final var result = updateGroupV1(gv1, name, members, avatarFile);
- if (expirationTimer != null) {
- setExpirationTimer(gv1, expirationTimer);
- }
- return result;
- }
-
- private Pair<Long, List<SendMessageResult>> updateGroupV1(
- final GroupInfoV1 gv1, final String name, final Set<RecipientId> members, final File avatarFile
- ) throws IOException, AttachmentInvalidException {
- updateGroupV1Details(gv1, name, members, avatarFile);
- var messageBuilder = getGroupUpdateMessageBuilder(gv1);
-
- account.getGroupStore().updateGroup(gv1);
-
- return sendMessage(messageBuilder, gv1.getMembersIncludingPendingWithout(account.getSelfRecipientId()));
+ expirationTimer,
+ isAnnouncementGroup);
}
- private void updateGroupV1Details(
- final GroupInfoV1 g, final String name, final Collection<RecipientId> members, final File avatarFile
- ) throws IOException {
- if (name != null) {
- g.name = name;
- }
-
- if (members != null) {
- final var newMemberAddresses = members.stream()
- .filter(member -> !g.isMember(member))
- .map(this::resolveSignalServiceAddress)
- .collect(Collectors.toList());
- final var newE164Members = new HashSet<String>();
- for (var member : newMemberAddresses) {
- if (!member.getNumber().isPresent()) {
- continue;
- }
- newE164Members.add(member.getNumber().get());
- }
-
- final var registeredUsers = getRegisteredUsers(newE164Members);
- if (registeredUsers.size() != newE164Members.size()) {
- // Some of the new members are not registered on Signal
- newE164Members.removeAll(registeredUsers.keySet());
- throw new IOException("Failed to add members "
- + String.join(", ", newE164Members)
- + " to group: Not registered on Signal");
- }
-
- g.addMembers(members);
- }
-
- if (avatarFile != null) {
- avatarStore.storeGroupAvatar(g.getGroupId(),
- outputStream -> IOUtils.copyFileToStream(avatarFile, outputStream));
- }
- }
-
- private Pair<Long, List<SendMessageResult>> updateGroupV2(
- final GroupInfoV2 group,
- final String name,
- final String description,
- final Set<RecipientId> members,
- final Set<RecipientId> removeMembers,
- final Set<RecipientId> admins,
- final Set<RecipientId> removeAdmins,
- final boolean resetGroupLink,
- final GroupLinkState groupLinkState,
- final GroupPermission addMemberPermission,
- final GroupPermission editDetailsPermission,
- final File avatarFile,
- Integer expirationTimer
- ) throws IOException {
- Pair<Long, List<SendMessageResult>> result = null;
- if (group.isPendingMember(account.getSelfRecipientId())) {
- var groupGroupChangePair = groupV2Helper.acceptInvite(group);
- result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
- }
-
- if (members != null) {
- final var newMembers = new HashSet<>(members);
- newMembers.removeAll(group.getMembers());
- if (newMembers.size() > 0) {
- var groupGroupChangePair = groupV2Helper.addMembers(group, newMembers);
- result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
- }
- }
-
- if (removeMembers != null) {
- var existingRemoveMembers = new HashSet<>(removeMembers);
- existingRemoveMembers.retainAll(group.getMembers());
- existingRemoveMembers.remove(getSelfRecipientId());// self can be removed with sendQuitGroupMessage
- if (existingRemoveMembers.size() > 0) {
- var groupGroupChangePair = groupV2Helper.removeMembers(group, existingRemoveMembers);
- result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
- }
-
- var pendingRemoveMembers = new HashSet<>(removeMembers);
- pendingRemoveMembers.retainAll(group.getPendingMembers());
- if (pendingRemoveMembers.size() > 0) {
- var groupGroupChangePair = groupV2Helper.revokeInvitedMembers(group, pendingRemoveMembers);
- result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
- }
- }
-
- if (admins != null) {
- final var newAdmins = new HashSet<>(admins);
- newAdmins.retainAll(group.getMembers());
- newAdmins.removeAll(group.getAdminMembers());
- if (newAdmins.size() > 0) {
- for (var admin : newAdmins) {
- var groupGroupChangePair = groupV2Helper.setMemberAdmin(group, admin, true);
- result = sendUpdateGroupV2Message(group,
- groupGroupChangePair.first(),
- groupGroupChangePair.second());
- }
- }
- }
-
- if (removeAdmins != null) {
- final var existingRemoveAdmins = new HashSet<>(removeAdmins);
- existingRemoveAdmins.retainAll(group.getAdminMembers());
- if (existingRemoveAdmins.size() > 0) {
- for (var admin : existingRemoveAdmins) {
- var groupGroupChangePair = groupV2Helper.setMemberAdmin(group, admin, false);
- result = sendUpdateGroupV2Message(group,
- groupGroupChangePair.first(),
- groupGroupChangePair.second());
- }
- }
- }
-
- if (resetGroupLink) {
- var groupGroupChangePair = groupV2Helper.resetGroupLinkPassword(group);
- result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
- }
-
- if (groupLinkState != null) {
- var groupGroupChangePair = groupV2Helper.setGroupLinkState(group, groupLinkState);
- result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
- }
-
- if (addMemberPermission != null) {
- var groupGroupChangePair = groupV2Helper.setAddMemberPermission(group, addMemberPermission);
- result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
- }
-
- if (editDetailsPermission != null) {
- var groupGroupChangePair = groupV2Helper.setEditDetailsPermission(group, editDetailsPermission);
- result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
- }
-
- if (expirationTimer != null) {
- var groupGroupChangePair = groupV2Helper.setMessageExpirationTimer(group, expirationTimer);
- result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
- }
-
- if (name != null || description != null || avatarFile != null) {
- var groupGroupChangePair = groupV2Helper.updateGroup(group, name, description, avatarFile);
- if (avatarFile != null) {
- avatarStore.storeGroupAvatar(group.getGroupId(),
- outputStream -> IOUtils.copyFileToStream(avatarFile, outputStream));
- }
- result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
- }
-
- return result;
- }
-
- public Pair<GroupId, List<SendMessageResult>> joinGroup(
+ public Pair<GroupId, SendGroupMessageResults> joinGroup(
GroupInviteLinkUrl inviteLinkUrl
) throws IOException, GroupLinkNotActiveException {
- final var groupJoinInfo = groupV2Helper.getDecryptedGroupJoinInfo(inviteLinkUrl.getGroupMasterKey(),
- inviteLinkUrl.getPassword());
- final var groupChange = groupV2Helper.joinGroup(inviteLinkUrl.getGroupMasterKey(),
- inviteLinkUrl.getPassword(),
- groupJoinInfo);
- final var group = getOrMigrateGroup(inviteLinkUrl.getGroupMasterKey(),
- groupJoinInfo.getRevision() + 1,
- groupChange.toByteArray());
-
- if (group.getGroup() == null) {
- // Only requested member, can't send update to group members
- return new Pair<>(group.getGroupId(), List.of());
- }
-
- final var result = sendUpdateGroupV2Message(group, group.getGroup(), groupChange);
-
- return new Pair<>(group.getGroupId(), result.second());
- }
-
- private Pair<Long, List<SendMessageResult>> sendUpdateGroupV2Message(
- GroupInfoV2 group, DecryptedGroup newDecryptedGroup, GroupChange groupChange
- ) throws IOException {
- final var selfRecipientId = account.getSelfRecipientId();
- final var members = group.getMembersIncludingPendingWithout(selfRecipientId);
- group.setGroup(newDecryptedGroup, this::resolveRecipient);
- members.addAll(group.getMembersIncludingPendingWithout(selfRecipientId));
-
- final var messageBuilder = getGroupUpdateMessageBuilder(group, groupChange.toByteArray());
- account.getGroupStore().updateGroup(group);
- return sendMessage(messageBuilder, members);
+ return groupHelper.joinGroup(inviteLinkUrl);
}
- private static int currentTimeDays() {
- return (int) TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis());
- }
-
- private GroupsV2AuthorizationString getGroupAuthForToday(
- final GroupSecretParams groupSecretParams
- ) throws IOException {
- final var today = currentTimeDays();
- // Returns credentials for the next 7 days
- final var credentials = groupsV2Api.getCredentials(today);
- // TODO cache credentials until they expire
- var authCredentialResponse = credentials.get(today);
- try {
- return groupsV2Api.getGroupsV2AuthorizationString(account.getUuid(),
- today,
- groupSecretParams,
- authCredentialResponse);
- } catch (VerificationFailedException e) {
- throw new IOException(e);
+ public SendMessageResults sendMessage(
+ SignalServiceDataMessage.Builder messageBuilder, Set<RecipientIdentifier> recipients
+ ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
+ var results = new HashMap<RecipientIdentifier, List<SendMessageResult>>();
+ long timestamp = System.currentTimeMillis();
+ messageBuilder.withTimestamp(timestamp);
+ for (final var recipient : recipients) {
+ if (recipient instanceof RecipientIdentifier.Single) {
+ final var recipientId = resolveRecipient((RecipientIdentifier.Single) recipient);
+ final var result = sendHelper.sendMessage(messageBuilder, recipientId);
+ results.put(recipient, List.of(result));
+ } else if (recipient instanceof RecipientIdentifier.NoteToSelf) {
+ final var result = sendHelper.sendSelfMessage(messageBuilder);
+ results.put(recipient, List.of(result));
+ } else if (recipient instanceof RecipientIdentifier.Group) {
+ final var groupId = ((RecipientIdentifier.Group) recipient).groupId;
+ final var result = sendHelper.sendAsGroupMessage(messageBuilder, groupId);
+ results.put(recipient, result);
+ }
+ }
+ return new SendMessageResults(timestamp, results);
+ }
+
+ public void sendTypingMessage(
+ SignalServiceTypingMessage.Action action, Set<RecipientIdentifier> recipients
+ ) throws IOException, UntrustedIdentityException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
+ final var timestamp = System.currentTimeMillis();
+ for (var recipient : recipients) {
+ if (recipient instanceof RecipientIdentifier.Single) {
+ final var message = new SignalServiceTypingMessage(action, timestamp, Optional.absent());
+ final var recipientId = resolveRecipient((RecipientIdentifier.Single) recipient);
+ sendHelper.sendTypingMessage(message, recipientId);
+ } else if (recipient instanceof RecipientIdentifier.Group) {
+ final var groupId = ((RecipientIdentifier.Group) recipient).groupId;
+ final var message = new SignalServiceTypingMessage(action, timestamp, Optional.of(groupId.serialize()));
+ sendHelper.sendGroupTypingMessage(message, groupId);
+ }
}
}
- Pair<Long, List<SendMessageResult>> sendGroupInfoMessage(
+ SendGroupMessageResults sendGroupInfoMessage(
GroupIdV1 groupId, SignalServiceAddress recipient
) throws IOException, NotAGroupMemberException, GroupNotFoundException, AttachmentInvalidException {
- GroupInfoV1 g;
- var group = getGroupForSending(groupId);
- if (!(group instanceof GroupInfoV1)) {
- throw new RuntimeException("Received an invalid group request for a v2 group!");
- }
- g = (GroupInfoV1) group;
-
final var recipientId = resolveRecipient(recipient);
- if (!g.isMember(recipientId)) {
- throw new NotAGroupMemberException(groupId, g.name);
- }
-
- var messageBuilder = getGroupUpdateMessageBuilder(g);
-
- // Send group message only to the recipient who requested it
- return sendMessage(messageBuilder, Set.of(recipientId));
+ return groupHelper.sendGroupInfoMessage(groupId, recipientId);
}
- private SignalServiceDataMessage.Builder getGroupUpdateMessageBuilder(GroupInfoV1 g) throws AttachmentInvalidException {
- var group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.UPDATE)
- .withId(g.getGroupId().serialize())
- .withName(g.name)
- .withMembers(g.getMembers()
- .stream()
- .map(this::resolveSignalServiceAddress)
- .collect(Collectors.toList()));
-
- try {
- final var attachment = createGroupAvatarAttachment(g.getGroupId());
- if (attachment.isPresent()) {
- group.withAvatar(attachment.get());
- }
- } catch (IOException e) {
- throw new AttachmentInvalidException(g.getGroupId().toBase64(), e);
- }
-
- return SignalServiceDataMessage.newBuilder()
- .asGroupMessage(group.build())
- .withExpiration(g.getMessageExpirationTime());
+ SendGroupMessageResults sendGroupInfoRequest(
+ GroupIdV1 groupId, SignalServiceAddress recipient
+ ) throws IOException {
+ final var recipientId = resolveRecipient(recipient);
+ return groupHelper.sendGroupInfoRequest(groupId, recipientId);
}
- private SignalServiceDataMessage.Builder getGroupUpdateMessageBuilder(GroupInfoV2 g, byte[] signedGroupChange) {
- var group = SignalServiceGroupV2.newBuilder(g.getMasterKey())
- .withRevision(g.getGroup().getRevision())
- .withSignedGroupChange(signedGroupChange);
- return SignalServiceDataMessage.newBuilder()
- .asGroupMessage(group.build())
- .withExpiration(g.getMessageExpirationTime());
- }
+ public void sendReadReceipt(
+ RecipientIdentifier.Single sender, List<Long> messageIds
+ ) throws IOException, UntrustedIdentityException {
+ var receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.READ,
+ messageIds,
+ System.currentTimeMillis());
- Pair<Long, List<SendMessageResult>> sendGroupInfoRequest(
- GroupIdV1 groupId, SignalServiceAddress recipient
- ) throws IOException {
- var group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.REQUEST_INFO).withId(groupId.serialize());
+ sendHelper.sendReceiptMessage(receiptMessage, resolveRecipient(sender));
+ }
- var messageBuilder = SignalServiceDataMessage.newBuilder().asGroupMessage(group.build());
+ public void sendViewedReceipt(
+ RecipientIdentifier.Single sender, List<Long> messageIds
+ ) throws IOException, UntrustedIdentityException {
+ var receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.VIEWED,
+ messageIds,
+ System.currentTimeMillis());
- // Send group info request message to the recipient who sent us a message with this groupId
- return sendMessage(messageBuilder, Set.of(resolveRecipient(recipient)));
+ sendHelper.sendReceiptMessage(receiptMessage, resolveRecipient(sender));
}
- void sendReceipt(
- SignalServiceAddress remoteAddress, long messageId
+ void sendDeliveryReceipt(
+ SignalServiceAddress remoteAddress, List<Long> messageIds
) throws IOException, UntrustedIdentityException {
var receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.DELIVERY,
- List.of(messageId),
+ messageIds,
System.currentTimeMillis());
- createMessageSender().sendReceipt(remoteAddress,
- unidentifiedAccessHelper.getAccessFor(resolveRecipient(remoteAddress)),
- receiptMessage);
+ sendHelper.sendReceiptMessage(receiptMessage, resolveRecipient(remoteAddress));
}
- public Pair<Long, List<SendMessageResult>> sendMessage(
- String messageText, List<String> attachments, List<String> recipients
- ) throws IOException, AttachmentInvalidException, InvalidNumberException {
- final var messageBuilder = SignalServiceDataMessage.newBuilder().withBody(messageText);
- if (attachments != null) {
- var attachmentStreams = AttachmentUtils.getSignalServiceAttachments(attachments);
+ public SendMessageResults sendMessage(
+ Message message, Set<RecipientIdentifier> recipients
+ ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
+ final var messageBuilder = SignalServiceDataMessage.newBuilder();
+ applyMessage(messageBuilder, message);
+ return sendMessage(messageBuilder, recipients);
+ }
+
+ private void applyMessage(
+ final SignalServiceDataMessage.Builder messageBuilder, final Message message
+ ) throws AttachmentInvalidException, IOException {
+ messageBuilder.withBody(message.getMessageText());
+ if (message.getAttachments() != null) {
+ var attachmentStreams = AttachmentUtils.getSignalServiceAttachments(message.getAttachments());
// Upload attachments here, so we only upload once even for multiple recipients
- var messageSender = createMessageSender();
+ var messageSender = dependencies.getMessageSender();
var attachmentPointers = new ArrayList<SignalServiceAttachment>(attachmentStreams.size());
for (var attachment : attachmentStreams) {
if (attachment.isStream()) {
messageBuilder.withAttachments(attachmentPointers);
}
- return sendMessage(messageBuilder, getSignalServiceAddresses(recipients));
- }
-
- public Pair<Long, SendMessageResult> sendSelfMessage(
- String messageText, List<String> attachments
- ) throws IOException, AttachmentInvalidException {
- final var messageBuilder = SignalServiceDataMessage.newBuilder().withBody(messageText);
- if (attachments != null) {
- messageBuilder.withAttachments(AttachmentUtils.getSignalServiceAttachments(attachments));
- }
- return sendSelfMessage(messageBuilder);
- }
-
- public Pair<Long, List<SendMessageResult>> sendRemoteDeleteMessage(
- long targetSentTimestamp, List<String> recipients
- ) throws IOException, InvalidNumberException {
- var delete = new SignalServiceDataMessage.RemoteDelete(targetSentTimestamp);
- final var messageBuilder = SignalServiceDataMessage.newBuilder().withRemoteDelete(delete);
- return sendMessage(messageBuilder, getSignalServiceAddresses(recipients));
}
- public Pair<Long, List<SendMessageResult>> sendGroupRemoteDeleteMessage(
- long targetSentTimestamp, GroupId groupId
- ) throws IOException, NotAGroupMemberException, GroupNotFoundException {
+ public SendMessageResults sendRemoteDeleteMessage(
+ long targetSentTimestamp, Set<RecipientIdentifier> recipients
+ ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
var delete = new SignalServiceDataMessage.RemoteDelete(targetSentTimestamp);
final var messageBuilder = SignalServiceDataMessage.newBuilder().withRemoteDelete(delete);
- return sendGroupMessage(messageBuilder, groupId);
+ return sendMessage(messageBuilder, recipients);
}
- public Pair<Long, List<SendMessageResult>> sendMessageReaction(
- String emoji, boolean remove, String targetAuthor, long targetSentTimestamp, List<String> recipients
- ) throws IOException, InvalidNumberException {
- var targetAuthorRecipientId = canonicalizeAndResolveRecipient(targetAuthor);
+ public SendMessageResults sendMessageReaction(
+ String emoji,
+ boolean remove,
+ RecipientIdentifier.Single targetAuthor,
+ long targetSentTimestamp,
+ Set<RecipientIdentifier> recipients
+ ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
+ var targetAuthorRecipientId = resolveRecipient(targetAuthor);
var reaction = new SignalServiceDataMessage.Reaction(emoji,
remove,
resolveSignalServiceAddress(targetAuthorRecipientId),
targetSentTimestamp);
final var messageBuilder = SignalServiceDataMessage.newBuilder().withReaction(reaction);
- return sendMessage(messageBuilder, getSignalServiceAddresses(recipients));
+ return sendMessage(messageBuilder, recipients);
}
- public Pair<Long, List<SendMessageResult>> sendEndSessionMessage(List<String> recipients) throws IOException, InvalidNumberException {
+ public SendMessageResults sendEndSessionMessage(Set<RecipientIdentifier.Single> recipients) throws IOException {
var messageBuilder = SignalServiceDataMessage.newBuilder().asEndSessionMessage();
- final var signalServiceAddresses = getSignalServiceAddresses(recipients);
try {
- return sendMessage(messageBuilder, signalServiceAddresses);
- } catch (Exception e) {
- for (var address : signalServiceAddresses) {
- handleEndSession(address);
+ return sendMessage(messageBuilder,
+ recipients.stream().map(RecipientIdentifier.class::cast).collect(Collectors.toSet()));
+ } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
+ throw new AssertionError(e);
+ } finally {
+ for (var recipient : recipients) {
+ final var recipientId = resolveRecipient((RecipientIdentifier.Single) recipient);
+ handleEndSession(recipientId);
}
- throw e;
}
}
void renewSession(RecipientId recipientId) throws IOException {
account.getSessionStore().archiveSessions(recipientId);
if (!recipientId.equals(getSelfRecipientId())) {
- sendNullMessage(recipientId);
+ sendHelper.sendNullMessage(recipientId);
}
}
- public String getContactName(String number) throws InvalidNumberException {
- var contact = account.getContactStore().getContact(canonicalizeAndResolveRecipient(number));
- return contact == null || contact.getName() == null ? "" : contact.getName();
- }
-
- public void setContactName(String number, String name) throws InvalidNumberException, NotMasterDeviceException {
+ public void setContactName(
+ RecipientIdentifier.Single recipient, String name
+ ) throws NotMasterDeviceException {
if (!account.isMasterDevice()) {
throw new NotMasterDeviceException();
}
- final var recipientId = canonicalizeAndResolveRecipient(number);
+ final var recipientId = resolveRecipient(recipient);
var contact = account.getContactStore().getContact(recipientId);
final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
account.getContactStore().storeContact(recipientId, builder.withName(name).build());
}
public void setContactBlocked(
- String number, boolean blocked
- ) throws InvalidNumberException, NotMasterDeviceException {
+ RecipientIdentifier.Single recipient, boolean blocked
+ ) throws NotMasterDeviceException {
if (!account.isMasterDevice()) {
throw new NotMasterDeviceException();
}
- setContactBlocked(canonicalizeAndResolveRecipient(number), blocked);
+ setContactBlocked(resolveRecipient(recipient), blocked);
}
private void setContactBlocked(RecipientId recipientId, boolean blocked) {
var contact = account.getContactStore().getContact(recipientId);
final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
+ // TODO cycle our profile key
account.getContactStore().storeContact(recipientId, builder.withBlocked(blocked).build());
}
}
group.setBlocked(blocked);
+ // TODO cycle our profile key
account.getGroupStore().updateGroup(group);
}
+ /**
+ * Change the expiration timer for a contact
+ */
+ public void setExpirationTimer(
+ RecipientIdentifier.Single recipient, int messageExpirationTimer
+ ) throws IOException {
+ var recipientId = resolveRecipient(recipient);
+ setExpirationTimer(recipientId, messageExpirationTimer);
+ final var messageBuilder = SignalServiceDataMessage.newBuilder().asExpirationUpdate();
+ try {
+ sendMessage(messageBuilder, Set.of(recipient));
+ } catch (NotAGroupMemberException | GroupNotFoundException | GroupSendingNotAllowedException e) {
+ throw new AssertionError(e);
+ }
+ }
+
private void setExpirationTimer(RecipientId recipientId, int messageExpirationTimer) {
var contact = account.getContactStore().getContact(recipientId);
if (contact != null && contact.getMessageExpirationTime() == messageExpirationTimer) {
.storeContact(recipientId, builder.withMessageExpirationTime(messageExpirationTimer).build());
}
- private void sendExpirationTimerUpdate(RecipientId recipientId) throws IOException {
- final var messageBuilder = SignalServiceDataMessage.newBuilder().asExpirationUpdate();
- sendMessage(messageBuilder, Set.of(recipientId));
- }
-
- /**
- * Change the expiration timer for a contact
- */
- public void setExpirationTimer(
- String number, int messageExpirationTimer
- ) throws IOException, InvalidNumberException {
- var recipientId = canonicalizeAndResolveRecipient(number);
- setExpirationTimer(recipientId, messageExpirationTimer);
- sendExpirationTimerUpdate(recipientId);
- }
-
- /**
- * Change the expiration timer for a group
- */
- private void setExpirationTimer(
- GroupInfoV1 groupInfoV1, int messageExpirationTimer
- ) throws NotAGroupMemberException, GroupNotFoundException, IOException {
- groupInfoV1.messageExpirationTime = messageExpirationTimer;
- account.getGroupStore().updateGroup(groupInfoV1);
- sendExpirationTimerUpdate(groupInfoV1.getGroupId());
- }
-
- private void sendExpirationTimerUpdate(GroupIdV1 groupId) throws IOException, NotAGroupMemberException, GroupNotFoundException {
- final var messageBuilder = SignalServiceDataMessage.newBuilder().asExpirationUpdate();
- sendGroupMessage(messageBuilder, groupId);
- }
-
/**
* Upload the sticker pack from path.
*
* @param path Path can be a path to a manifest.json file or to a zip file that contains a manifest.json file
* @return if successful, returns the URL to install the sticker pack in the signal app
*/
- public String uploadStickerPack(File path) throws IOException, StickerPackInvalidException {
+ public URI uploadStickerPack(File path) throws IOException, StickerPackInvalidException {
var manifest = StickerUtils.getSignalServiceStickerManifestUpload(path);
- var messageSender = createMessageSender();
+ var messageSender = dependencies.getMessageSender();
var packKey = KeyUtils.createStickerUploadKey();
- var packId = messageSender.uploadStickerManifest(manifest, packKey);
+ var packIdString = messageSender.uploadStickerManifest(manifest, packKey);
+ var packId = StickerPackId.deserialize(Hex.fromStringCondensed(packIdString));
- var sticker = new Sticker(StickerPackId.deserialize(Hex.fromStringCondensed(packId)), packKey);
+ var sticker = new Sticker(packId, packKey);
account.getStickerStore().updateSticker(sticker);
try {
return new URI("https",
"signal.art",
"/addstickers/",
- "pack_id=" + URLEncoder.encode(packId, StandardCharsets.UTF_8) + "&pack_key=" + URLEncoder.encode(
- Hex.toStringCondensed(packKey),
- StandardCharsets.UTF_8)).toString();
+ "pack_id="
+ + URLEncoder.encode(Hex.toStringCondensed(packId.serialize()), StandardCharsets.UTF_8)
+ + "&pack_key="
+ + URLEncoder.encode(Hex.toStringCondensed(packKey), StandardCharsets.UTF_8));
} catch (URISyntaxException e) {
throw new AssertionError(e);
}
.setType(SignalServiceProtos.SyncMessage.Request.Type.GROUPS)
.build();
var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
- try {
- sendSyncMessage(message);
- } catch (UntrustedIdentityException e) {
- throw new AssertionError(e);
- }
+ sendHelper.sendSyncMessage(message);
}
private void requestSyncContacts() throws IOException {
.setType(SignalServiceProtos.SyncMessage.Request.Type.CONTACTS)
.build();
var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
- try {
- sendSyncMessage(message);
- } catch (UntrustedIdentityException e) {
- throw new AssertionError(e);
- }
+ sendHelper.sendSyncMessage(message);
}
private void requestSyncBlocked() throws IOException {
.setType(SignalServiceProtos.SyncMessage.Request.Type.BLOCKED)
.build();
var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
- try {
- sendSyncMessage(message);
- } catch (UntrustedIdentityException e) {
- throw new AssertionError(e);
- }
+ sendHelper.sendSyncMessage(message);
}
private void requestSyncConfiguration() throws IOException {
.setType(SignalServiceProtos.SyncMessage.Request.Type.CONFIGURATION)
.build();
var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
- try {
- sendSyncMessage(message);
- } catch (UntrustedIdentityException e) {
- throw new AssertionError(e);
- }
+ sendHelper.sendSyncMessage(message);
}
private void requestSyncKeys() throws IOException {
.setType(SignalServiceProtos.SyncMessage.Request.Type.KEYS)
.build();
var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
- try {
- sendSyncMessage(message);
- } catch (UntrustedIdentityException e) {
- throw new AssertionError(e);
- }
+ sendHelper.sendSyncMessage(message);
}
private byte[] getSenderCertificate() {
byte[] certificate;
try {
if (account.isPhoneNumberShared()) {
- certificate = accountManager.getSenderCertificate();
+ certificate = dependencies.getAccountManager().getSenderCertificate();
} else {
- certificate = accountManager.getSenderCertificateForPhoneNumberPrivacy();
+ certificate = dependencies.getAccountManager().getSenderCertificateForPhoneNumberPrivacy();
}
} catch (IOException e) {
logger.warn("Failed to get sender certificate, ignoring: {}", e.getMessage());
return certificate;
}
- private void sendSyncMessage(SignalServiceSyncMessage message) throws IOException, UntrustedIdentityException {
- var messageSender = createMessageSender();
- messageSender.sendMessage(message, unidentifiedAccessHelper.getAccessForSync());
- }
-
- private Set<RecipientId> getSignalServiceAddresses(Collection<String> numbers) throws InvalidNumberException {
- final var signalServiceAddresses = new HashSet<SignalServiceAddress>(numbers.size());
+ private Set<RecipientId> getRecipientIds(Collection<RecipientIdentifier.Single> recipients) {
+ final var signalServiceAddresses = new HashSet<SignalServiceAddress>(recipients.size());
final var addressesMissingUuid = new HashSet<SignalServiceAddress>();
- for (var number : numbers) {
- final var resolvedAddress = resolveSignalServiceAddress(canonicalizeAndResolveRecipient(number));
+ for (var number : recipients) {
+ final var resolvedAddress = resolveSignalServiceAddress(resolveRecipient(number));
if (resolvedAddress.getUuid().isPresent()) {
signalServiceAddresses.add(resolvedAddress);
} else {
}
private Map<String, UUID> getRegisteredUsers(final Set<String> numbers) throws IOException {
+ final Map<String, UUID> registeredUsers;
try {
- return accountManager.getRegisteredUsers(ServiceConfig.getIasKeyStore(),
- numbers,
- serviceEnvironmentConfig.getCdsMrenclave());
+ registeredUsers = dependencies.getAccountManager()
+ .getRegisteredUsers(ServiceConfig.getIasKeyStore(),
+ numbers,
+ serviceEnvironmentConfig.getCdsMrenclave());
} catch (Quote.InvalidQuoteFormatException | UnauthenticatedQuoteException | SignatureException | UnauthenticatedResponseException | InvalidKeyException e) {
throw new IOException(e);
}
- }
-
- private Pair<Long, List<SendMessageResult>> sendMessage(
- SignalServiceDataMessage.Builder messageBuilder, Set<RecipientId> recipientIds
- ) throws IOException {
- final var timestamp = System.currentTimeMillis();
- messageBuilder.withTimestamp(timestamp);
- getOrCreateMessagePipe();
- getOrCreateUnidentifiedMessagePipe();
- SignalServiceDataMessage message = null;
- try {
- message = messageBuilder.build();
- if (message.getGroupContext().isPresent()) {
- try {
- var messageSender = createMessageSender();
- final var isRecipientUpdate = false;
- final var recipientIdList = new ArrayList<>(recipientIds);
- final var addresses = recipientIdList.stream()
- .map(this::resolveSignalServiceAddress)
- .collect(Collectors.toList());
- var result = messageSender.sendMessage(addresses,
- unidentifiedAccessHelper.getAccessFor(recipientIdList),
- isRecipientUpdate,
- message);
-
- for (var r : result) {
- if (r.getIdentityFailure() != null) {
- final var recipientId = resolveRecipient(r.getAddress());
- final var newIdentity = account.getIdentityKeyStore()
- .saveIdentity(recipientId, r.getIdentityFailure().getIdentityKey(), new Date());
- if (newIdentity) {
- account.getSessionStore().archiveSessions(recipientId);
- }
- }
- }
-
- return new Pair<>(timestamp, result);
- } catch (UntrustedIdentityException e) {
- return new Pair<>(timestamp, List.of());
- }
- } else {
- // Send to all individually, so sync messages are sent correctly
- messageBuilder.withProfileKey(account.getProfileKey().serialize());
- var results = new ArrayList<SendMessageResult>(recipientIds.size());
- for (var recipientId : recipientIds) {
- final var contact = account.getContactStore().getContact(recipientId);
- final var expirationTime = contact != null ? contact.getMessageExpirationTime() : 0;
- messageBuilder.withExpiration(expirationTime);
- message = messageBuilder.build();
- results.add(sendMessage(recipientId, message));
- }
- return new Pair<>(timestamp, results);
- }
- } finally {
- if (message != null && message.isEndSession()) {
- for (var recipient : recipientIds) {
- handleEndSession(recipient);
- }
- }
- }
- }
-
- private Pair<Long, SendMessageResult> sendSelfMessage(
- SignalServiceDataMessage.Builder messageBuilder
- ) throws IOException {
- final var timestamp = System.currentTimeMillis();
- messageBuilder.withTimestamp(timestamp);
- getOrCreateMessagePipe();
- getOrCreateUnidentifiedMessagePipe();
- final var recipientId = account.getSelfRecipientId();
-
- final var contact = account.getContactStore().getContact(recipientId);
- final var expirationTime = contact != null ? contact.getMessageExpirationTime() : 0;
- messageBuilder.withExpiration(expirationTime);
-
- var message = messageBuilder.build();
- final var result = sendSelfMessage(message);
- return new Pair<>(timestamp, result);
- }
-
- private SendMessageResult sendSelfMessage(SignalServiceDataMessage message) throws IOException {
- var messageSender = createMessageSender();
-
- var recipientId = account.getSelfRecipientId();
-
- final var unidentifiedAccess = unidentifiedAccessHelper.getAccessFor(recipientId);
- var recipient = resolveSignalServiceAddress(recipientId);
- var transcript = new SentTranscriptMessage(Optional.of(recipient),
- message.getTimestamp(),
- message,
- message.getExpiresInSeconds(),
- Map.of(recipient, unidentifiedAccess.isPresent()),
- false);
- var syncMessage = SignalServiceSyncMessage.forSentTranscript(transcript);
-
- try {
- var startTime = System.currentTimeMillis();
- messageSender.sendMessage(syncMessage, unidentifiedAccess);
- return SendMessageResult.success(recipient,
- unidentifiedAccess.isPresent(),
- false,
- System.currentTimeMillis() - startTime);
- } catch (UntrustedIdentityException e) {
- return SendMessageResult.identityFailure(recipient, e.getIdentityKey());
- }
- }
- private SendMessageResult sendMessage(
- RecipientId recipientId, SignalServiceDataMessage message
- ) throws IOException {
- var messageSender = createMessageSender();
+ // Store numbers as recipients so we have the number/uuid association
+ registeredUsers.forEach((number, uuid) -> resolveRecipientTrusted(new SignalServiceAddress(uuid, number)));
- final var address = resolveSignalServiceAddress(recipientId);
- try {
- try {
- return messageSender.sendMessage(address, unidentifiedAccessHelper.getAccessFor(recipientId), message);
- } catch (UnregisteredUserException e) {
- final var newRecipientId = refreshRegisteredUser(recipientId);
- return messageSender.sendMessage(resolveSignalServiceAddress(newRecipientId),
- unidentifiedAccessHelper.getAccessFor(newRecipientId),
- message);
- }
- } catch (UntrustedIdentityException e) {
- return SendMessageResult.identityFailure(address, e.getIdentityKey());
- }
+ return registeredUsers;
}
- private SendMessageResult sendNullMessage(RecipientId recipientId) throws IOException {
- var messageSender = createMessageSender();
-
- final var address = resolveSignalServiceAddress(recipientId);
- try {
- try {
- return messageSender.sendNullMessage(address, unidentifiedAccessHelper.getAccessFor(recipientId));
- } catch (UnregisteredUserException e) {
- final var newRecipientId = refreshRegisteredUser(recipientId);
- final var newAddress = resolveSignalServiceAddress(newRecipientId);
- return messageSender.sendNullMessage(newAddress, unidentifiedAccessHelper.getAccessFor(newRecipientId));
- }
- } catch (UntrustedIdentityException e) {
- return SendMessageResult.identityFailure(address, e.getIdentityKey());
- }
- }
-
- private SignalServiceContent decryptMessage(SignalServiceEnvelope envelope) throws InvalidMetadataMessageException, ProtocolInvalidMessageException, ProtocolDuplicateMessageException, ProtocolLegacyMessageException, ProtocolInvalidKeyIdException, InvalidMetadataVersionException, ProtocolInvalidVersionException, ProtocolNoSessionException, ProtocolInvalidKeyException, SelfSendException, UnsupportedDataMessageException, ProtocolUntrustedIdentityException {
- var cipher = new SignalServiceCipher(account.getSelfAddress(),
- account.getSignalProtocolStore(),
- sessionLock,
- certificateValidator);
- return cipher.decrypt(envelope);
+ public void sendTypingMessage(
+ TypingAction action, Set<RecipientIdentifier> recipients
+ ) throws IOException, UntrustedIdentityException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
+ sendTypingMessage(action.toSignalService(), recipients);
}
private void handleEndSession(RecipientId recipientId) {
if (groupInfo.getAvatar().isPresent()) {
var avatar = groupInfo.getAvatar().get();
- downloadGroupAvatar(avatar, groupV1.getGroupId());
+ downloadGroupAvatar(groupV1.getGroupId(), avatar);
}
if (groupInfo.getName().isPresent()) {
final var groupContext = message.getGroupContext().get().getGroupV2().get();
final var groupMasterKey = groupContext.getMasterKey();
- getOrMigrateGroup(groupMasterKey,
+ groupHelper.getOrMigrateGroup(groupMasterKey,
groupContext.getRevision(),
groupContext.hasSignedGroupChange() ? groupContext.getSignedGroupChange() : null);
}
sticker = new Sticker(stickerPackId, messageSticker.getPackKey());
account.getStickerStore().updateSticker(sticker);
}
+ enqueueJob(new RetrieveStickerPackJob(stickerPackId, messageSticker.getPackKey()));
}
return actions;
}
- private GroupInfoV2 getOrMigrateGroup(
- final GroupMasterKey groupMasterKey, final int revision, final byte[] signedGroupChange
- ) {
- final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey);
-
- var groupId = GroupUtils.getGroupIdV2(groupSecretParams);
- var groupInfo = getGroup(groupId);
- final GroupInfoV2 groupInfoV2;
- if (groupInfo instanceof GroupInfoV1) {
- // Received a v2 group message for a v1 group, we need to locally migrate the group
- account.getGroupStore().deleteGroupV1(((GroupInfoV1) groupInfo).getGroupId());
- groupInfoV2 = new GroupInfoV2(groupId, groupMasterKey);
- logger.info("Locally migrated group {} to group v2, id: {}",
- groupInfo.getGroupId().toBase64(),
- groupInfoV2.getGroupId().toBase64());
- } else if (groupInfo instanceof GroupInfoV2) {
- groupInfoV2 = (GroupInfoV2) groupInfo;
- } else {
- groupInfoV2 = new GroupInfoV2(groupId, groupMasterKey);
- }
-
- if (groupInfoV2.getGroup() == null || groupInfoV2.getGroup().getRevision() < revision) {
- DecryptedGroup group = null;
- if (signedGroupChange != null
- && groupInfoV2.getGroup() != null
- && groupInfoV2.getGroup().getRevision() + 1 == revision) {
- group = groupV2Helper.getUpdatedDecryptedGroup(groupInfoV2.getGroup(),
- signedGroupChange,
- groupMasterKey);
- }
- if (group == null) {
- group = groupV2Helper.getDecryptedGroup(groupSecretParams);
- }
- if (group != null) {
- storeProfileKeysFromMembers(group);
- final var avatar = group.getAvatar();
- if (avatar != null && !avatar.isEmpty()) {
- downloadGroupAvatar(groupId, groupSecretParams, avatar);
- }
- }
- groupInfoV2.setGroup(group, this::resolveRecipient);
- account.getGroupStore().updateGroup(groupInfoV2);
- }
-
- return groupInfoV2;
- }
-
- private void storeProfileKeysFromMembers(final DecryptedGroup group) {
- for (var member : group.getMembersList()) {
- final var uuid = UuidUtil.parseOrThrow(member.getUuid().toByteArray());
- final var recipientId = account.getRecipientStore().resolveRecipient(uuid);
- try {
- account.getProfileStore()
- .storeProfileKey(recipientId, new ProfileKey(member.getProfileKey().toByteArray()));
- } catch (InvalidInputException ignored) {
- }
- }
- }
-
private void retryFailedReceivedMessages(ReceiveMessageHandler handler, boolean ignoreAttachments) {
Set<HandleAction> queuedActions = new HashSet<>();
for (var cachedMessage : account.getMessageCache().getCachedMessages()) {
queuedActions.addAll(actions);
}
}
- for (var action : queuedActions) {
- try {
- action.execute(this);
- } catch (Throwable e) {
- logger.warn("Message action failed.", e);
- }
- }
+ handleQueuedActions(queuedActions);
}
private List<HandleAction> retryFailedReceivedMessage(
List<HandleAction> actions = null;
if (!envelope.isReceipt()) {
try {
- content = decryptMessage(envelope);
+ content = dependencies.getCipher().decrypt(envelope);
} catch (ProtocolUntrustedIdentityException e) {
if (!envelope.hasSource()) {
final var identifier = e.getSender();
) throws IOException {
retryFailedReceivedMessages(handler, ignoreAttachments);
- Set<HandleAction> queuedActions = null;
+ Set<HandleAction> queuedActions = new HashSet<>();
- final var messagePipe = getOrCreateMessagePipe();
+ final var signalWebSocket = dependencies.getSignalWebSocket();
+ signalWebSocket.connect();
var hasCaughtUpWithOldMessages = false;
- while (true) {
+ while (!Thread.interrupted()) {
SignalServiceEnvelope envelope;
SignalServiceContent content = null;
Exception exception = null;
final CachedMessage[] cachedMessage = {null};
account.setLastReceiveTimestamp(System.currentTimeMillis());
+ logger.debug("Checking for new message from server");
try {
- var result = messagePipe.readOrEmpty(timeout, unit, envelope1 -> {
+ var result = signalWebSocket.readOrEmpty(unit.toMillis(timeout), envelope1 -> {
final var recipientId = envelope1.hasSource()
? resolveRecipient(envelope1.getSourceIdentifier())
: null;
// store message on disk, before acknowledging receipt to the server
cachedMessage[0] = account.getMessageCache().cacheMessage(envelope1, recipientId);
});
+ logger.debug("New message received from server");
if (result.isPresent()) {
envelope = result.get();
} else {
// Received indicator that server queue is empty
hasCaughtUpWithOldMessages = true;
- if (queuedActions != null) {
- for (var action : queuedActions) {
- try {
- action.execute(this);
- } catch (Throwable e) {
- logger.warn("Message action failed.", e);
- }
- }
- queuedActions.clear();
- queuedActions = null;
- }
+ handleQueuedActions(queuedActions);
+ queuedActions.clear();
// Continue to wait another timeout for new messages
continue;
}
+ } catch (AssertionError e) {
+ if (e.getCause() instanceof InterruptedException) {
+ Thread.currentThread().interrupt();
+ break;
+ } else {
+ throw e;
+ }
+ } catch (WebSocketUnavailableException e) {
+ logger.debug("Pipe unexpectedly unavailable, connecting");
+ signalWebSocket.connect();
+ continue;
} catch (TimeoutException e) {
if (returnOnTimeout) return;
continue;
// address/uuid in envelope is sent by server
resolveRecipientTrusted(envelope.getSourceAddress());
}
- final var notAGroupMember = isNotAGroupMember(envelope, content);
if (!envelope.isReceipt()) {
try {
- content = decryptMessage(envelope);
+ content = dependencies.getCipher().decrypt(envelope);
} catch (Exception e) {
exception = e;
}
try {
action.execute(this);
} catch (Throwable e) {
+ if (e instanceof AssertionError && e.getCause() instanceof InterruptedException) {
+ Thread.currentThread().interrupt();
+ }
logger.warn("Message action failed.", e);
}
}
} else {
- if (queuedActions == null) {
- queuedActions = new HashSet<>();
- }
queuedActions.addAll(actions);
}
}
+ final var notAllowedToSendToGroup = isNotAllowedToSendToGroup(envelope, content);
if (isMessageBlocked(envelope, content)) {
logger.info("Ignoring a message from blocked user/group: {}", envelope.getTimestamp());
- } else if (notAGroupMember) {
- logger.info("Ignoring a message from a non group member: {}", envelope.getTimestamp());
+ } else if (notAllowedToSendToGroup) {
+ logger.info("Ignoring a group message from an unauthorized sender (no member or admin): {} {}",
+ (envelope.hasSource() ? envelope.getSourceAddress() : content.getSender()).getIdentifier(),
+ envelope.getTimestamp());
} else {
handler.handleMessage(envelope, content, exception);
}
}
}
}
+ handleQueuedActions(queuedActions);
+ }
+
+ private void handleQueuedActions(final Set<HandleAction> queuedActions) {
+ for (var action : queuedActions) {
+ try {
+ action.execute(this);
+ } catch (Throwable e) {
+ if (e instanceof AssertionError && e.getCause() instanceof InterruptedException) {
+ Thread.currentThread().interrupt();
+ }
+ logger.warn("Message action failed.", e);
+ }
+ }
}
private boolean isMessageBlocked(
return false;
}
- public boolean isContactBlocked(final String identifier) throws InvalidNumberException {
- final var recipientId = canonicalizeAndResolveRecipient(identifier);
+ public boolean isContactBlocked(final RecipientIdentifier.Single recipient) {
+ final var recipientId = resolveRecipient(recipient);
return isContactBlocked(recipientId);
}
return sourceContact != null && sourceContact.isBlocked();
}
- private boolean isNotAGroupMember(
+ private boolean isNotAllowedToSendToGroup(
SignalServiceEnvelope envelope, SignalServiceContent content
) {
SignalServiceAddress source;
return false;
}
- if (content != null && content.getDataMessage().isPresent()) {
- var message = content.getDataMessage().get();
- if (message.getGroupContext().isPresent()) {
- if (message.getGroupContext().get().getGroupV1().isPresent()) {
- var groupInfo = message.getGroupContext().get().getGroupV1().get();
- if (groupInfo.getType() == SignalServiceGroup.Type.QUIT) {
- return false;
- }
- }
- var groupId = GroupUtils.getGroupId(message.getGroupContext().get());
- var group = getGroup(groupId);
- if (group != null && !group.isMember(resolveRecipient(source))) {
- return true;
- }
+ if (content == null || !content.getDataMessage().isPresent()) {
+ return false;
+ }
+
+ var message = content.getDataMessage().get();
+ if (!message.getGroupContext().isPresent()) {
+ return false;
+ }
+
+ if (message.getGroupContext().get().getGroupV1().isPresent()) {
+ var groupInfo = message.getGroupContext().get().getGroupV1().get();
+ if (groupInfo.getType() == SignalServiceGroup.Type.QUIT) {
+ return false;
}
}
+
+ var groupId = GroupUtils.getGroupId(message.getGroupContext().get());
+ var group = getGroup(groupId);
+ if (group == null) {
+ return false;
+ }
+
+ final var recipientId = resolveRecipient(source);
+ if (!group.isMember(recipientId)) {
+ return true;
+ }
+
+ if (group.isAnnouncementGroup() && !group.isAdmin(recipientId)) {
+ return message.getBody().isPresent()
+ || message.getAttachments().isPresent()
+ || message.getQuote()
+ .isPresent()
+ || message.getPreviews().isPresent()
+ || message.getMentions().isPresent()
+ || message.getSticker().isPresent();
+ }
return false;
}
}
if (g.getAvatar().isPresent()) {
- downloadGroupAvatar(g.getAvatar().get(), syncGroup.getGroupId());
+ downloadGroupAvatar(syncGroup.getGroupId(), g.getAvatar().get());
}
syncGroup.archived = g.isArchived();
account.getGroupStore().updateGroup(syncGroup);
continue;
}
final var stickerPackId = StickerPackId.deserialize(m.getPackId().get());
+ final var installed = !m.getType().isPresent()
+ || m.getType().get() == StickerPackOperationMessage.Type.INSTALL;
+
var sticker = account.getStickerStore().getSticker(stickerPackId);
- if (sticker == null) {
- if (!m.getPackKey().isPresent()) {
- continue;
+ if (m.getPackKey().isPresent()) {
+ if (sticker == null) {
+ sticker = new Sticker(stickerPackId, m.getPackKey().get());
+ }
+ if (installed) {
+ enqueueJob(new RetrieveStickerPackJob(stickerPackId, m.getPackKey().get()));
}
- sticker = new Sticker(stickerPackId, m.getPackKey().get());
}
- sticker.setInstalled(!m.getType().isPresent()
- || m.getType().get() == StickerPackOperationMessage.Type.INSTALL);
- account.getStickerStore().updateSticker(sticker);
+
+ if (sticker != null) {
+ sticker.setInstalled(installed);
+ account.getStickerStore().updateSticker(sticker);
+ }
}
}
if (syncMessage.getFetchType().isPresent()) {
}
}
- private void downloadGroupAvatar(SignalServiceAttachment avatar, GroupId groupId) {
+ private void downloadGroupAvatar(GroupIdV1 groupId, SignalServiceAttachment avatar) {
try {
avatarStore.storeGroupAvatar(groupId, outputStream -> retrieveAttachment(avatar, outputStream));
} catch (IOException e) {
}
}
- private void downloadGroupAvatar(GroupId groupId, GroupSecretParams groupSecretParams, String cdnKey) {
- try {
- avatarStore.storeGroupAvatar(groupId,
- outputStream -> retrieveGroupV2Avatar(groupSecretParams, cdnKey, outputStream));
- } catch (IOException e) {
- logger.warn("Failed to download avatar for group {}, ignoring: {}", groupId.toBase64(), e.getMessage());
- }
- }
-
private void downloadProfileAvatar(
SignalServiceAddress address, String avatarPath, ProfileKey profileKey
) {
avatarStore.storeProfileAvatar(address,
outputStream -> retrieveProfileAvatar(avatarPath, profileKey, outputStream));
} catch (Throwable e) {
+ if (e instanceof AssertionError && e.getCause() instanceof InterruptedException) {
+ Thread.currentThread().interrupt();
+ }
logger.warn("Failed to download profile avatar, ignoring: {}", e.getMessage());
}
}
}
}
- private void retrieveGroupV2Avatar(
- GroupSecretParams groupSecretParams, String cdnKey, OutputStream outputStream
- ) throws IOException {
- var groupOperations = groupsV2Operations.forGroup(groupSecretParams);
-
- var tmpFile = IOUtils.createTempFile();
- try (InputStream input = messageReceiver.retrieveGroupsV2ProfileAvatar(cdnKey,
- tmpFile,
- ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE)) {
- var encryptedData = IOUtils.readFully(input);
-
- var decryptedData = groupOperations.decryptAvatar(encryptedData);
- outputStream.write(decryptedData);
- } finally {
- try {
- Files.delete(tmpFile.toPath());
- } catch (IOException e) {
- logger.warn("Failed to delete received group avatar temp file “{}”, ignoring: {}",
- tmpFile,
- e.getMessage());
- }
- }
- }
-
private void retrieveProfileAvatar(
String avatarPath, ProfileKey profileKey, OutputStream outputStream
) throws IOException {
var tmpFile = IOUtils.createTempFile();
- try (var input = messageReceiver.retrieveProfileAvatar(avatarPath,
- tmpFile,
- profileKey,
- ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE)) {
+ try (var input = dependencies.getMessageReceiver()
+ .retrieveProfileAvatar(avatarPath,
+ tmpFile,
+ profileKey,
+ ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE)) {
// Use larger buffer size to prevent AssertionError: Need: 12272 but only have: 8192 ...
IOUtils.copyStream(input, outputStream, (int) ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE);
} finally {
private InputStream retrieveAttachmentAsStream(
SignalServiceAttachmentPointer pointer, File tmpFile
) throws IOException, InvalidMessageException, MissingConfigurationException {
- return messageReceiver.retrieveAttachment(pointer, tmpFile, ServiceConfig.MAX_ATTACHMENT_SIZE);
+ return dependencies.getMessageReceiver()
+ .retrieveAttachment(pointer, tmpFile, ServiceConfig.MAX_ATTACHMENT_SIZE);
}
- void sendGroups() throws IOException, UntrustedIdentityException {
+ void sendGroups() throws IOException {
var groupsFile = IOUtils.createTempFile();
try {
.stream()
.map(this::resolveSignalServiceAddress)
.collect(Collectors.toList()),
- createGroupAvatarAttachment(groupInfo.getGroupId()),
+ groupHelper.createGroupAvatarAttachment(groupInfo.getGroupId()),
groupInfo.isMember(account.getSelfRecipientId()),
Optional.of(groupInfo.messageExpirationTime),
Optional.fromNullable(groupInfo.color),
.withLength(groupsFile.length())
.build();
- sendSyncMessage(SignalServiceSyncMessage.forGroups(attachmentStream));
+ sendHelper.sendSyncMessage(SignalServiceSyncMessage.forGroups(attachmentStream));
}
}
} finally {
}
}
- public void sendContacts() throws IOException, UntrustedIdentityException {
+ public void sendContacts() throws IOException {
var contactsFile = IOUtils.createTempFile();
try {
.withLength(contactsFile.length())
.build();
- sendSyncMessage(SignalServiceSyncMessage.forContacts(new ContactsMessage(attachmentStream, true)));
+ sendHelper.sendSyncMessage(SignalServiceSyncMessage.forContacts(new ContactsMessage(attachmentStream,
+ true)));
}
}
} finally {
}
}
- void sendBlockedList() throws IOException, UntrustedIdentityException {
+ void sendBlockedList() throws IOException {
var addresses = new ArrayList<SignalServiceAddress>();
for (var record : account.getContactStore().getContacts()) {
if (record.second().isBlocked()) {
groupIds.add(record.getGroupId().serialize());
}
}
- sendSyncMessage(SignalServiceSyncMessage.forBlocked(new BlockedListMessage(addresses, groupIds)));
+ sendHelper.sendSyncMessage(SignalServiceSyncMessage.forBlocked(new BlockedListMessage(addresses, groupIds)));
}
private void sendVerifiedMessage(
SignalServiceAddress destination, IdentityKey identityKey, TrustLevel trustLevel
- ) throws IOException, UntrustedIdentityException {
+ ) throws IOException {
var verifiedMessage = new VerifiedMessage(destination,
identityKey,
trustLevel.toVerifiedState(),
System.currentTimeMillis());
- sendSyncMessage(SignalServiceSyncMessage.forVerified(verifiedMessage));
+ sendHelper.sendSyncMessage(SignalServiceSyncMessage.forVerified(verifiedMessage));
}
public List<Pair<RecipientId, Contact>> getContacts() {
return account.getContactStore().getContacts();
}
- public String getContactOrProfileName(String number) throws InvalidNumberException {
- final var recipientId = canonicalizeAndResolveRecipient(number);
+ public String getContactOrProfileName(RecipientIdentifier.Single recipientIdentifier) {
+ final var recipientId = resolveRecipient(recipientIdentifier);
final var recipient = account.getRecipientStore().getRecipient(recipientId);
if (recipient == null) {
return null;
}
public GroupInfo getGroup(GroupId groupId) {
- return getGroup(groupId, false);
- }
-
- public GroupInfo getGroup(GroupId groupId, boolean forceUpdate) {
- final var group = account.getGroupStore().getGroup(groupId);
- if (group instanceof GroupInfoV2 && (forceUpdate || ((GroupInfoV2) group).getGroup() == null)) {
- final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(((GroupInfoV2) group).getMasterKey());
- ((GroupInfoV2) group).setGroup(groupV2Helper.getDecryptedGroup(groupSecretParams), this::resolveRecipient);
- account.getGroupStore().updateGroup(group);
- }
- return group;
+ return groupHelper.getGroup(groupId);
}
public List<IdentityInfo> getIdentities() {
return account.getIdentityKeyStore().getIdentities();
}
- public List<IdentityInfo> getIdentities(String number) throws InvalidNumberException {
- final var identity = account.getIdentityKeyStore().getIdentity(canonicalizeAndResolveRecipient(number));
+ public List<IdentityInfo> getIdentities(RecipientIdentifier.Single recipient) {
+ final var identity = account.getIdentityKeyStore().getIdentity(resolveRecipient(recipient));
return identity == null ? List.of() : List.of(identity);
}
/**
* Trust this the identity with this fingerprint
*
- * @param name username of the identity
+ * @param recipient username of the identity
* @param fingerprint Fingerprint
*/
- public boolean trustIdentityVerified(String name, byte[] fingerprint) throws InvalidNumberException {
- var recipientId = canonicalizeAndResolveRecipient(name);
+ public boolean trustIdentityVerified(RecipientIdentifier.Single recipient, byte[] fingerprint) {
+ var recipientId = resolveRecipient(recipient);
return trustIdentity(recipientId,
identityKey -> Arrays.equals(identityKey.serialize(), fingerprint),
TrustLevel.TRUSTED_VERIFIED);
/**
* Trust this the identity with this safety number
*
- * @param name username of the identity
+ * @param recipient username of the identity
* @param safetyNumber Safety number
*/
- public boolean trustIdentityVerifiedSafetyNumber(String name, String safetyNumber) throws InvalidNumberException {
- var recipientId = canonicalizeAndResolveRecipient(name);
+ public boolean trustIdentityVerifiedSafetyNumber(RecipientIdentifier.Single recipient, String safetyNumber) {
+ var recipientId = resolveRecipient(recipient);
var address = account.getRecipientStore().resolveServiceAddress(recipientId);
return trustIdentity(recipientId,
identityKey -> safetyNumber.equals(computeSafetyNumber(address, identityKey)),
TrustLevel.TRUSTED_VERIFIED);
}
+ /**
+ * Trust this the identity with this scannable safety number
+ *
+ * @param recipient username of the identity
+ * @param safetyNumber Scannable safety number
+ */
+ public boolean trustIdentityVerifiedSafetyNumber(RecipientIdentifier.Single recipient, byte[] safetyNumber) {
+ var recipientId = resolveRecipient(recipient);
+ var address = account.getRecipientStore().resolveServiceAddress(recipientId);
+ return trustIdentity(recipientId, identityKey -> {
+ final var fingerprint = computeSafetyNumberFingerprint(address, identityKey);
+ try {
+ return fingerprint != null && fingerprint.getScannableFingerprint().compareTo(safetyNumber);
+ } catch (FingerprintVersionMismatchException | FingerprintParsingException e) {
+ return false;
+ }
+ }, TrustLevel.TRUSTED_VERIFIED);
+ }
+
/**
* Trust all keys of this identity without verification
*
- * @param name username of the identity
+ * @param recipient username of the identity
*/
- public boolean trustIdentityAllKeys(String name) throws InvalidNumberException {
- var recipientId = canonicalizeAndResolveRecipient(name);
+ public boolean trustIdentityAllKeys(RecipientIdentifier.Single recipient) {
+ var recipientId = resolveRecipient(recipient);
return trustIdentity(recipientId, identityKey -> true, TrustLevel.TRUSTED_UNVERIFIED);
}
try {
var address = account.getRecipientStore().resolveServiceAddress(recipientId);
sendVerifiedMessage(address, identity.getIdentityKey(), trustLevel);
- } catch (IOException | UntrustedIdentityException e) {
+ } catch (IOException e) {
logger.warn("Failed to send verification sync message: {}", e.getMessage());
}
return true;
}
- public String computeSafetyNumber(
- SignalServiceAddress theirAddress, IdentityKey theirIdentityKey
+ private void handleIdentityFailure(
+ final RecipientId recipientId, final SendMessageResult.IdentityFailure identityFailure
+ ) {
+ final var identityKey = identityFailure.getIdentityKey();
+ if (identityKey != null) {
+ final var newIdentity = account.getIdentityKeyStore().saveIdentity(recipientId, identityKey, new Date());
+ if (newIdentity) {
+ account.getSessionStore().archiveSessions(recipientId);
+ }
+ } else {
+ // Retrieve profile to get the current identity key from the server
+ retrieveEncryptedProfile(recipientId);
+ }
+ }
+
+ public String computeSafetyNumber(SignalServiceAddress theirAddress, IdentityKey theirIdentityKey) {
+ final Fingerprint fingerprint = computeSafetyNumberFingerprint(theirAddress, theirIdentityKey);
+ return fingerprint == null ? null : fingerprint.getDisplayableFingerprint().getDisplayText();
+ }
+
+ public byte[] computeSafetyNumberForScanning(SignalServiceAddress theirAddress, IdentityKey theirIdentityKey) {
+ final Fingerprint fingerprint = computeSafetyNumberFingerprint(theirAddress, theirIdentityKey);
+ return fingerprint == null ? null : fingerprint.getScannableFingerprint().getSerialized();
+ }
+
+ private Fingerprint computeSafetyNumberFingerprint(
+ final SignalServiceAddress theirAddress, final IdentityKey theirIdentityKey
) {
- return Utils.computeSafetyNumber(ServiceConfig.capabilities.isUuid(),
+ return Utils.computeSafetyNumber(capabilities.isUuid(),
account.getSelfAddress(),
getIdentityKeyPair().getPublicKey(),
theirAddress,
return account.getRecipientStore().resolveServiceAddress(recipientId);
}
- public RecipientId canonicalizeAndResolveRecipient(String identifier) throws InvalidNumberException {
- var canonicalizedNumber = UuidUtil.isUuid(identifier)
- ? identifier
- : PhoneNumberFormatter.formatNumber(identifier, account.getUsername());
-
- return resolveRecipient(canonicalizedNumber);
+ private String canonicalizePhoneNumber(final String number) throws InvalidNumberException {
+ return PhoneNumberFormatter.formatNumber(number, account.getUsername());
}
private RecipientId resolveRecipient(final String identifier) {
return resolveRecipient(address);
}
+ private RecipientId resolveRecipient(final RecipientIdentifier.Single recipient) {
+ final SignalServiceAddress address;
+ if (recipient instanceof RecipientIdentifier.Uuid) {
+ address = new SignalServiceAddress(((RecipientIdentifier.Uuid) recipient).uuid, null);
+ } else {
+ address = new SignalServiceAddress(null, ((RecipientIdentifier.Number) recipient).number);
+ }
+
+ return resolveRecipient(address);
+ }
+
public RecipientId resolveRecipient(SignalServiceAddress address) {
return account.getRecipientStore().resolveRecipient(address);
}
return account.getRecipientStore().resolveRecipientTrusted(address);
}
+ private void enqueueJob(Job job) {
+ var context = new Context(account,
+ dependencies.getAccountManager(),
+ dependencies.getMessageReceiver(),
+ stickerPackStore);
+ job.run(context);
+ }
+
@Override
public void close() throws IOException {
close(true);
void close(boolean closeAccount) throws IOException {
executor.shutdown();
- if (messagePipe != null) {
- messagePipe.shutdown();
- messagePipe = null;
- }
-
- if (unidentifiedMessagePipe != null) {
- unidentifiedMessagePipe.shutdown();
- unidentifiedMessagePipe = null;
- }
+ dependencies.getSignalWebSocket().disconnect();
if (closeAccount && account != null) {
account.close();
git.nmode.ca / signal-cli / blobdiff
