}
public StreamDetails retrieveGroupAvatar(GroupId groupId) throws IOException {
- final File groupAvatarFile = getGroupAvatarFile(groupId);
+ final var groupAvatarFile = getGroupAvatarFile(groupId);
return retrieveAvatar(groupAvatarFile);
}
final ECPublicKey deviceKey;
public static DeviceLinkInfo parseDeviceLinkUri(URI linkUri) throws InvalidKeyException {
- final String rawQuery = linkUri.getRawQuery();
+ final var rawQuery = linkUri.getRawQuery();
if (isEmpty(rawQuery)) {
throw new RuntimeException("Invalid device link uri");
}
- Map<String, String> query = getQueryMap(rawQuery);
- String deviceIdentifier = query.get("uuid");
- String publicKeyEncoded = query.get("pub_key");
+ var query = getQueryMap(rawQuery);
+ var deviceIdentifier = query.get("uuid");
+ var publicKeyEncoded = query.get("pub_key");
if (isEmpty(deviceIdentifier) || isEmpty(publicKeyEncoded)) {
throw new RuntimeException("Invalid device link uri");
} catch (IllegalArgumentException e) {
throw new RuntimeException("Invalid device link uri", e);
}
- ECPublicKey deviceKey = Curve.decodePoint(publicKeyBytes, 0);
+ var deviceKey = Curve.decodePoint(publicKeyBytes, 0);
return new DeviceLinkInfo(deviceIdentifier, deviceKey);
}
private static Map<String, String> getQueryMap(String query) {
- String[] params = query.split("&");
- Map<String, String> map = new HashMap<>();
- for (String param : params) {
- final String[] paramParts = param.split("=");
- String name = URLDecoder.decode(paramParts[0], StandardCharsets.UTF_8);
- String value = URLDecoder.decode(paramParts[1], StandardCharsets.UTF_8);
+ var params = query.split("&");
+ var map = new HashMap<String, String>();
+ for (var param : params) {
+ final var paramParts = param.split("=");
+ var name = URLDecoder.decode(paramParts[0], StandardCharsets.UTF_8);
+ var value = URLDecoder.decode(paramParts[1], StandardCharsets.UTF_8);
map.put(name, value);
}
return map;
}
public String createDeviceLinkUri() {
- final String deviceKeyString = Base64.getEncoder().encodeToString(deviceKey.serialize()).replace("=", "");
+ final var deviceKeyString = Base64.getEncoder().encodeToString(deviceKey.serialize()).replace("=", "");
return "tsdevice:/?uuid="
+ URLEncoder.encode(deviceIdentifier, StandardCharsets.UTF_8)
+ "&pub_key="
public boolean equals(final Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
- final SendReceiptAction that = (SendReceiptAction) o;
+ final var that = (SendReceiptAction) o;
return timestamp == that.timestamp && address.equals(that.address);
}
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
- final SendGroupInfoRequestAction that = (SendGroupInfoRequestAction) o;
+ final var that = (SendGroupInfoRequestAction) o;
if (!address.equals(that.address)) return false;
return groupId.equals(that.groupId);
@Override
public int hashCode() {
- int result = address.hashCode();
+ var result = address.hashCode();
result = 31 * result + groupId.hashCode();
return result;
}
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
- final SendGroupInfoAction that = (SendGroupInfoAction) o;
+ final var that = (SendGroupInfoAction) o;
if (!address.equals(that.address)) return false;
return groupId.equals(that.groupId);
@Override
public int hashCode() {
- int result = address.hashCode();
+ var result = address.hashCode();
result = 31 * result + groupId.hashCode();
return result;
}
@Override
public void log(final int priority, final String tag, final String message) {
- final String logMessage = String.format("[%s]: %s", tag, message);
+ final var logMessage = String.format("[%s]: %s", tag, message);
switch (priority) {
case SignalProtocolLogger.VERBOSE:
logger.trace(logMessage);
import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
import org.asamk.signal.manager.groups.GroupId;
import org.asamk.signal.manager.groups.GroupIdV1;
-import org.asamk.signal.manager.groups.GroupIdV2;
import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
import org.asamk.signal.manager.groups.GroupNotFoundException;
import org.asamk.signal.manager.groups.GroupUtils;
import org.asamk.signal.manager.storage.groups.GroupInfoV2;
import org.asamk.signal.manager.storage.messageCache.CachedMessage;
import org.asamk.signal.manager.storage.profiles.SignalProfile;
-import org.asamk.signal.manager.storage.profiles.SignalProfileEntry;
import org.asamk.signal.manager.storage.protocol.IdentityInfo;
import org.asamk.signal.manager.storage.stickers.Sticker;
import org.asamk.signal.manager.util.AttachmentUtils;
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.storageservice.protos.groups.local.DecryptedGroupJoinInfo;
-import org.signal.storageservice.protos.groups.local.DecryptedMember;
import org.signal.zkgroup.InvalidInputException;
import org.signal.zkgroup.VerificationFailedException;
-import org.signal.zkgroup.auth.AuthCredentialResponse;
import org.signal.zkgroup.groups.GroupMasterKey;
import org.signal.zkgroup.groups.GroupSecretParams;
import org.signal.zkgroup.profiles.ClientZkProfileOperations;
import org.whispersystems.libsignal.state.SignedPreKeyRecord;
import org.whispersystems.libsignal.util.Pair;
import org.whispersystems.libsignal.util.guava.Optional;
-import org.whispersystems.signalservice.api.KeyBackupService;
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.crypto.SignalServiceCipher;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
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.kbs.MasterKey;
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.SignalServiceGroup;
import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2;
import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
-import org.whispersystems.signalservice.api.messages.SignalServiceStickerManifestUpload;
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.DeviceInfo;
-import org.whispersystems.signalservice.api.messages.multidevice.KeysMessage;
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.messages.shared.SharedContact;
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.MissingConfigurationException;
-import org.whispersystems.signalservice.api.storage.StorageKey;
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.StreamDetails;
import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
import org.whispersystems.signalservice.api.util.UuidUtil;
import org.whispersystems.signalservice.internal.contacts.crypto.Quote;
import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
ServiceConfig.AUTOMATIC_NETWORK_RETRY,
timer);
this.groupsV2Api = accountManager.getGroupsV2Api();
- final KeyBackupService keyBackupService = accountManager.getKeyBackupService(ServiceConfig.getIasKeyStore(),
+ final var keyBackupService = accountManager.getKeyBackupService(ServiceConfig.getIasKeyStore(),
serviceEnvironmentConfig.getKeyBackupConfig().getEnclaveName(),
serviceEnvironmentConfig.getKeyBackupConfig().getServiceId(),
serviceEnvironmentConfig.getKeyBackupConfig().getMrenclave(),
public static Manager init(
String username, File settingsPath, ServiceEnvironment serviceEnvironment, String userAgent
) throws IOException, NotRegisteredException {
- PathConfig pathConfig = PathConfig.createDefault(settingsPath);
+ var pathConfig = PathConfig.createDefault(settingsPath);
if (!SignalAccount.userExists(pathConfig.getDataPath(), username)) {
throw new NotRegisteredException();
}
- SignalAccount account = SignalAccount.load(pathConfig.getDataPath(), username);
+ var account = SignalAccount.load(pathConfig.getDataPath(), username);
if (!account.isRegistered()) {
throw new NotRegisteredException();
}
- final ServiceEnvironmentConfig serviceEnvironmentConfig = ServiceConfig.getServiceEnvironmentConfig(
- serviceEnvironment,
- userAgent);
+ final var serviceEnvironmentConfig = ServiceConfig.getServiceEnvironmentConfig(serviceEnvironment, userAgent);
return new Manager(account, pathConfig, serviceEnvironmentConfig, userAgent);
}
public static List<String> getAllLocalUsernames(File settingsPath) {
- PathConfig pathConfig = PathConfig.createDefault(settingsPath);
- final File dataPath = pathConfig.getDataPath();
- final File[] files = dataPath.listFiles();
+ var pathConfig = PathConfig.createDefault(settingsPath);
+ final var dataPath = pathConfig.getDataPath();
+ final var files = dataPath.listFiles();
if (files == null) {
return List.of();
*/
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
- Map<String, UUID> contactDetails = getRegisteredUsers(numbers);
+ var contactDetails = getRegisteredUsers(numbers);
- Set<String> registeredUsers = contactDetails.keySet();
+ var registeredUsers = contactDetails.keySet();
return numbers.stream().collect(Collectors.toMap(x -> x, registeredUsers::contains));
}
* if it's Optional.absent(), the avatar will be removed
*/
public void setProfile(String name, String about, String aboutEmoji, Optional<File> avatar) throws IOException {
- SignalProfileEntry profileEntry = account.getProfileStore().getProfileEntry(getSelfAddress());
- SignalProfile profile = profileEntry == null ? null : profileEntry.getProfile();
- SignalProfile newProfile = new SignalProfile(profile == null ? null : profile.getIdentityKey(),
+ var profileEntry = account.getProfileStore().getProfileEntry(getSelfAddress());
+ var profile = profileEntry == null ? null : profileEntry.getProfile();
+ var newProfile = new SignalProfile(profile == null ? null : profile.getIdentityKey(),
name != null ? name : profile == null || profile.getName() == null ? "" : profile.getName(),
about != null ? about : profile == null || profile.getAbout() == null ? "" : profile.getAbout(),
aboutEmoji != null
account.isUnrestrictedUnidentifiedAccess(),
profile == null ? null : profile.getCapabilities());
- try (final StreamDetails streamDetails = avatar == null
+ try (final var streamDetails = avatar == null
? avatarStore.retrieveProfileAvatar(getSelfAddress())
: avatar.isPresent() ? Utils.createStreamDetailsFromFile(avatar.get()) : null) {
accountManager.setVersionedProfile(account.getUuid(),
}
public List<DeviceInfo> getLinkedDevices() throws IOException {
- List<DeviceInfo> devices = accountManager.getDevices();
+ var devices = accountManager.getDevices();
account.setMultiDevice(devices.size() > 1);
account.save();
return devices;
public void removeLinkedDevices(int deviceId) throws IOException {
accountManager.removeDevice(deviceId);
- List<DeviceInfo> devices = accountManager.getDevices();
+ var devices = accountManager.getDevices();
account.setMultiDevice(devices.size() > 1);
account.save();
}
public void addDeviceLink(URI linkUri) throws IOException, InvalidKeyException {
- DeviceLinkInfo info = DeviceLinkInfo.parseDeviceLinkUri(linkUri);
+ var info = DeviceLinkInfo.parseDeviceLinkUri(linkUri);
addDevice(info.deviceIdentifier, info.deviceKey);
}
private void addDevice(String deviceIdentifier, ECPublicKey deviceKey) throws IOException, InvalidKeyException {
- IdentityKeyPair identityKeyPair = getIdentityKeyPair();
- String verificationCode = accountManager.getNewDeviceVerificationCode();
+ var identityKeyPair = getIdentityKeyPair();
+ var verificationCode = accountManager.getNewDeviceVerificationCode();
accountManager.addDevice(deviceIdentifier,
deviceKey,
throw new RuntimeException("Only master device can set a PIN");
}
if (pin.isPresent()) {
- final MasterKey masterKey = account.getPinMasterKey() != null
+ final var masterKey = account.getPinMasterKey() != null
? account.getPinMasterKey()
: KeyUtils.createMasterKey();
}
void refreshPreKeys() throws IOException {
- List<PreKeyRecord> oneTimePreKeys = generatePreKeys();
- final IdentityKeyPair identityKeyPair = getIdentityKeyPair();
- SignedPreKeyRecord signedPreKeyRecord = generateSignedPreKey(identityKeyPair);
+ var oneTimePreKeys = generatePreKeys();
+ final var identityKeyPair = getIdentityKeyPair();
+ var signedPreKeyRecord = generateSignedPreKey(identityKeyPair);
accountManager.setPreKeys(identityKeyPair.getPublicKey(), signedPreKeyRecord, oneTimePreKeys);
}
private List<PreKeyRecord> generatePreKeys() {
- final int offset = account.getPreKeyIdOffset();
+ final var offset = account.getPreKeyIdOffset();
- List<PreKeyRecord> records = KeyUtils.generatePreKeyRecords(offset, ServiceConfig.PREKEY_BATCH_SIZE);
+ var records = KeyUtils.generatePreKeyRecords(offset, ServiceConfig.PREKEY_BATCH_SIZE);
account.addPreKeys(records);
account.save();
}
private SignedPreKeyRecord generateSignedPreKey(IdentityKeyPair identityKeyPair) {
- final int signedPreKeyId = account.getNextSignedPreKeyId();
+ final var signedPreKeyId = account.getNextSignedPreKeyId();
- SignedPreKeyRecord record = KeyUtils.generateSignedPreKeyRecord(identityKeyPair, signedPreKeyId);
+ var record = KeyUtils.generateSignedPreKeyRecord(identityKeyPair, signedPreKeyId);
account.addSignedPreKey(record);
account.save();
private SignalProfile getRecipientProfile(
SignalServiceAddress address, boolean force
) {
- SignalProfileEntry profileEntry = account.getProfileStore().getProfileEntry(address);
+ var profileEntry = account.getProfileStore().getProfileEntry(address);
if (profileEntry == null) {
return null;
}
- long now = new Date().getTime();
+ var now = new Date().getTime();
// Profiles are cached for 24h before retrieving them again
if (!profileEntry.isRequestPending() && (
force
profileEntry.setRequestPending(false);
}
- final ProfileKey profileKey = profileEntry.getProfileKey();
- final SignalProfile profile = decryptProfileAndDownloadAvatar(address, profileKey, encryptedProfile);
+ final var profileKey = profileEntry.getProfileKey();
+ final var profile = decryptProfileAndDownloadAvatar(address, profileKey, encryptedProfile);
account.getProfileStore()
.updateProfile(address, profileKey, now, profile, profileEntry.getProfileKeyCredential());
return profile;
}
private ProfileKeyCredential getRecipientProfileKeyCredential(SignalServiceAddress address) {
- SignalProfileEntry profileEntry = account.getProfileStore().getProfileEntry(address);
+ var profileEntry = account.getProfileStore().getProfileEntry(address);
if (profileEntry == null) {
return null;
}
return null;
}
- long now = new Date().getTime();
- final ProfileKeyCredential profileKeyCredential = profileAndCredential.getProfileKeyCredential().orNull();
- final SignalProfile profile = decryptProfileAndDownloadAvatar(address,
+ var now = new Date().getTime();
+ final var profileKeyCredential = profileAndCredential.getProfileKeyCredential().orNull();
+ final var profile = decryptProfileAndDownloadAvatar(address,
profileEntry.getProfileKey(),
profileAndCredential.getProfile());
account.getProfileStore()
}
private Optional<SignalServiceAttachmentStream> createGroupAvatarAttachment(GroupId groupId) throws IOException {
- final StreamDetails streamDetails = avatarStore.retrieveGroupAvatar(groupId);
+ final var streamDetails = avatarStore.retrieveGroupAvatar(groupId);
if (streamDetails == null) {
return Optional.absent();
}
}
private Optional<SignalServiceAttachmentStream> createContactAvatarAttachment(SignalServiceAddress address) throws IOException {
- final StreamDetails streamDetails = avatarStore.retrieveContactAvatar(address);
+ final var streamDetails = avatarStore.retrieveContactAvatar(address);
if (streamDetails == null) {
return Optional.absent();
}
}
private GroupInfo getGroupForSending(GroupId groupId) throws GroupNotFoundException, NotAGroupMemberException {
- GroupInfo g = getGroup(groupId);
+ var g = getGroup(groupId);
if (g == null) {
throw new GroupNotFoundException(groupId);
}
}
private GroupInfo getGroupForUpdating(GroupId groupId) throws GroupNotFoundException, NotAGroupMemberException {
- GroupInfo g = getGroup(groupId);
+ var g = getGroup(groupId);
if (g == null) {
throw new GroupNotFoundException(groupId);
}
public Pair<Long, List<SendMessageResult>> sendGroupMessage(
String messageText, List<String> attachments, GroupId groupId
) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException {
- final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
- .withBody(messageText);
+ final var messageBuilder = SignalServiceDataMessage.newBuilder().withBody(messageText);
if (attachments != null) {
messageBuilder.withAttachments(AttachmentUtils.getSignalServiceAttachments(attachments));
}
public Pair<Long, List<SendMessageResult>> sendGroupMessageReaction(
String emoji, boolean remove, String targetAuthor, long targetSentTimestamp, GroupId groupId
) throws IOException, InvalidNumberException, NotAGroupMemberException, GroupNotFoundException {
- SignalServiceDataMessage.Reaction reaction = new SignalServiceDataMessage.Reaction(emoji,
+ var reaction = new SignalServiceDataMessage.Reaction(emoji,
remove,
canonicalizeAndResolveSignalServiceAddress(targetAuthor),
targetSentTimestamp);
- final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
- .withReaction(reaction);
+ final var messageBuilder = SignalServiceDataMessage.newBuilder().withReaction(reaction);
return sendGroupMessage(messageBuilder, groupId);
}
public Pair<Long, List<SendMessageResult>> sendGroupMessage(
SignalServiceDataMessage.Builder messageBuilder, GroupId groupId
) throws IOException, GroupNotFoundException, NotAGroupMemberException {
- final GroupInfo g = getGroupForSending(groupId);
+ final var g = getGroupForSending(groupId);
GroupUtils.setGroupContext(messageBuilder, g);
messageBuilder.withExpiration(g.getMessageExpirationTime());
public Pair<Long, List<SendMessageResult>> sendQuitGroupMessage(GroupId groupId) throws GroupNotFoundException, IOException, NotAGroupMemberException {
SignalServiceDataMessage.Builder messageBuilder;
- final GroupInfo g = getGroupForUpdating(groupId);
+ final var g = getGroupForUpdating(groupId);
if (g instanceof GroupInfoV1) {
- GroupInfoV1 groupInfoV1 = (GroupInfoV1) g;
- SignalServiceGroup group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.QUIT)
- .withId(groupId.serialize())
- .build();
+ var groupInfoV1 = (GroupInfoV1) g;
+ var group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.QUIT).withId(groupId.serialize()).build();
messageBuilder = SignalServiceDataMessage.newBuilder().asGroupMessage(group);
groupInfoV1.removeMember(account.getSelfAddress());
account.getGroupStore().updateGroup(groupInfoV1);
} else {
- final GroupInfoV2 groupInfoV2 = (GroupInfoV2) g;
- final Pair<DecryptedGroup, GroupChange> groupGroupChangePair = groupHelper.leaveGroup(groupInfoV2);
+ final var groupInfoV2 = (GroupInfoV2) g;
+ final var groupGroupChangePair = groupHelper.leaveGroup(groupInfoV2);
groupInfoV2.setGroup(groupGroupChangePair.first());
messageBuilder = getGroupUpdateMessageBuilder(groupInfoV2, groupGroupChangePair.second().toByteArray());
account.getGroupStore().updateGroup(groupInfoV2);
SignalServiceDataMessage.Builder messageBuilder;
if (groupId == null) {
// Create new group
- GroupInfoV2 gv2 = groupHelper.createGroupV2(name == null ? "" : name,
+ var gv2 = groupHelper.createGroupV2(name == null ? "" : name,
members == null ? List.of() : members,
avatarFile);
if (gv2 == null) {
- GroupInfoV1 gv1 = new GroupInfoV1(GroupIdV1.createRandom());
+ var gv1 = new GroupInfoV1(GroupIdV1.createRandom());
gv1.addMembers(List.of(account.getSelfAddress()));
updateGroupV1(gv1, name, members, avatarFile);
messageBuilder = getGroupUpdateMessageBuilder(gv1);
g = gv2;
}
} else {
- GroupInfo group = getGroupForUpdating(groupId);
+ var group = getGroupForUpdating(groupId);
if (group instanceof GroupInfoV2) {
- final GroupInfoV2 groupInfoV2 = (GroupInfoV2) group;
+ final var groupInfoV2 = (GroupInfoV2) group;
Pair<Long, List<SendMessageResult>> result = null;
if (groupInfoV2.isPendingMember(getSelfAddress())) {
- Pair<DecryptedGroup, GroupChange> groupGroupChangePair = groupHelper.acceptInvite(groupInfoV2);
+ var groupGroupChangePair = groupHelper.acceptInvite(groupInfoV2);
result = sendUpdateGroupMessage(groupInfoV2,
groupGroupChangePair.first(),
groupGroupChangePair.second());
}
if (members != null) {
- final Set<SignalServiceAddress> newMembers = new HashSet<>(members);
+ final var newMembers = new HashSet<>(members);
newMembers.removeAll(group.getMembers()
.stream()
.map(this::resolveSignalServiceAddress)
.collect(Collectors.toSet()));
if (newMembers.size() > 0) {
- Pair<DecryptedGroup, GroupChange> groupGroupChangePair = groupHelper.updateGroupV2(groupInfoV2,
- newMembers);
+ var groupGroupChangePair = groupHelper.updateGroupV2(groupInfoV2, newMembers);
result = sendUpdateGroupMessage(groupInfoV2,
groupGroupChangePair.first(),
groupGroupChangePair.second());
}
}
if (result == null || name != null || avatarFile != null) {
- Pair<DecryptedGroup, GroupChange> groupGroupChangePair = groupHelper.updateGroupV2(groupInfoV2,
- name,
- avatarFile);
+ var groupGroupChangePair = groupHelper.updateGroupV2(groupInfoV2, name, avatarFile);
if (avatarFile != null) {
avatarStore.storeGroupAvatar(groupInfoV2.getGroupId(),
outputStream -> IOUtils.copyFileToStream(avatarFile, outputStream));
return new Pair<>(group.getGroupId(), result.second());
} else {
- GroupInfoV1 gv1 = (GroupInfoV1) group;
+ var gv1 = (GroupInfoV1) group;
updateGroupV1(gv1, name, members, avatarFile);
messageBuilder = getGroupUpdateMessageBuilder(gv1);
g = gv1;
account.getGroupStore().updateGroup(g);
- final Pair<Long, List<SendMessageResult>> result = sendMessage(messageBuilder,
- g.getMembersIncludingPendingWithout(account.getSelfAddress()));
+ final var result = sendMessage(messageBuilder, g.getMembersIncludingPendingWithout(account.getSelfAddress()));
return new Pair<>(g.getGroupId(), result.second());
}
}
if (members != null) {
- final Set<String> newE164Members = new HashSet<>();
- for (SignalServiceAddress member : members) {
+ final var newE164Members = new HashSet<String>();
+ for (var member : members) {
if (g.isMember(member) || !member.getNumber().isPresent()) {
continue;
}
newE164Members.add(member.getNumber().get());
}
- final Map<String, UUID> registeredUsers = getRegisteredUsers(newE164Members);
+ final var registeredUsers = getRegisteredUsers(newE164Members);
if (registeredUsers.size() != newE164Members.size()) {
// Some of the new members are not registered on Signal
newE164Members.removeAll(registeredUsers.keySet());
private Pair<GroupId, List<SendMessageResult>> sendJoinGroupMessage(
GroupInviteLinkUrl inviteLinkUrl
) throws IOException, GroupLinkNotActiveException {
- final DecryptedGroupJoinInfo groupJoinInfo = groupHelper.getDecryptedGroupJoinInfo(inviteLinkUrl.getGroupMasterKey(),
+ final var groupJoinInfo = groupHelper.getDecryptedGroupJoinInfo(inviteLinkUrl.getGroupMasterKey(),
inviteLinkUrl.getPassword());
- final GroupChange groupChange = groupHelper.joinGroup(inviteLinkUrl.getGroupMasterKey(),
+ final var groupChange = groupHelper.joinGroup(inviteLinkUrl.getGroupMasterKey(),
inviteLinkUrl.getPassword(),
groupJoinInfo);
- final GroupInfoV2 group = getOrMigrateGroup(inviteLinkUrl.getGroupMasterKey(),
+ final var group = getOrMigrateGroup(inviteLinkUrl.getGroupMasterKey(),
groupJoinInfo.getRevision() + 1,
groupChange.toByteArray());
return new Pair<>(group.getGroupId(), List.of());
}
- final Pair<Long, List<SendMessageResult>> result = sendUpdateGroupMessage(group, group.getGroup(), groupChange);
+ final var result = sendUpdateGroupMessage(group, group.getGroup(), groupChange);
return new Pair<>(group.getGroupId(), result.second());
}
private GroupsV2AuthorizationString getGroupAuthForToday(
final GroupSecretParams groupSecretParams
) throws IOException {
- final int today = currentTimeDays();
+ final var today = currentTimeDays();
// Returns credentials for the next 7 days
- final HashMap<Integer, AuthCredentialResponse> credentials = groupsV2Api.getCredentials(today);
+ final var credentials = groupsV2Api.getCredentials(today);
// TODO cache credentials until they expire
- AuthCredentialResponse authCredentialResponse = credentials.get(today);
+ var authCredentialResponse = credentials.get(today);
try {
return groupsV2Api.getGroupsV2AuthorizationString(account.getUuid(),
today,
GroupInfoV2 group, DecryptedGroup newDecryptedGroup, GroupChange groupChange
) throws IOException {
group.setGroup(newDecryptedGroup);
- final SignalServiceDataMessage.Builder messageBuilder = getGroupUpdateMessageBuilder(group,
- groupChange.toByteArray());
+ final var messageBuilder = getGroupUpdateMessageBuilder(group, groupChange.toByteArray());
account.getGroupStore().updateGroup(group);
return sendMessage(messageBuilder, group.getMembersIncludingPendingWithout(account.getSelfAddress()));
}
GroupIdV1 groupId, SignalServiceAddress recipient
) throws IOException, NotAGroupMemberException, GroupNotFoundException, AttachmentInvalidException {
GroupInfoV1 g;
- GroupInfo group = getGroupForSending(groupId);
+ var group = getGroupForSending(groupId);
if (!(group instanceof GroupInfoV1)) {
throw new RuntimeException("Received an invalid group request for a v2 group!");
}
throw new NotAGroupMemberException(groupId, g.name);
}
- SignalServiceDataMessage.Builder messageBuilder = getGroupUpdateMessageBuilder(g);
+ var messageBuilder = getGroupUpdateMessageBuilder(g);
// Send group message only to the recipient who requested it
return sendMessage(messageBuilder, List.of(recipient));
}
private SignalServiceDataMessage.Builder getGroupUpdateMessageBuilder(GroupInfoV1 g) throws AttachmentInvalidException {
- SignalServiceGroup.Builder group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.UPDATE)
+ var group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.UPDATE)
.withId(g.getGroupId().serialize())
.withName(g.name)
.withMembers(new ArrayList<>(g.getMembers()));
try {
- final Optional<SignalServiceAttachmentStream> attachment = createGroupAvatarAttachment(g.getGroupId());
+ final var attachment = createGroupAvatarAttachment(g.getGroupId());
if (attachment.isPresent()) {
group.withAvatar(attachment.get());
}
}
private SignalServiceDataMessage.Builder getGroupUpdateMessageBuilder(GroupInfoV2 g, byte[] signedGroupChange) {
- SignalServiceGroupV2.Builder group = SignalServiceGroupV2.newBuilder(g.getMasterKey())
+ var group = SignalServiceGroupV2.newBuilder(g.getMasterKey())
.withRevision(g.getGroup().getRevision())
.withSignedGroupChange(signedGroupChange);
return SignalServiceDataMessage.newBuilder()
Pair<Long, List<SendMessageResult>> sendGroupInfoRequest(
GroupIdV1 groupId, SignalServiceAddress recipient
) throws IOException {
- SignalServiceGroup.Builder group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.REQUEST_INFO)
- .withId(groupId.serialize());
+ var group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.REQUEST_INFO).withId(groupId.serialize());
- SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
- .asGroupMessage(group.build());
+ var messageBuilder = SignalServiceDataMessage.newBuilder().asGroupMessage(group.build());
// Send group info request message to the recipient who sent us a message with this groupId
return sendMessage(messageBuilder, List.of(recipient));
void sendReceipt(
SignalServiceAddress remoteAddress, long messageId
) throws IOException, UntrustedIdentityException {
- SignalServiceReceiptMessage receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.DELIVERY,
+ var receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.DELIVERY,
List.of(messageId),
System.currentTimeMillis());
public Pair<Long, List<SendMessageResult>> sendMessage(
String messageText, List<String> attachments, List<String> recipients
) throws IOException, AttachmentInvalidException, InvalidNumberException {
- final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
- .withBody(messageText);
+ final var messageBuilder = SignalServiceDataMessage.newBuilder().withBody(messageText);
if (attachments != null) {
- List<SignalServiceAttachment> attachmentStreams = AttachmentUtils.getSignalServiceAttachments(attachments);
+ var attachmentStreams = AttachmentUtils.getSignalServiceAttachments(attachments);
// Upload attachments here, so we only upload once even for multiple recipients
- SignalServiceMessageSender messageSender = createMessageSender();
- List<SignalServiceAttachment> attachmentPointers = new ArrayList<>(attachmentStreams.size());
- for (SignalServiceAttachment attachment : attachmentStreams) {
+ var messageSender = createMessageSender();
+ var attachmentPointers = new ArrayList<SignalServiceAttachment>(attachmentStreams.size());
+ for (var attachment : attachmentStreams) {
if (attachment.isStream()) {
attachmentPointers.add(messageSender.uploadAttachment(attachment.asStream()));
} else if (attachment.isPointer()) {
public Pair<Long, SendMessageResult> sendSelfMessage(
String messageText, List<String> attachments
) throws IOException, AttachmentInvalidException {
- final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
- .withBody(messageText);
+ final var messageBuilder = SignalServiceDataMessage.newBuilder().withBody(messageText);
if (attachments != null) {
messageBuilder.withAttachments(AttachmentUtils.getSignalServiceAttachments(attachments));
}
public Pair<Long, List<SendMessageResult>> sendMessageReaction(
String emoji, boolean remove, String targetAuthor, long targetSentTimestamp, List<String> recipients
) throws IOException, InvalidNumberException {
- SignalServiceDataMessage.Reaction reaction = new SignalServiceDataMessage.Reaction(emoji,
+ var reaction = new SignalServiceDataMessage.Reaction(emoji,
remove,
canonicalizeAndResolveSignalServiceAddress(targetAuthor),
targetSentTimestamp);
- final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
- .withReaction(reaction);
+ final var messageBuilder = SignalServiceDataMessage.newBuilder().withReaction(reaction);
return sendMessage(messageBuilder, getSignalServiceAddresses(recipients));
}
public Pair<Long, List<SendMessageResult>> sendEndSessionMessage(List<String> recipients) throws IOException, InvalidNumberException {
- SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder().asEndSessionMessage();
+ var messageBuilder = SignalServiceDataMessage.newBuilder().asEndSessionMessage();
- final Collection<SignalServiceAddress> signalServiceAddresses = getSignalServiceAddresses(recipients);
+ final var signalServiceAddresses = getSignalServiceAddresses(recipients);
try {
return sendMessage(messageBuilder, signalServiceAddresses);
} catch (Exception e) {
- for (SignalServiceAddress address : signalServiceAddresses) {
+ for (var address : signalServiceAddresses) {
handleEndSession(address);
}
account.save();
}
public String getContactName(String number) throws InvalidNumberException {
- ContactInfo contact = account.getContactStore().getContact(canonicalizeAndResolveSignalServiceAddress(number));
+ var contact = account.getContactStore().getContact(canonicalizeAndResolveSignalServiceAddress(number));
if (contact == null) {
return "";
} else {
}
public void setContactName(String number, String name) throws InvalidNumberException {
- final SignalServiceAddress address = canonicalizeAndResolveSignalServiceAddress(number);
- ContactInfo contact = account.getContactStore().getContact(address);
+ final var address = canonicalizeAndResolveSignalServiceAddress(number);
+ var contact = account.getContactStore().getContact(address);
if (contact == null) {
contact = new ContactInfo(address);
}
}
private void setContactBlocked(SignalServiceAddress address, boolean blocked) {
- ContactInfo contact = account.getContactStore().getContact(address);
+ var contact = account.getContactStore().getContact(address);
if (contact == null) {
contact = new ContactInfo(address);
}
}
public void setGroupBlocked(final GroupId groupId, final boolean blocked) throws GroupNotFoundException {
- GroupInfo group = getGroup(groupId);
+ var group = getGroup(groupId);
if (group == null) {
throw new GroupNotFoundException(groupId);
}
* Change the expiration timer for a contact
*/
public void setExpirationTimer(SignalServiceAddress address, int messageExpirationTimer) throws IOException {
- ContactInfo contact = account.getContactStore().getContact(address);
+ var contact = account.getContactStore().getContact(address);
contact.messageExpirationTime = messageExpirationTimer;
account.getContactStore().updateContact(contact);
sendExpirationTimerUpdate(address);
}
private void sendExpirationTimerUpdate(SignalServiceAddress address) throws IOException {
- final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
- .asExpirationUpdate();
+ final var messageBuilder = SignalServiceDataMessage.newBuilder().asExpirationUpdate();
sendMessage(messageBuilder, List.of(address));
}
public void setExpirationTimer(
String number, int messageExpirationTimer
) throws IOException, InvalidNumberException {
- SignalServiceAddress address = canonicalizeAndResolveSignalServiceAddress(number);
+ var address = canonicalizeAndResolveSignalServiceAddress(number);
setExpirationTimer(address, messageExpirationTimer);
}
* Change the expiration timer for a group
*/
public void setExpirationTimer(GroupId groupId, int messageExpirationTimer) {
- GroupInfo g = getGroup(groupId);
+ var g = getGroup(groupId);
if (g instanceof GroupInfoV1) {
- GroupInfoV1 groupInfoV1 = (GroupInfoV1) g;
+ var groupInfoV1 = (GroupInfoV1) g;
groupInfoV1.messageExpirationTime = messageExpirationTimer;
account.getGroupStore().updateGroup(groupInfoV1);
} else {
* @return if successful, returns the URL to install the sticker pack in the signal app
*/
public String uploadStickerPack(File path) throws IOException, StickerPackInvalidException {
- SignalServiceStickerManifestUpload manifest = StickerUtils.getSignalServiceStickerManifestUpload(path);
+ var manifest = StickerUtils.getSignalServiceStickerManifestUpload(path);
- SignalServiceMessageSender messageSender = createMessageSender();
+ var messageSender = createMessageSender();
- byte[] packKey = KeyUtils.createStickerUploadKey();
- String packId = messageSender.uploadStickerManifest(manifest, packKey);
+ var packKey = KeyUtils.createStickerUploadKey();
+ var packId = messageSender.uploadStickerManifest(manifest, packKey);
- Sticker sticker = new Sticker(Hex.fromStringCondensed(packId), packKey);
+ var sticker = new Sticker(Hex.fromStringCondensed(packId), packKey);
account.getStickerStore().updateSticker(sticker);
account.save();
}
void requestSyncGroups() throws IOException {
- SignalServiceProtos.SyncMessage.Request r = SignalServiceProtos.SyncMessage.Request.newBuilder()
+ var r = SignalServiceProtos.SyncMessage.Request.newBuilder()
.setType(SignalServiceProtos.SyncMessage.Request.Type.GROUPS)
.build();
- SignalServiceSyncMessage message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
+ var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
try {
sendSyncMessage(message);
} catch (UntrustedIdentityException e) {
}
void requestSyncContacts() throws IOException {
- SignalServiceProtos.SyncMessage.Request r = SignalServiceProtos.SyncMessage.Request.newBuilder()
+ var r = SignalServiceProtos.SyncMessage.Request.newBuilder()
.setType(SignalServiceProtos.SyncMessage.Request.Type.CONTACTS)
.build();
- SignalServiceSyncMessage message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
+ var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
try {
sendSyncMessage(message);
} catch (UntrustedIdentityException e) {
}
void requestSyncBlocked() throws IOException {
- SignalServiceProtos.SyncMessage.Request r = SignalServiceProtos.SyncMessage.Request.newBuilder()
+ var r = SignalServiceProtos.SyncMessage.Request.newBuilder()
.setType(SignalServiceProtos.SyncMessage.Request.Type.BLOCKED)
.build();
- SignalServiceSyncMessage message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
+ var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
try {
sendSyncMessage(message);
} catch (UntrustedIdentityException e) {
}
void requestSyncConfiguration() throws IOException {
- SignalServiceProtos.SyncMessage.Request r = SignalServiceProtos.SyncMessage.Request.newBuilder()
+ var r = SignalServiceProtos.SyncMessage.Request.newBuilder()
.setType(SignalServiceProtos.SyncMessage.Request.Type.CONFIGURATION)
.build();
- SignalServiceSyncMessage message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
+ var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
try {
sendSyncMessage(message);
} catch (UntrustedIdentityException e) {
}
void requestSyncKeys() throws IOException {
- SignalServiceProtos.SyncMessage.Request r = SignalServiceProtos.SyncMessage.Request.newBuilder()
+ var r = SignalServiceProtos.SyncMessage.Request.newBuilder()
.setType(SignalServiceProtos.SyncMessage.Request.Type.KEYS)
.build();
- SignalServiceSyncMessage message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
+ var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
try {
sendSyncMessage(message);
} catch (UntrustedIdentityException e) {
}
private void sendSyncMessage(SignalServiceSyncMessage message) throws IOException, UntrustedIdentityException {
- SignalServiceMessageSender messageSender = createMessageSender();
+ var messageSender = createMessageSender();
try {
messageSender.sendMessage(message, unidentifiedAccessHelper.getAccessForSync());
} catch (UntrustedIdentityException e) {
}
private Collection<SignalServiceAddress> getSignalServiceAddresses(Collection<String> numbers) throws InvalidNumberException {
- final Set<SignalServiceAddress> signalServiceAddresses = new HashSet<>(numbers.size());
- final Set<SignalServiceAddress> addressesMissingUuid = new HashSet<>();
+ final var signalServiceAddresses = new HashSet<SignalServiceAddress>(numbers.size());
+ final var addressesMissingUuid = new HashSet<SignalServiceAddress>();
- for (String number : numbers) {
- final SignalServiceAddress resolvedAddress = canonicalizeAndResolveSignalServiceAddress(number);
+ for (var number : numbers) {
+ final var resolvedAddress = canonicalizeAndResolveSignalServiceAddress(number);
if (resolvedAddress.getUuid().isPresent()) {
signalServiceAddresses.add(resolvedAddress);
} else {
}
}
- final Set<String> numbersMissingUuid = addressesMissingUuid.stream()
+ final var numbersMissingUuid = addressesMissingUuid.stream()
.map(a -> a.getNumber().get())
.collect(Collectors.toSet());
Map<String, UUID> registeredUsers;
registeredUsers = Map.of();
}
- for (SignalServiceAddress address : addressesMissingUuid) {
- final String number = address.getNumber().get();
+ for (var address : addressesMissingUuid) {
+ final var number = address.getNumber().get();
if (registeredUsers.containsKey(number)) {
- final SignalServiceAddress newAddress = resolveSignalServiceAddress(new SignalServiceAddress(
- registeredUsers.get(number),
+ final var newAddress = resolveSignalServiceAddress(new SignalServiceAddress(registeredUsers.get(number),
number));
signalServiceAddresses.add(newAddress);
} else {
SignalServiceDataMessage.Builder messageBuilder, Collection<SignalServiceAddress> recipients
) throws IOException {
recipients = recipients.stream().map(this::resolveSignalServiceAddress).collect(Collectors.toSet());
- final long timestamp = System.currentTimeMillis();
+ final var timestamp = System.currentTimeMillis();
messageBuilder.withTimestamp(timestamp);
getOrCreateMessagePipe();
getOrCreateUnidentifiedMessagePipe();
message = messageBuilder.build();
if (message.getGroupContext().isPresent()) {
try {
- SignalServiceMessageSender messageSender = createMessageSender();
- final boolean isRecipientUpdate = false;
- List<SendMessageResult> result = messageSender.sendMessage(new ArrayList<>(recipients),
+ var messageSender = createMessageSender();
+ final var isRecipientUpdate = false;
+ var result = messageSender.sendMessage(new ArrayList<>(recipients),
unidentifiedAccessHelper.getAccessFor(recipients),
isRecipientUpdate,
message);
- for (SendMessageResult r : result) {
+ for (var r : result) {
if (r.getIdentityFailure() != null) {
account.getSignalProtocolStore()
.saveIdentity(r.getAddress(),
} else {
// Send to all individually, so sync messages are sent correctly
messageBuilder.withProfileKey(account.getProfileKey().serialize());
- List<SendMessageResult> results = new ArrayList<>(recipients.size());
- for (SignalServiceAddress address : recipients) {
- final ContactInfo contact = account.getContactStore().getContact(address);
- final int expirationTime = contact != null ? contact.messageExpirationTime : 0;
+ var results = new ArrayList<SendMessageResult>(recipients.size());
+ for (var address : recipients) {
+ final var contact = account.getContactStore().getContact(address);
+ final var expirationTime = contact != null ? contact.messageExpirationTime : 0;
messageBuilder.withExpiration(expirationTime);
message = messageBuilder.build();
results.add(sendMessage(address, message));
}
} finally {
if (message != null && message.isEndSession()) {
- for (SignalServiceAddress recipient : recipients) {
+ for (var recipient : recipients) {
handleEndSession(recipient);
}
}
private Pair<Long, SendMessageResult> sendSelfMessage(
SignalServiceDataMessage.Builder messageBuilder
) throws IOException {
- final long timestamp = System.currentTimeMillis();
+ final var timestamp = System.currentTimeMillis();
messageBuilder.withTimestamp(timestamp);
getOrCreateMessagePipe();
getOrCreateUnidentifiedMessagePipe();
try {
- final SignalServiceAddress address = getSelfAddress();
+ final var address = getSelfAddress();
- final ContactInfo contact = account.getContactStore().getContact(address);
- final int expirationTime = contact != null ? contact.messageExpirationTime : 0;
+ final var contact = account.getContactStore().getContact(address);
+ final var expirationTime = contact != null ? contact.messageExpirationTime : 0;
messageBuilder.withExpiration(expirationTime);
- SignalServiceDataMessage message = messageBuilder.build();
- final SendMessageResult result = sendSelfMessage(message);
+ var message = messageBuilder.build();
+ final var result = sendSelfMessage(message);
return new Pair<>(timestamp, result);
} finally {
account.save();
}
private SendMessageResult sendSelfMessage(SignalServiceDataMessage message) throws IOException {
- SignalServiceMessageSender messageSender = createMessageSender();
+ var messageSender = createMessageSender();
- SignalServiceAddress recipient = account.getSelfAddress();
+ var recipient = account.getSelfAddress();
- final Optional<UnidentifiedAccessPair> unidentifiedAccess = unidentifiedAccessHelper.getAccessFor(recipient);
- SentTranscriptMessage transcript = new SentTranscriptMessage(Optional.of(recipient),
+ final var unidentifiedAccess = unidentifiedAccessHelper.getAccessFor(recipient);
+ var transcript = new SentTranscriptMessage(Optional.of(recipient),
message.getTimestamp(),
message,
message.getExpiresInSeconds(),
Map.of(recipient, unidentifiedAccess.isPresent()),
false);
- SignalServiceSyncMessage syncMessage = SignalServiceSyncMessage.forSentTranscript(transcript);
+ var syncMessage = SignalServiceSyncMessage.forSentTranscript(transcript);
try {
- long startTime = System.currentTimeMillis();
+ var startTime = System.currentTimeMillis();
messageSender.sendMessage(syncMessage, unidentifiedAccess);
return SendMessageResult.success(recipient,
unidentifiedAccess.isPresent(),
private SendMessageResult sendMessage(
SignalServiceAddress address, SignalServiceDataMessage message
) throws IOException {
- SignalServiceMessageSender messageSender = createMessageSender();
+ var messageSender = createMessageSender();
try {
return messageSender.sendMessage(address, unidentifiedAccessHelper.getAccessFor(address), message);
}
private SignalServiceContent decryptMessage(SignalServiceEnvelope envelope) throws InvalidMetadataMessageException, ProtocolInvalidMessageException, ProtocolDuplicateMessageException, ProtocolLegacyMessageException, ProtocolInvalidKeyIdException, InvalidMetadataVersionException, ProtocolInvalidVersionException, ProtocolNoSessionException, ProtocolInvalidKeyException, SelfSendException, UnsupportedDataMessageException, org.whispersystems.libsignal.UntrustedIdentityException {
- SignalServiceCipher cipher = new SignalServiceCipher(account.getSelfAddress(),
+ var cipher = new SignalServiceCipher(account.getSelfAddress(),
account.getSignalProtocolStore(),
certificateValidator);
try {
return cipher.decrypt(envelope);
} catch (ProtocolUntrustedIdentityException e) {
if (e.getCause() instanceof org.whispersystems.libsignal.UntrustedIdentityException) {
- org.whispersystems.libsignal.UntrustedIdentityException identityException = (org.whispersystems.libsignal.UntrustedIdentityException) e
- .getCause();
- final IdentityKey untrustedIdentity = identityException.getUntrustedIdentity();
+ var identityException = (org.whispersystems.libsignal.UntrustedIdentityException) e.getCause();
+ final var untrustedIdentity = identityException.getUntrustedIdentity();
if (untrustedIdentity != null) {
account.getSignalProtocolStore()
.saveIdentity(resolveSignalServiceAddress(identityException.getName()),
SignalServiceAddress destination,
boolean ignoreAttachments
) {
- List<HandleAction> actions = new ArrayList<>();
+ var actions = new ArrayList<HandleAction>();
if (message.getGroupContext().isPresent()) {
if (message.getGroupContext().get().getGroupV1().isPresent()) {
- SignalServiceGroup groupInfo = message.getGroupContext().get().getGroupV1().get();
- GroupIdV1 groupId = GroupId.v1(groupInfo.getGroupId());
- GroupInfo group = getGroup(groupId);
+ var groupInfo = message.getGroupContext().get().getGroupV1().get();
+ var groupId = GroupId.v1(groupInfo.getGroupId());
+ var group = getGroup(groupId);
if (group == null || group instanceof GroupInfoV1) {
- GroupInfoV1 groupV1 = (GroupInfoV1) group;
+ var groupV1 = (GroupInfoV1) group;
switch (groupInfo.getType()) {
case UPDATE: {
if (groupV1 == null) {
}
if (groupInfo.getAvatar().isPresent()) {
- SignalServiceAttachment avatar = groupInfo.getAvatar().get();
+ var avatar = groupInfo.getAvatar().get();
downloadGroupAvatar(avatar, groupV1.getGroupId());
}
}
}
if (message.getGroupContext().get().getGroupV2().isPresent()) {
- final SignalServiceGroupV2 groupContext = message.getGroupContext().get().getGroupV2().get();
- final GroupMasterKey groupMasterKey = groupContext.getMasterKey();
+ final var groupContext = message.getGroupContext().get().getGroupV2().get();
+ final var groupMasterKey = groupContext.getMasterKey();
getOrMigrateGroup(groupMasterKey,
groupContext.getRevision(),
}
}
- final SignalServiceAddress conversationPartnerAddress = isSync ? destination : source;
+ final var conversationPartnerAddress = isSync ? destination : source;
if (conversationPartnerAddress != null && message.isEndSession()) {
handleEndSession(conversationPartnerAddress);
}
if (message.isExpirationUpdate() || message.getBody().isPresent()) {
if (message.getGroupContext().isPresent()) {
if (message.getGroupContext().get().getGroupV1().isPresent()) {
- SignalServiceGroup groupInfo = message.getGroupContext().get().getGroupV1().get();
- GroupInfoV1 group = account.getGroupStore().getOrCreateGroupV1(GroupId.v1(groupInfo.getGroupId()));
+ var groupInfo = message.getGroupContext().get().getGroupV1().get();
+ var group = account.getGroupStore().getOrCreateGroupV1(GroupId.v1(groupInfo.getGroupId()));
if (group != null) {
if (group.messageExpirationTime != message.getExpiresInSeconds()) {
group.messageExpirationTime = message.getExpiresInSeconds();
// disappearing message timer already stored in the DecryptedGroup
}
} else if (conversationPartnerAddress != null) {
- ContactInfo contact = account.getContactStore().getContact(conversationPartnerAddress);
+ var contact = account.getContactStore().getContact(conversationPartnerAddress);
if (contact == null) {
contact = new ContactInfo(conversationPartnerAddress);
}
}
if (!ignoreAttachments) {
if (message.getAttachments().isPresent()) {
- for (SignalServiceAttachment attachment : message.getAttachments().get()) {
+ for (var attachment : message.getAttachments().get()) {
downloadAttachment(attachment);
}
}
if (message.getSharedContacts().isPresent()) {
- for (SharedContact contact : message.getSharedContacts().get()) {
+ for (var contact : message.getSharedContacts().get()) {
if (contact.getAvatar().isPresent()) {
downloadAttachment(contact.getAvatar().get().getAttachment());
}
this.account.getProfileStore().storeProfileKey(source, profileKey);
}
if (message.getPreviews().isPresent()) {
- final List<SignalServiceDataMessage.Preview> previews = message.getPreviews().get();
- for (SignalServiceDataMessage.Preview preview : previews) {
+ final var previews = message.getPreviews().get();
+ for (var preview : previews) {
if (preview.getImage().isPresent()) {
downloadAttachment(preview.getImage().get());
}
}
}
if (message.getQuote().isPresent()) {
- final SignalServiceDataMessage.Quote quote = message.getQuote().get();
+ final var quote = message.getQuote().get();
- for (SignalServiceDataMessage.Quote.QuotedAttachment quotedAttachment : quote.getAttachments()) {
- final SignalServiceAttachment thumbnail = quotedAttachment.getThumbnail();
+ for (var quotedAttachment : quote.getAttachments()) {
+ final var thumbnail = quotedAttachment.getThumbnail();
if (thumbnail != null) {
downloadAttachment(thumbnail);
}
}
}
if (message.getSticker().isPresent()) {
- final SignalServiceDataMessage.Sticker messageSticker = message.getSticker().get();
- Sticker sticker = account.getStickerStore().getSticker(messageSticker.getPackId());
+ final var messageSticker = message.getSticker().get();
+ var sticker = account.getStickerStore().getSticker(messageSticker.getPackId());
if (sticker == null) {
sticker = new Sticker(messageSticker.getPackId(), messageSticker.getPackKey());
account.getStickerStore().updateSticker(sticker);
private GroupInfoV2 getOrMigrateGroup(
final GroupMasterKey groupMasterKey, final int revision, final byte[] signedGroupChange
) {
- final GroupSecretParams groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey);
+ final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey);
- GroupIdV2 groupId = GroupUtils.getGroupIdV2(groupSecretParams);
- GroupInfo groupInfo = getGroup(groupId);
+ 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
}
if (group != null) {
storeProfileKeysFromMembers(group);
- final String avatar = group.getAvatar();
+ final var avatar = group.getAvatar();
if (avatar != null && !avatar.isEmpty()) {
downloadGroupAvatar(groupId, groupSecretParams, avatar);
}
}
private void storeProfileKeysFromMembers(final DecryptedGroup group) {
- for (DecryptedMember member : group.getMembersList()) {
- final SignalServiceAddress address = resolveSignalServiceAddress(new SignalServiceAddress(UuidUtil.parseOrThrow(
- member.getUuid().toByteArray()), null));
+ for (var member : group.getMembersList()) {
+ final var address = resolveSignalServiceAddress(new SignalServiceAddress(UuidUtil.parseOrThrow(member.getUuid()
+ .toByteArray()), null));
try {
account.getProfileStore()
.storeProfileKey(address, new ProfileKey(member.getProfileKey().toByteArray()));
}
private void retryFailedReceivedMessages(ReceiveMessageHandler handler, boolean ignoreAttachments) {
- for (CachedMessage cachedMessage : account.getMessageCache().getCachedMessages()) {
+ for (var cachedMessage : account.getMessageCache().getCachedMessages()) {
retryFailedReceivedMessage(handler, ignoreAttachments, cachedMessage);
}
}
private void retryFailedReceivedMessage(
final ReceiveMessageHandler handler, final boolean ignoreAttachments, final CachedMessage cachedMessage
) {
- SignalServiceEnvelope envelope = cachedMessage.loadEnvelope();
+ var envelope = cachedMessage.loadEnvelope();
if (envelope == null) {
return;
}
cachedMessage.delete();
return;
}
- List<HandleAction> actions = handleMessage(envelope, content, ignoreAttachments);
- for (HandleAction action : actions) {
+ var actions = handleMessage(envelope, content, ignoreAttachments);
+ for (var action : actions) {
try {
action.execute(this);
} catch (Throwable e) {
Set<HandleAction> queuedActions = null;
- final SignalServiceMessagePipe messagePipe = getOrCreateMessagePipe();
+ final var messagePipe = getOrCreateMessagePipe();
- boolean hasCaughtUpWithOldMessages = false;
+ var hasCaughtUpWithOldMessages = false;
while (true) {
SignalServiceEnvelope envelope;
Exception exception = null;
final CachedMessage[] cachedMessage = {null};
try {
- Optional<SignalServiceEnvelope> result = messagePipe.readOrEmpty(timeout, unit, envelope1 -> {
+ var result = messagePipe.readOrEmpty(timeout, unit, envelope1 -> {
// store message on disk, before acknowledging receipt to the server
cachedMessage[0] = account.getMessageCache().cacheMessage(envelope1);
});
hasCaughtUpWithOldMessages = true;
if (queuedActions != null) {
- for (HandleAction action : queuedActions) {
+ for (var action : queuedActions) {
try {
action.execute(this);
} catch (Throwable e) {
if (envelope.hasSource()) {
// Store uuid if we don't have it already
- SignalServiceAddress source = envelope.getSourceAddress();
+ var source = envelope.getSourceAddress();
resolveSignalServiceAddress(source);
}
if (!envelope.isReceipt()) {
} catch (Exception e) {
exception = e;
}
- List<HandleAction> actions = handleMessage(envelope, content, ignoreAttachments);
+ var actions = handleMessage(envelope, content, ignoreAttachments);
if (hasCaughtUpWithOldMessages) {
- for (HandleAction action : actions) {
+ for (var action : actions) {
try {
action.execute(this);
} catch (Throwable e) {
} else {
return false;
}
- ContactInfo sourceContact = account.getContactStore().getContact(source);
+ var sourceContact = account.getContactStore().getContact(source);
if (sourceContact != null && sourceContact.blocked) {
return true;
}
if (content != null && content.getDataMessage().isPresent()) {
- SignalServiceDataMessage message = content.getDataMessage().get();
+ var message = content.getDataMessage().get();
if (message.getGroupContext().isPresent()) {
- GroupId groupId = GroupUtils.getGroupId(message.getGroupContext().get());
- GroupInfo group = getGroup(groupId);
+ var groupId = GroupUtils.getGroupId(message.getGroupContext().get());
+ var group = getGroup(groupId);
if (group != null && group.isBlocked()) {
return true;
}
}
if (content != null && content.getDataMessage().isPresent()) {
- SignalServiceDataMessage message = content.getDataMessage().get();
+ var message = content.getDataMessage().get();
if (message.getGroupContext().isPresent()) {
if (message.getGroupContext().get().getGroupV1().isPresent()) {
- SignalServiceGroup groupInfo = message.getGroupContext().get().getGroupV1().get();
+ var groupInfo = message.getGroupContext().get().getGroupV1().get();
if (groupInfo.getType() == SignalServiceGroup.Type.QUIT) {
return false;
}
}
- GroupId groupId = GroupUtils.getGroupId(message.getGroupContext().get());
- GroupInfo group = getGroup(groupId);
+ var groupId = GroupUtils.getGroupId(message.getGroupContext().get());
+ var group = getGroup(groupId);
if (group != null && !group.isMember(source)) {
return true;
}
private List<HandleAction> handleMessage(
SignalServiceEnvelope envelope, SignalServiceContent content, boolean ignoreAttachments
) {
- List<HandleAction> actions = new ArrayList<>();
+ var actions = new ArrayList<HandleAction>();
if (content != null) {
final SignalServiceAddress sender;
if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
resolveSignalServiceAddress(sender);
if (content.getDataMessage().isPresent()) {
- SignalServiceDataMessage message = content.getDataMessage().get();
+ var message = content.getDataMessage().get();
if (content.isNeedsReceipt()) {
actions.add(new SendReceiptAction(sender, message.getTimestamp()));
}
if (content.getSyncMessage().isPresent()) {
account.setMultiDevice(true);
- SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();
+ var syncMessage = content.getSyncMessage().get();
if (syncMessage.getSent().isPresent()) {
- SentTranscriptMessage message = syncMessage.getSent().get();
- final SignalServiceAddress destination = message.getDestination().orNull();
+ var message = syncMessage.getSent().get();
+ final var destination = message.getDestination().orNull();
actions.addAll(handleSignalServiceDataMessage(message.getMessage(),
true,
sender,
ignoreAttachments));
}
if (syncMessage.getRequest().isPresent()) {
- RequestMessage rm = syncMessage.getRequest().get();
+ var rm = syncMessage.getRequest().get();
if (rm.isContactsRequest()) {
actions.add(SendSyncContactsAction.create());
}
File tmpFile = null;
try {
tmpFile = IOUtils.createTempFile();
- final SignalServiceAttachment groupsMessage = syncMessage.getGroups().get();
- try (InputStream attachmentAsStream = retrieveAttachmentAsStream(groupsMessage.asPointer(),
- tmpFile)) {
- DeviceGroupsInputStream s = new DeviceGroupsInputStream(attachmentAsStream);
+ final var groupsMessage = syncMessage.getGroups().get();
+ try (var attachmentAsStream = retrieveAttachmentAsStream(groupsMessage.asPointer(), tmpFile)) {
+ var s = new DeviceGroupsInputStream(attachmentAsStream);
DeviceGroup g;
while ((g = s.read()) != null) {
- GroupInfoV1 syncGroup = account.getGroupStore()
- .getOrCreateGroupV1(GroupId.v1(g.getId()));
+ var syncGroup = account.getGroupStore().getOrCreateGroupV1(GroupId.v1(g.getId()));
if (syncGroup != null) {
if (g.getName().isPresent()) {
syncGroup.name = g.getName().get();
}
}
if (syncMessage.getBlockedList().isPresent()) {
- final BlockedListMessage blockedListMessage = syncMessage.getBlockedList().get();
- for (SignalServiceAddress address : blockedListMessage.getAddresses()) {
+ final var blockedListMessage = syncMessage.getBlockedList().get();
+ for (var address : blockedListMessage.getAddresses()) {
setContactBlocked(resolveSignalServiceAddress(address), true);
}
- for (GroupId groupId : blockedListMessage.getGroupIds()
+ for (var groupId : blockedListMessage.getGroupIds()
.stream()
.map(GroupId::unknownVersion)
.collect(Collectors.toSet())) {
File tmpFile = null;
try {
tmpFile = IOUtils.createTempFile();
- final ContactsMessage contactsMessage = syncMessage.getContacts().get();
- try (InputStream attachmentAsStream = retrieveAttachmentAsStream(contactsMessage.getContactsStream()
+ final var contactsMessage = syncMessage.getContacts().get();
+ try (var attachmentAsStream = retrieveAttachmentAsStream(contactsMessage.getContactsStream()
.asPointer(), tmpFile)) {
- DeviceContactsInputStream s = new DeviceContactsInputStream(attachmentAsStream);
+ var s = new DeviceContactsInputStream(attachmentAsStream);
if (contactsMessage.isComplete()) {
account.getContactStore().clear();
}
if (c.getAddress().matches(account.getSelfAddress()) && c.getProfileKey().isPresent()) {
account.setProfileKey(c.getProfileKey().get());
}
- final SignalServiceAddress address = resolveSignalServiceAddress(c.getAddress());
- ContactInfo contact = account.getContactStore().getContact(address);
+ final var address = resolveSignalServiceAddress(c.getAddress());
+ var contact = account.getContactStore().getContact(address);
if (contact == null) {
contact = new ContactInfo(address);
}
account.getProfileStore().storeProfileKey(address, c.getProfileKey().get());
}
if (c.getVerified().isPresent()) {
- final VerifiedMessage verifiedMessage = c.getVerified().get();
+ final var verifiedMessage = c.getVerified().get();
account.getSignalProtocolStore()
.setIdentityTrustLevel(verifiedMessage.getDestination(),
verifiedMessage.getIdentityKey(),
}
}
if (syncMessage.getVerified().isPresent()) {
- final VerifiedMessage verifiedMessage = syncMessage.getVerified().get();
+ final var verifiedMessage = syncMessage.getVerified().get();
account.getSignalProtocolStore()
.setIdentityTrustLevel(resolveSignalServiceAddress(verifiedMessage.getDestination()),
verifiedMessage.getIdentityKey(),
TrustLevel.fromVerifiedState(verifiedMessage.getVerified()));
}
if (syncMessage.getStickerPackOperations().isPresent()) {
- final List<StickerPackOperationMessage> stickerPackOperationMessages = syncMessage.getStickerPackOperations()
- .get();
- for (StickerPackOperationMessage m : stickerPackOperationMessages) {
+ final var stickerPackOperationMessages = syncMessage.getStickerPackOperations().get();
+ for (var m : stickerPackOperationMessages) {
if (!m.getPackId().isPresent()) {
continue;
}
- Sticker sticker = account.getStickerStore().getSticker(m.getPackId().get());
+ var sticker = account.getStickerStore().getSticker(m.getPackId().get());
if (sticker == null) {
if (!m.getPackKey().isPresent()) {
continue;
}
}
if (syncMessage.getKeys().isPresent()) {
- final KeysMessage keysMessage = syncMessage.getKeys().get();
+ final var keysMessage = syncMessage.getKeys().get();
if (keysMessage.getStorageService().isPresent()) {
- final StorageKey storageKey = keysMessage.getStorageService().get();
+ final var storageKey = keysMessage.getStorageService().get();
account.setStorageKey(storageKey);
}
}
logger.warn("Invalid state, can't store an attachment stream.");
}
- SignalServiceAttachmentPointer pointer = attachment.asPointer();
+ var pointer = attachment.asPointer();
if (pointer.getPreview().isPresent()) {
- final byte[] preview = pointer.getPreview().get();
+ final var preview = pointer.getPreview().get();
try {
attachmentStore.storeAttachmentPreview(pointer.getRemoteId(),
outputStream -> outputStream.write(preview, 0, preview.length));
private void retrieveGroupV2Avatar(
GroupSecretParams groupSecretParams, String cdnKey, OutputStream outputStream
) throws IOException {
- GroupsV2Operations.GroupOperations groupOperations = groupsV2Operations.forGroup(groupSecretParams);
+ var groupOperations = groupsV2Operations.forGroup(groupSecretParams);
- File tmpFile = IOUtils.createTempFile();
+ var tmpFile = IOUtils.createTempFile();
try (InputStream input = messageReceiver.retrieveGroupsV2ProfileAvatar(cdnKey,
tmpFile,
ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE)) {
- byte[] encryptedData = IOUtils.readFully(input);
+ var encryptedData = IOUtils.readFully(input);
- byte[] decryptedData = groupOperations.decryptAvatar(encryptedData);
+ var decryptedData = groupOperations.decryptAvatar(encryptedData);
outputStream.write(decryptedData);
} finally {
try {
private void retrieveProfileAvatar(
String avatarPath, ProfileKey profileKey, OutputStream outputStream
) throws IOException {
- File tmpFile = IOUtils.createTempFile();
- try (InputStream input = messageReceiver.retrieveProfileAvatar(avatarPath,
+ var tmpFile = IOUtils.createTempFile();
+ try (var input = messageReceiver.retrieveProfileAvatar(avatarPath,
tmpFile,
profileKey,
ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE)) {
final SignalServiceAttachment attachment, final OutputStream outputStream
) throws IOException {
if (attachment.isPointer()) {
- SignalServiceAttachmentPointer pointer = attachment.asPointer();
+ var pointer = attachment.asPointer();
retrieveAttachmentPointer(pointer, outputStream);
} else {
- SignalServiceAttachmentStream stream = attachment.asStream();
+ var stream = attachment.asStream();
IOUtils.copyStream(stream.getInputStream(), outputStream);
}
}
private void retrieveAttachmentPointer(
SignalServiceAttachmentPointer pointer, OutputStream outputStream
) throws IOException {
- File tmpFile = IOUtils.createTempFile();
- try (InputStream input = retrieveAttachmentAsStream(pointer, tmpFile)) {
+ var tmpFile = IOUtils.createTempFile();
+ try (var input = retrieveAttachmentAsStream(pointer, tmpFile)) {
IOUtils.copyStream(input, outputStream);
} catch (MissingConfigurationException | InvalidMessageException e) {
throw new IOException(e);
}
void sendGroups() throws IOException, UntrustedIdentityException {
- File groupsFile = IOUtils.createTempFile();
+ var groupsFile = IOUtils.createTempFile();
try {
try (OutputStream fos = new FileOutputStream(groupsFile)) {
- DeviceGroupsOutputStream out = new DeviceGroupsOutputStream(fos);
- for (GroupInfo record : getGroups()) {
+ var out = new DeviceGroupsOutputStream(fos);
+ for (var record : getGroups()) {
if (record instanceof GroupInfoV1) {
- GroupInfoV1 groupInfo = (GroupInfoV1) record;
+ var groupInfo = (GroupInfoV1) record;
out.write(new DeviceGroup(groupInfo.getGroupId().serialize(),
Optional.fromNullable(groupInfo.name),
new ArrayList<>(groupInfo.getMembers()),
}
if (groupsFile.exists() && groupsFile.length() > 0) {
- try (FileInputStream groupsFileStream = new FileInputStream(groupsFile)) {
- SignalServiceAttachmentStream attachmentStream = SignalServiceAttachment.newStreamBuilder()
+ try (var groupsFileStream = new FileInputStream(groupsFile)) {
+ var attachmentStream = SignalServiceAttachment.newStreamBuilder()
.withStream(groupsFileStream)
.withContentType("application/octet-stream")
.withLength(groupsFile.length())
}
public void sendContacts() throws IOException, UntrustedIdentityException {
- File contactsFile = IOUtils.createTempFile();
+ var contactsFile = IOUtils.createTempFile();
try {
try (OutputStream fos = new FileOutputStream(contactsFile)) {
- DeviceContactsOutputStream out = new DeviceContactsOutputStream(fos);
- for (ContactInfo record : account.getContactStore().getContacts()) {
+ var out = new DeviceContactsOutputStream(fos);
+ for (var record : account.getContactStore().getContacts()) {
VerifiedMessage verifiedMessage = null;
- IdentityInfo currentIdentity = account.getSignalProtocolStore().getIdentity(record.getAddress());
+ var currentIdentity = account.getSignalProtocolStore().getIdentity(record.getAddress());
if (currentIdentity != null) {
verifiedMessage = new VerifiedMessage(record.getAddress(),
currentIdentity.getIdentityKey(),
currentIdentity.getDateAdded().getTime());
}
- ProfileKey profileKey = account.getProfileStore().getProfileKey(record.getAddress());
+ var profileKey = account.getProfileStore().getProfileKey(record.getAddress());
out.write(new DeviceContact(record.getAddress(),
Optional.fromNullable(record.name),
createContactAvatarAttachment(record.getAddress()),
}
if (contactsFile.exists() && contactsFile.length() > 0) {
- try (FileInputStream contactsFileStream = new FileInputStream(contactsFile)) {
- SignalServiceAttachmentStream attachmentStream = SignalServiceAttachment.newStreamBuilder()
+ try (var contactsFileStream = new FileInputStream(contactsFile)) {
+ var attachmentStream = SignalServiceAttachment.newStreamBuilder()
.withStream(contactsFileStream)
.withContentType("application/octet-stream")
.withLength(contactsFile.length())
}
void sendBlockedList() throws IOException, UntrustedIdentityException {
- List<SignalServiceAddress> addresses = new ArrayList<>();
- for (ContactInfo record : account.getContactStore().getContacts()) {
+ var addresses = new ArrayList<SignalServiceAddress>();
+ for (var record : account.getContactStore().getContacts()) {
if (record.blocked) {
addresses.add(record.getAddress());
}
}
- List<byte[]> groupIds = new ArrayList<>();
- for (GroupInfo record : getGroups()) {
+ var groupIds = new ArrayList<byte[]>();
+ for (var record : getGroups()) {
if (record.isBlocked()) {
groupIds.add(record.getGroupId().serialize());
}
private void sendVerifiedMessage(
SignalServiceAddress destination, IdentityKey identityKey, TrustLevel trustLevel
) throws IOException, UntrustedIdentityException {
- VerifiedMessage verifiedMessage = new VerifiedMessage(destination,
+ var verifiedMessage = new VerifiedMessage(destination,
identityKey,
trustLevel.toVerifiedState(),
System.currentTimeMillis());
}
public String getContactOrProfileName(String number) {
- final SignalServiceAddress address = Utils.getSignalServiceAddressFromIdentifier(number);
+ final var address = Utils.getSignalServiceAddressFromIdentifier(number);
- final ContactInfo contact = account.getContactStore().getContact(address);
+ final var contact = account.getContactStore().getContact(address);
if (contact != null && !Util.isEmpty(contact.name)) {
return contact.name;
}
- final SignalProfileEntry profileEntry = account.getProfileStore().getProfileEntry(address);
+ final var profileEntry = account.getProfileStore().getProfileEntry(address);
if (profileEntry != null && profileEntry.getProfile() != null) {
return profileEntry.getProfile().getName();
}
}
public GroupInfo getGroup(GroupId groupId) {
- final GroupInfo group = account.getGroupStore().getGroup(groupId);
+ final var group = account.getGroupStore().getGroup(groupId);
if (group instanceof GroupInfoV2 && ((GroupInfoV2) group).getGroup() == null) {
- final GroupSecretParams groupSecretParams = GroupSecretParams.deriveFromMasterKey(((GroupInfoV2) group).getMasterKey());
+ final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(((GroupInfoV2) group).getMasterKey());
((GroupInfoV2) group).setGroup(groupHelper.getDecryptedGroup(groupSecretParams));
account.getGroupStore().updateGroup(group);
}
* @param fingerprint Fingerprint
*/
public boolean trustIdentityVerified(String name, byte[] fingerprint) throws InvalidNumberException {
- SignalServiceAddress address = canonicalizeAndResolveSignalServiceAddress(name);
- List<IdentityInfo> ids = account.getSignalProtocolStore().getIdentities(address);
+ var address = canonicalizeAndResolveSignalServiceAddress(name);
+ var ids = account.getSignalProtocolStore().getIdentities(address);
if (ids == null) {
return false;
}
- for (IdentityInfo id : ids) {
+ for (var id : ids) {
if (!Arrays.equals(id.getIdentityKey().serialize(), fingerprint)) {
continue;
}
* @param safetyNumber Safety number
*/
public boolean trustIdentityVerifiedSafetyNumber(String name, String safetyNumber) throws InvalidNumberException {
- SignalServiceAddress address = canonicalizeAndResolveSignalServiceAddress(name);
- List<IdentityInfo> ids = account.getSignalProtocolStore().getIdentities(address);
+ var address = canonicalizeAndResolveSignalServiceAddress(name);
+ var ids = account.getSignalProtocolStore().getIdentities(address);
if (ids == null) {
return false;
}
- for (IdentityInfo id : ids) {
+ for (var id : ids) {
if (!safetyNumber.equals(computeSafetyNumber(address, id.getIdentityKey()))) {
continue;
}
* @param name username of the identity
*/
public boolean trustIdentityAllKeys(String name) {
- SignalServiceAddress address = resolveSignalServiceAddress(name);
- List<IdentityInfo> ids = account.getSignalProtocolStore().getIdentities(address);
+ var address = resolveSignalServiceAddress(name);
+ var ids = account.getSignalProtocolStore().getIdentities(address);
if (ids == null) {
return false;
}
- for (IdentityInfo id : ids) {
+ for (var id : ids) {
if (id.getTrustLevel() == TrustLevel.UNTRUSTED) {
account.getSignalProtocolStore()
.setIdentityTrustLevel(address, id.getIdentityKey(), TrustLevel.TRUSTED_UNVERIFIED);
}
public SignalServiceAddress canonicalizeAndResolveSignalServiceAddress(String identifier) throws InvalidNumberException {
- String canonicalizedNumber = UuidUtil.isUuid(identifier)
+ var canonicalizedNumber = UuidUtil.isUuid(identifier)
? identifier
: PhoneNumberFormatter.formatNumber(identifier, account.getUsername());
return resolveSignalServiceAddress(canonicalizedNumber);
}
public SignalServiceAddress resolveSignalServiceAddress(String identifier) {
- SignalServiceAddress address = Utils.getSignalServiceAddressFromIdentifier(identifier);
+ var address = Utils.getSignalServiceAddressFromIdentifier(identifier);
return resolveSignalServiceAddress(address);
}
public static ProvisioningManager init(
File settingsPath, ServiceEnvironment serviceEnvironment, String userAgent
) {
- PathConfig pathConfig = PathConfig.createDefault(settingsPath);
+ var pathConfig = PathConfig.createDefault(settingsPath);
- final ServiceEnvironmentConfig serviceConfiguration = ServiceConfig.getServiceEnvironmentConfig(
- serviceEnvironment,
- userAgent);
+ final var serviceConfiguration = ServiceConfig.getServiceEnvironmentConfig(serviceEnvironment, userAgent);
return new ProvisioningManager(pathConfig, serviceConfiguration, userAgent);
}
public String getDeviceLinkUri() throws TimeoutException, IOException {
- String deviceUuid = accountManager.getNewDeviceUuid();
+ var deviceUuid = accountManager.getNewDeviceUuid();
return new DeviceLinkInfo(deviceUuid, identityKey.getPublicKey().getPublicKey()).createDeviceLinkUri();
}
public String finishDeviceLink(String deviceName) throws IOException, InvalidKeyException, TimeoutException, UserAlreadyExists {
- SignalServiceAccountManager.NewDeviceRegistrationReturn ret = accountManager.finishNewDeviceRegistration(
- identityKey,
- false,
- true,
- registrationId,
- deviceName);
+ var ret = accountManager.finishNewDeviceRegistration(identityKey, false, true, registrationId, deviceName);
- String username = ret.getNumber();
+ var username = ret.getNumber();
// TODO do this check before actually registering
if (SignalAccount.userExists(pathConfig.getDataPath(), username)) {
throw new UserAlreadyExists(username, SignalAccount.getFileName(pathConfig.getDataPath(), username));
}
// Create new account with the synced identity
- byte[] profileKeyBytes = ret.getProfileKey();
+ var profileKeyBytes = ret.getProfileKey();
ProfileKey profileKey;
if (profileKeyBytes == null) {
profileKey = KeyUtils.createProfileKey();
}
}
- try (SignalAccount account = SignalAccount.createLinkedAccount(pathConfig.getDataPath(),
+ try (var account = SignalAccount.createLinkedAccount(pathConfig.getDataPath(),
username,
ret.getUuid(),
password,
profileKey)) {
account.save();
- try (Manager m = new Manager(account, pathConfig, serviceEnvironmentConfig, userAgent)) {
+ try (var m = new Manager(account, pathConfig, serviceEnvironmentConfig, userAgent)) {
try {
m.refreshPreKeys();
import org.asamk.signal.manager.helper.PinHelper;
import org.asamk.signal.manager.storage.SignalAccount;
import org.asamk.signal.manager.util.KeyUtils;
-import org.signal.zkgroup.profiles.ProfileKey;
-import org.whispersystems.libsignal.IdentityKeyPair;
import org.whispersystems.libsignal.util.KeyHelper;
import org.whispersystems.libsignal.util.guava.Optional;
-import org.whispersystems.signalservice.api.KbsPinData;
-import org.whispersystems.signalservice.api.KeyBackupService;
import org.whispersystems.signalservice.api.KeyBackupServicePinException;
import org.whispersystems.signalservice.api.KeyBackupSystemNoDataException;
import org.whispersystems.signalservice.api.SignalServiceAccountManager;
groupsV2Operations,
ServiceConfig.AUTOMATIC_NETWORK_RETRY,
timer);
- final KeyBackupService keyBackupService = accountManager.getKeyBackupService(ServiceConfig.getIasKeyStore(),
+ final var keyBackupService = accountManager.getKeyBackupService(ServiceConfig.getIasKeyStore(),
serviceEnvironmentConfig.getKeyBackupConfig().getEnclaveName(),
serviceEnvironmentConfig.getKeyBackupConfig().getServiceId(),
serviceEnvironmentConfig.getKeyBackupConfig().getMrenclave(),
public static RegistrationManager init(
String username, File settingsPath, ServiceEnvironment serviceEnvironment, String userAgent
) throws IOException {
- PathConfig pathConfig = PathConfig.createDefault(settingsPath);
+ var pathConfig = PathConfig.createDefault(settingsPath);
- final ServiceEnvironmentConfig serviceConfiguration = ServiceConfig.getServiceEnvironmentConfig(
- serviceEnvironment,
- userAgent);
+ final var serviceConfiguration = ServiceConfig.getServiceEnvironmentConfig(serviceEnvironment, userAgent);
if (!SignalAccount.userExists(pathConfig.getDataPath(), username)) {
- IdentityKeyPair identityKey = KeyUtils.generateIdentityKeyPair();
- int registrationId = KeyHelper.generateRegistrationId(false);
+ var identityKey = KeyUtils.generateIdentityKeyPair();
+ var registrationId = KeyHelper.generateRegistrationId(false);
- ProfileKey profileKey = KeyUtils.createProfileKey();
- SignalAccount account = SignalAccount.create(pathConfig.getDataPath(),
+ var profileKey = KeyUtils.createProfileKey();
+ var account = SignalAccount.create(pathConfig.getDataPath(),
username,
identityKey,
registrationId,
return new RegistrationManager(account, pathConfig, serviceConfiguration, userAgent);
}
- SignalAccount account = SignalAccount.load(pathConfig.getDataPath(), username);
+ var account = SignalAccount.load(pathConfig.getDataPath(), username);
return new RegistrationManager(account, pathConfig, serviceConfiguration, userAgent);
}
throw e;
}
- KbsPinData registrationLockData = pinHelper.getRegistrationLockData(pin, e);
+ var registrationLockData = pinHelper.getRegistrationLockData(pin, e);
if (registrationLockData == null) {
throw e;
}
- String registrationLock = registrationLockData.getMasterKey().deriveRegistrationLock();
+ var registrationLock = registrationLockData.getMasterKey().deriveRegistrationLock();
try {
response = verifyAccountWithCode(verificationCode, null, registrationLock);
} catch (LockedException _e) {
account.getSignalProtocolStore().getIdentityKeyPair().getPublicKey(),
TrustLevel.TRUSTED_VERIFIED);
- try (Manager m = new Manager(account, pathConfig, serviceEnvironmentConfig, userAgent)) {
+ try (var m = new Manager(account, pathConfig, serviceEnvironmentConfig, userAgent)) {
m.refreshPreKeys();
try {
TrustStore contactTrustStore = new IasTrustStore();
- KeyStore keyStore = KeyStore.getInstance("BKS");
+ var keyStore = KeyStore.getInstance("BKS");
keyStore.load(contactTrustStore.getKeyStoreInputStream(),
contactTrustStore.getKeyStorePassword().toCharArray());
.header("User-Agent", userAgent)
.build());
- final List<Interceptor> interceptors = List.of(userAgentInterceptor);
+ final var interceptors = List.of(userAgentInterceptor);
switch (serviceEnvironment) {
case LIVE:
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
- final GroupId groupId = (GroupId) o;
+ final var groupId = (GroupId) o;
return Arrays.equals(id, groupId.id);
}
* @throws InvalidGroupLinkException If group url, but cannot be parsed.
*/
public static GroupInviteLinkUrl fromUri(String urlString) throws InvalidGroupLinkException, UnknownGroupLinkVersionException {
- URI uri = getGroupUrl(urlString);
+ var uri = getGroupUrl(urlString);
if (uri == null) {
return null;
throw new InvalidGroupLinkException("No path was expected in uri");
}
- String encoding = uri.getFragment();
+ var encoding = uri.getFragment();
if (encoding == null || encoding.length() == 0) {
throw new InvalidGroupLinkException("No reference was in the uri");
}
- byte[] bytes = Base64UrlSafe.decodePaddingAgnostic(encoding);
- GroupInviteLink groupInviteLink = GroupInviteLink.parseFrom(bytes);
+ var bytes = Base64UrlSafe.decodePaddingAgnostic(encoding);
+ var groupInviteLink = GroupInviteLink.parseFrom(bytes);
switch (groupInviteLink.getContentsCase()) {
case V1CONTENTS: {
- GroupInviteLink.GroupInviteLinkContentsV1 groupInviteLinkContentsV1 = groupInviteLink.getV1Contents();
- GroupMasterKey groupMasterKey = new GroupMasterKey(groupInviteLinkContentsV1.getGroupMasterKey()
+ var groupInviteLinkContentsV1 = groupInviteLink.getV1Contents();
+ var groupMasterKey = new GroupMasterKey(groupInviteLinkContentsV1.getGroupMasterKey()
.toByteArray());
- GroupLinkPassword password = GroupLinkPassword.fromBytes(groupInviteLinkContentsV1.getInviteLinkPassword()
+ var password = GroupLinkPassword.fromBytes(groupInviteLinkContentsV1.getInviteLinkPassword()
.toByteArray());
return new GroupInviteLinkUrl(groupMasterKey, password);
*/
private static URI getGroupUrl(String urlString) {
try {
- URI url = new URI(urlString);
+ var url = new URI(urlString);
if (!"https".equalsIgnoreCase(url.getScheme()) && !"sgnl".equalsIgnoreCase(url.getScheme())) {
return null;
}
protected static String createUrl(GroupMasterKey groupMasterKey, GroupLinkPassword password) {
- GroupInviteLink groupInviteLink = GroupInviteLink.newBuilder()
+ var groupInviteLink = GroupInviteLink.newBuilder()
.setV1Contents(GroupInviteLink.GroupInviteLinkContentsV1.newBuilder()
.setGroupMasterKey(ByteString.copyFrom(groupMasterKey.serialize()))
.setInviteLinkPassword(ByteString.copyFrom(password.serialize())))
.build();
- String encoding = Base64UrlSafe.encodeBytesWithoutPadding(groupInviteLink.toByteArray());
+ var encoding = Base64UrlSafe.encodeBytesWithoutPadding(groupInviteLink.toByteArray());
return GROUP_URL_PREFIX + encoding;
}
final SignalServiceDataMessage.Builder messageBuilder, final GroupInfo groupInfo
) {
if (groupInfo instanceof GroupInfoV1) {
- SignalServiceGroup group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.DELIVER)
+ var group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.DELIVER)
.withId(groupInfo.getGroupId().serialize())
.build();
messageBuilder.asGroupMessage(group);
} else {
- final GroupInfoV2 groupInfoV2 = (GroupInfoV2) groupInfo;
- SignalServiceGroupV2 group = SignalServiceGroupV2.newBuilder(groupInfoV2.getMasterKey())
+ final var groupInfoV2 = (GroupInfoV2) groupInfo;
+ var group = SignalServiceGroupV2.newBuilder(groupInfoV2.getMasterKey())
.withRevision(groupInfoV2.getGroup() == null ? 0 : groupInfoV2.getGroup().getRevision())
.build();
messageBuilder.asGroupMessage(group);
}
public static GroupIdV2 getGroupIdV2(GroupMasterKey groupMasterKey) {
- final GroupSecretParams groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey);
+ final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey);
return getGroupIdV2(groupSecretParams);
}
public static GroupIdV2 getGroupIdV2(GroupIdV1 groupIdV1) {
- final GroupSecretParams groupSecretParams = GroupSecretParams.deriveFromMasterKey(deriveV2MigrationMasterKey(
- groupIdV1));
+ final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(deriveV2MigrationMasterKey(groupIdV1));
return getGroupIdV2(groupSecretParams);
}
import com.google.protobuf.InvalidProtocolBufferException;
-import org.asamk.signal.manager.groups.GroupIdV2;
import org.asamk.signal.manager.groups.GroupLinkPassword;
import org.asamk.signal.manager.groups.GroupUtils;
import org.asamk.signal.manager.storage.groups.GroupInfoV2;
import org.signal.zkgroup.groups.GroupMasterKey;
import org.signal.zkgroup.groups.GroupSecretParams;
import org.signal.zkgroup.groups.UuidCiphertext;
-import org.signal.zkgroup.profiles.ProfileKeyCredential;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.whispersystems.libsignal.util.Pair;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collection;
-import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
public DecryptedGroup getDecryptedGroup(final GroupSecretParams groupSecretParams) {
try {
- final GroupsV2AuthorizationString groupsV2AuthorizationString = groupAuthorizationProvider.getAuthorizationForToday(
+ final var groupsV2AuthorizationString = groupAuthorizationProvider.getAuthorizationForToday(
groupSecretParams);
return groupsV2Api.getGroup(groupSecretParams, groupsV2AuthorizationString);
} catch (IOException | VerificationFailedException | InvalidGroupStateException e) {
public DecryptedGroupJoinInfo getDecryptedGroupJoinInfo(
GroupMasterKey groupMasterKey, GroupLinkPassword password
) throws IOException, GroupLinkNotActiveException {
- GroupSecretParams groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey);
+ var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey);
return groupsV2Api.getGroupJoinInfo(groupSecretParams,
Optional.fromNullable(password).transform(GroupLinkPassword::serialize),
public GroupInfoV2 createGroupV2(
String name, Collection<SignalServiceAddress> members, File avatarFile
) throws IOException {
- final byte[] avatarBytes = readAvatarBytes(avatarFile);
- final GroupsV2Operations.NewGroup newGroup = buildNewGroupV2(name, members, avatarBytes);
+ final var avatarBytes = readAvatarBytes(avatarFile);
+ final var newGroup = buildNewGroupV2(name, members, avatarBytes);
if (newGroup == null) {
return null;
}
- final GroupSecretParams groupSecretParams = newGroup.getGroupSecretParams();
+ final var groupSecretParams = newGroup.getGroupSecretParams();
final GroupsV2AuthorizationString groupAuthForToday;
final DecryptedGroup decryptedGroup;
return null;
}
- final GroupIdV2 groupId = GroupUtils.getGroupIdV2(groupSecretParams);
- final GroupMasterKey masterKey = groupSecretParams.getMasterKey();
- GroupInfoV2 g = new GroupInfoV2(groupId, masterKey);
+ final var groupId = GroupUtils.getGroupIdV2(groupSecretParams);
+ final var masterKey = groupSecretParams.getMasterKey();
+ var g = new GroupInfoV2(groupId, masterKey);
g.setGroup(decryptedGroup);
return g;
private GroupsV2Operations.NewGroup buildNewGroupV2(
String name, Collection<SignalServiceAddress> members, byte[] avatar
) {
- final ProfileKeyCredential profileKeyCredential = profileKeyCredentialProvider.getProfileKeyCredential(
- selfAddressProvider.getSelfAddress());
+ final var profileKeyCredential = profileKeyCredentialProvider.getProfileKeyCredential(selfAddressProvider.getSelfAddress());
if (profileKeyCredential == null) {
logger.warn("Cannot create a V2 group as self does not have a versioned profile");
return null;
if (!areMembersValid(members)) return null;
- GroupCandidate self = new GroupCandidate(selfAddressProvider.getSelfAddress().getUuid().orNull(),
+ var self = new GroupCandidate(selfAddressProvider.getSelfAddress().getUuid().orNull(),
Optional.fromNullable(profileKeyCredential));
- Set<GroupCandidate> candidates = members.stream()
+ var candidates = members.stream()
.map(member -> new GroupCandidate(member.getUuid().get(),
Optional.fromNullable(profileKeyCredentialProvider.getProfileKeyCredential(member))))
.collect(Collectors.toSet());
- final GroupSecretParams groupSecretParams = GroupSecretParams.generate();
+ final var groupSecretParams = GroupSecretParams.generate();
return groupsV2Operations.createNewGroup(groupSecretParams,
name,
Optional.fromNullable(avatar),
}
private boolean areMembersValid(final Collection<SignalServiceAddress> members) {
- final Set<String> noUuidCapability = members.stream()
+ final var noUuidCapability = members.stream()
.filter(address -> !address.getUuid().isPresent())
.map(SignalServiceAddress::getLegacyIdentifier)
.collect(Collectors.toSet());
return false;
}
- final Set<SignalProfile> noGv2Capability = members.stream()
+ final var noGv2Capability = members.stream()
.map(profileProvider::getProfile)
.filter(profile -> profile != null && !profile.getCapabilities().gv2)
.collect(Collectors.toSet());
public Pair<DecryptedGroup, GroupChange> updateGroupV2(
GroupInfoV2 groupInfoV2, String name, File avatarFile
) throws IOException {
- final GroupSecretParams groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
- GroupsV2Operations.GroupOperations groupOperations = groupsV2Operations.forGroup(groupSecretParams);
+ final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
+ var groupOperations = groupsV2Operations.forGroup(groupSecretParams);
- GroupChange.Actions.Builder change = name != null
- ? groupOperations.createModifyGroupTitle(name)
- : GroupChange.Actions.newBuilder();
+ var change = name != null ? groupOperations.createModifyGroupTitle(name) : GroupChange.Actions.newBuilder();
if (avatarFile != null) {
- final byte[] avatarBytes = readAvatarBytes(avatarFile);
- String avatarCdnKey = groupsV2Api.uploadAvatar(avatarBytes,
+ final var avatarBytes = readAvatarBytes(avatarFile);
+ var avatarCdnKey = groupsV2Api.uploadAvatar(avatarBytes,
groupSecretParams,
groupAuthorizationProvider.getAuthorizationForToday(groupSecretParams));
change.setModifyAvatar(GroupChange.Actions.ModifyAvatarAction.newBuilder().setAvatar(avatarCdnKey));
}
- final Optional<UUID> uuid = this.selfAddressProvider.getSelfAddress().getUuid();
+ final var uuid = this.selfAddressProvider.getSelfAddress().getUuid();
if (uuid.isPresent()) {
change.setSourceUuid(UuidUtil.toByteString(uuid.get()));
}
public Pair<DecryptedGroup, GroupChange> updateGroupV2(
GroupInfoV2 groupInfoV2, Set<SignalServiceAddress> newMembers
) throws IOException {
- final GroupSecretParams groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
- GroupsV2Operations.GroupOperations groupOperations = groupsV2Operations.forGroup(groupSecretParams);
+ final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
+ var groupOperations = groupsV2Operations.forGroup(groupSecretParams);
if (!areMembersValid(newMembers)) {
throw new IOException("Failed to update group");
}
- Set<GroupCandidate> candidates = newMembers.stream()
+ var candidates = newMembers.stream()
.map(member -> new GroupCandidate(member.getUuid().get(),
Optional.fromNullable(profileKeyCredentialProvider.getProfileKeyCredential(member))))
.collect(Collectors.toSet());
- final GroupChange.Actions.Builder change = groupOperations.createModifyGroupMembershipChange(candidates,
+ final var change = groupOperations.createModifyGroupMembershipChange(candidates,
selfAddressProvider.getSelfAddress().getUuid().get());
- final Optional<UUID> uuid = this.selfAddressProvider.getSelfAddress().getUuid();
+ final var uuid = this.selfAddressProvider.getSelfAddress().getUuid();
if (uuid.isPresent()) {
change.setSourceUuid(UuidUtil.toByteString(uuid.get()));
}
}
public Pair<DecryptedGroup, GroupChange> leaveGroup(GroupInfoV2 groupInfoV2) throws IOException {
- List<DecryptedPendingMember> pendingMembersList = groupInfoV2.getGroup().getPendingMembersList();
- final UUID selfUuid = selfAddressProvider.getSelfAddress().getUuid().get();
- Optional<DecryptedPendingMember> selfPendingMember = DecryptedGroupUtil.findPendingByUuid(pendingMembersList,
- selfUuid);
+ var pendingMembersList = groupInfoV2.getGroup().getPendingMembersList();
+ final var selfUuid = selfAddressProvider.getSelfAddress().getUuid().get();
+ var selfPendingMember = DecryptedGroupUtil.findPendingByUuid(pendingMembersList, selfUuid);
if (selfPendingMember.isPresent()) {
return revokeInvites(groupInfoV2, Set.of(selfPendingMember.get()));
GroupLinkPassword groupLinkPassword,
DecryptedGroupJoinInfo decryptedGroupJoinInfo
) throws IOException {
- final GroupSecretParams groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey);
- final GroupsV2Operations.GroupOperations groupOperations = groupsV2Operations.forGroup(groupSecretParams);
+ final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey);
+ final var groupOperations = groupsV2Operations.forGroup(groupSecretParams);
- final SignalServiceAddress selfAddress = this.selfAddressProvider.getSelfAddress();
- final ProfileKeyCredential profileKeyCredential = profileKeyCredentialProvider.getProfileKeyCredential(
- selfAddress);
+ final var selfAddress = this.selfAddressProvider.getSelfAddress();
+ final var profileKeyCredential = profileKeyCredentialProvider.getProfileKeyCredential(selfAddress);
if (profileKeyCredential == null) {
throw new IOException("Cannot join a V2 group as self does not have a versioned profile");
}
- boolean requestToJoin = decryptedGroupJoinInfo.getAddFromInviteLink()
- == AccessControl.AccessRequired.ADMINISTRATOR;
- GroupChange.Actions.Builder change = requestToJoin
+ var requestToJoin = decryptedGroupJoinInfo.getAddFromInviteLink() == AccessControl.AccessRequired.ADMINISTRATOR;
+ var change = requestToJoin
? groupOperations.createGroupJoinRequest(profileKeyCredential)
: groupOperations.createGroupJoinDirect(profileKeyCredential);
}
public Pair<DecryptedGroup, GroupChange> acceptInvite(GroupInfoV2 groupInfoV2) throws IOException {
- final GroupSecretParams groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
- final GroupsV2Operations.GroupOperations groupOperations = groupsV2Operations.forGroup(groupSecretParams);
+ final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
+ final var groupOperations = groupsV2Operations.forGroup(groupSecretParams);
- final SignalServiceAddress selfAddress = this.selfAddressProvider.getSelfAddress();
- final ProfileKeyCredential profileKeyCredential = profileKeyCredentialProvider.getProfileKeyCredential(
- selfAddress);
+ final var selfAddress = this.selfAddressProvider.getSelfAddress();
+ final var profileKeyCredential = profileKeyCredentialProvider.getProfileKeyCredential(selfAddress);
if (profileKeyCredential == null) {
throw new IOException("Cannot join a V2 group as self does not have a versioned profile");
}
- final GroupChange.Actions.Builder change = groupOperations.createAcceptInviteChange(profileKeyCredential);
+ final var change = groupOperations.createAcceptInviteChange(profileKeyCredential);
- final Optional<UUID> uuid = selfAddress.getUuid();
+ final var uuid = selfAddress.getUuid();
if (uuid.isPresent()) {
change.setSourceUuid(UuidUtil.toByteString(uuid.get()));
}
public Pair<DecryptedGroup, GroupChange> revokeInvites(
GroupInfoV2 groupInfoV2, Set<DecryptedPendingMember> pendingMembers
) throws IOException {
- final GroupSecretParams groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
- final GroupsV2Operations.GroupOperations groupOperations = groupsV2Operations.forGroup(groupSecretParams);
- final Set<UuidCiphertext> uuidCipherTexts = pendingMembers.stream().map(member -> {
+ final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
+ final var groupOperations = groupsV2Operations.forGroup(groupSecretParams);
+ final var uuidCipherTexts = pendingMembers.stream().map(member -> {
try {
return new UuidCiphertext(member.getUuidCipherText().toByteArray());
} catch (InvalidInputException e) {
}
public Pair<DecryptedGroup, GroupChange> ejectMembers(GroupInfoV2 groupInfoV2, Set<UUID> uuids) throws IOException {
- final GroupSecretParams groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
- final GroupsV2Operations.GroupOperations groupOperations = groupsV2Operations.forGroup(groupSecretParams);
+ final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
+ final var groupOperations = groupsV2Operations.forGroup(groupSecretParams);
return commitChange(groupInfoV2, groupOperations.createRemoveMembersChange(uuids));
}
private Pair<DecryptedGroup, GroupChange> commitChange(
GroupInfoV2 groupInfoV2, GroupChange.Actions.Builder change
) throws IOException {
- final GroupSecretParams groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
- final GroupsV2Operations.GroupOperations groupOperations = groupsV2Operations.forGroup(groupSecretParams);
- final DecryptedGroup previousGroupState = groupInfoV2.getGroup();
- final int nextRevision = previousGroupState.getRevision() + 1;
- final GroupChange.Actions changeActions = change.setRevision(nextRevision).build();
+ final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
+ final var groupOperations = groupsV2Operations.forGroup(groupSecretParams);
+ final var previousGroupState = groupInfoV2.getGroup();
+ final var nextRevision = previousGroupState.getRevision() + 1;
+ final var changeActions = change.setRevision(nextRevision).build();
final DecryptedGroupChange decryptedChange;
final DecryptedGroup decryptedGroupState;
throw new IOException(e);
}
- GroupChange signedGroupChange = groupsV2Api.patchGroup(changeActions,
+ var signedGroupChange = groupsV2Api.patchGroup(changeActions,
groupAuthorizationProvider.getAuthorizationForToday(groupSecretParams),
Optional.absent());
GroupChange.Actions.Builder change,
GroupLinkPassword password
) throws IOException {
- final int nextRevision = currentRevision + 1;
- final GroupChange.Actions changeActions = change.setRevision(nextRevision).build();
+ final var nextRevision = currentRevision + 1;
+ final var changeActions = change.setRevision(nextRevision).build();
return groupsV2Api.patchGroup(changeActions,
groupAuthorizationProvider.getAuthorizationForToday(groupSecretParams),
DecryptedGroup group, byte[] signedGroupChange, GroupMasterKey groupMasterKey
) {
try {
- final DecryptedGroupChange decryptedGroupChange = getDecryptedGroupChange(signedGroupChange,
- groupMasterKey);
+ final var decryptedGroupChange = getDecryptedGroupChange(signedGroupChange, groupMasterKey);
if (decryptedGroupChange == null) {
return null;
}
private DecryptedGroupChange getDecryptedGroupChange(byte[] signedGroupChange, GroupMasterKey groupMasterKey) {
if (signedGroupChange != null) {
- GroupsV2Operations.GroupOperations groupOperations = groupsV2Operations.forGroup(GroupSecretParams.deriveFromMasterKey(
- groupMasterKey));
+ var groupOperations = groupsV2Operations.forGroup(GroupSecretParams.deriveFromMasterKey(groupMasterKey));
try {
return groupOperations.decryptChange(GroupChange.parseFrom(signedGroupChange), true).orNull();
import org.whispersystems.signalservice.api.KeyBackupService;
import org.whispersystems.signalservice.api.KeyBackupServicePinException;
import org.whispersystems.signalservice.api.KeyBackupSystemNoDataException;
-import org.whispersystems.signalservice.api.kbs.HashedPin;
import org.whispersystems.signalservice.api.kbs.MasterKey;
import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
import org.whispersystems.signalservice.internal.contacts.entities.TokenResponse;
public void setRegistrationLockPin(
String pin, MasterKey masterKey
) throws IOException, UnauthenticatedResponseException {
- final KeyBackupService.PinChangeSession pinChangeSession = keyBackupService.newPinChangeSession();
- final HashedPin hashedPin = PinHashing.hashPin(pin, pinChangeSession);
+ final var pinChangeSession = keyBackupService.newPinChangeSession();
+ final var hashedPin = PinHashing.hashPin(pin, pinChangeSession);
pinChangeSession.setPin(hashedPin, masterKey);
pinChangeSession.enableRegistrationLock(masterKey);
}
public void removeRegistrationLockPin() throws IOException, UnauthenticatedResponseException {
- final KeyBackupService.PinChangeSession pinChangeSession = keyBackupService.newPinChangeSession();
+ final var pinChangeSession = keyBackupService.newPinChangeSession();
pinChangeSession.disableRegistrationLock();
pinChangeSession.removePin();
}
public KbsPinData getRegistrationLockData(
String pin, LockedException e
) throws IOException, KeyBackupSystemNoDataException, KeyBackupServicePinException {
- String basicStorageCredentials = e.getBasicStorageCredentials();
+ var basicStorageCredentials = e.getBasicStorageCredentials();
if (basicStorageCredentials == null) {
return null;
}
private KbsPinData getRegistrationLockData(
String pin, String basicStorageCredentials
) throws IOException, KeyBackupSystemNoDataException, KeyBackupServicePinException {
- TokenResponse tokenResponse = keyBackupService.getToken(basicStorageCredentials);
+ var tokenResponse = keyBackupService.getToken(basicStorageCredentials);
if (tokenResponse == null || tokenResponse.getTries() == 0) {
throw new IOException("KBS Account locked");
}
- KbsPinData registrationLockData = restoreMasterKey(pin, basicStorageCredentials, tokenResponse);
+ var registrationLockData = restoreMasterKey(pin, basicStorageCredentials, tokenResponse);
if (registrationLockData == null) {
throw new AssertionError("Failed to restore master key");
}
throw new AssertionError("Cannot restore KBS key, no storage credentials supplied");
}
- KeyBackupService.RestoreSession session = keyBackupService.newRegistrationSession(basicStorageCredentials,
- tokenResponse);
+ var session = keyBackupService.newRegistrationSession(basicStorageCredentials, tokenResponse);
try {
- HashedPin hashedPin = PinHashing.hashPin(pin, session);
- KbsPinData kbsData = session.restorePin(hashedPin);
+ var hashedPin = PinHashing.hashPin(pin, session);
+ var kbsData = session.restorePin(hashedPin);
if (kbsData == null) {
throw new AssertionError("Null not expected");
}
import org.signal.zkgroup.profiles.ProfileKey;
import org.whispersystems.libsignal.util.guava.Optional;
-import org.whispersystems.signalservice.api.SignalServiceMessagePipe;
-import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
import org.whispersystems.signalservice.api.profiles.ProfileAndCredential;
import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
import org.whispersystems.signalservice.api.push.SignalServiceAddress;
public ListenableFuture<ProfileAndCredential> retrieveProfile(
SignalServiceAddress address, SignalServiceProfile.RequestType requestType
) {
- Optional<UnidentifiedAccess> unidentifiedAccess = getUnidentifiedAccess(address);
- Optional<ProfileKey> profileKey = Optional.fromNullable(profileKeyProvider.getProfileKey(address));
+ var unidentifiedAccess = getUnidentifiedAccess(address);
+ var profileKey = Optional.fromNullable(profileKeyProvider.getProfileKey(address));
if (unidentifiedAccess.isPresent()) {
return new CascadingFuture<>(Arrays.asList(() -> getPipeRetrievalFuture(address,
Optional<UnidentifiedAccess> unidentifiedAccess,
SignalServiceProfile.RequestType requestType
) throws IOException {
- SignalServiceMessagePipe unidentifiedPipe = messagePipeProvider.getMessagePipe(true);
- SignalServiceMessagePipe pipe = unidentifiedPipe != null && unidentifiedAccess.isPresent()
+ var unidentifiedPipe = messagePipeProvider.getMessagePipe(true);
+ var pipe = unidentifiedPipe != null && unidentifiedAccess.isPresent()
? unidentifiedPipe
: messagePipeProvider.getMessagePipe(false);
if (pipe != null) {
if (!address.getNumber().isPresent()) {
throw new NotFoundException("Can't request profile without number");
}
- SignalServiceAddress addressWithoutUuid = new SignalServiceAddress(Optional.absent(),
- address.getNumber());
+ var addressWithoutUuid = new SignalServiceAddress(Optional.absent(), address.getNumber());
return pipe.getProfile(addressWithoutUuid, profileKey, unidentifiedAccess, requestType);
}
}
Optional<UnidentifiedAccess> unidentifiedAccess,
SignalServiceProfile.RequestType requestType
) throws NotFoundException {
- SignalServiceMessageReceiver receiver = messageReceiverProvider.getMessageReceiver();
+ var receiver = messageReceiverProvider.getMessageReceiver();
try {
return receiver.retrieveProfile(address, profileKey, unidentifiedAccess, requestType);
} catch (NoClassDefFoundError e) {
if (!address.getNumber().isPresent()) {
throw new NotFoundException("Can't request profile without number");
}
- SignalServiceAddress addressWithoutUuid = new SignalServiceAddress(Optional.absent(), address.getNumber());
+ var addressWithoutUuid = new SignalServiceAddress(Optional.absent(), address.getNumber());
return receiver.retrieveProfile(addressWithoutUuid, profileKey, unidentifiedAccess, requestType);
}
}
private Optional<UnidentifiedAccess> getUnidentifiedAccess(SignalServiceAddress recipient) {
- Optional<UnidentifiedAccessPair> unidentifiedAccess = unidentifiedAccessProvider.getAccessFor(recipient);
+ var unidentifiedAccess = unidentifiedAccessProvider.getAccessFor(recipient);
if (unidentifiedAccess.isPresent()) {
return unidentifiedAccess.get().getTargetUnidentifiedAccess();
package org.asamk.signal.manager.helper;
-import org.asamk.signal.manager.storage.profiles.SignalProfile;
import org.signal.libsignal.metadata.certificate.InvalidCertificateException;
-import org.signal.zkgroup.profiles.ProfileKey;
import org.whispersystems.libsignal.util.guava.Optional;
import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
}
public byte[] getTargetUnidentifiedAccessKey(SignalServiceAddress recipient) {
- ProfileKey theirProfileKey = profileKeyProvider.getProfileKey(recipient);
+ var theirProfileKey = profileKeyProvider.getProfileKey(recipient);
if (theirProfileKey == null) {
return null;
}
- SignalProfile targetProfile = profileProvider.getProfile(recipient);
+ var targetProfile = profileProvider.getProfile(recipient);
if (targetProfile == null || targetProfile.getUnidentifiedAccess() == null) {
return null;
}
}
public Optional<UnidentifiedAccessPair> getAccessForSync() {
- byte[] selfUnidentifiedAccessKey = getSelfUnidentifiedAccessKey();
- byte[] selfUnidentifiedAccessCertificate = senderCertificateProvider.getSenderCertificate();
+ var selfUnidentifiedAccessKey = getSelfUnidentifiedAccessKey();
+ var selfUnidentifiedAccessCertificate = senderCertificateProvider.getSenderCertificate();
if (selfUnidentifiedAccessKey == null || selfUnidentifiedAccessCertificate == null) {
return Optional.absent();
}
public Optional<UnidentifiedAccessPair> getAccessFor(SignalServiceAddress recipient) {
- byte[] recipientUnidentifiedAccessKey = getTargetUnidentifiedAccessKey(recipient);
- byte[] selfUnidentifiedAccessKey = getSelfUnidentifiedAccessKey();
- byte[] selfUnidentifiedAccessCertificate = senderCertificateProvider.getSenderCertificate();
+ var recipientUnidentifiedAccessKey = getTargetUnidentifiedAccessKey(recipient);
+ var selfUnidentifiedAccessKey = getSelfUnidentifiedAccessKey();
+ var selfUnidentifiedAccessCertificate = senderCertificateProvider.getSenderCertificate();
if (recipientUnidentifiedAccessKey == null
|| selfUnidentifiedAccessKey == null
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.node.ObjectNode;
import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.storage.contacts.ContactInfo;
import org.asamk.signal.manager.storage.contacts.JsonContactsStore;
-import org.asamk.signal.manager.storage.groups.GroupInfo;
import org.asamk.signal.manager.storage.groups.GroupInfoV1;
import org.asamk.signal.manager.storage.groups.JsonGroupStore;
import org.asamk.signal.manager.storage.messageCache.MessageCache;
import org.asamk.signal.manager.storage.profiles.ProfileStore;
-import org.asamk.signal.manager.storage.protocol.IdentityInfo;
import org.asamk.signal.manager.storage.protocol.JsonSignalProtocolStore;
import org.asamk.signal.manager.storage.protocol.RecipientStore;
-import org.asamk.signal.manager.storage.protocol.SessionInfo;
import org.asamk.signal.manager.storage.protocol.SignalServiceAddressResolver;
import org.asamk.signal.manager.storage.stickers.StickerStore;
import org.asamk.signal.manager.storage.threads.LegacyJsonThreadStore;
-import org.asamk.signal.manager.storage.threads.ThreadInfo;
import org.asamk.signal.manager.util.IOUtils;
import org.asamk.signal.manager.util.KeyUtils;
import org.asamk.signal.manager.util.Utils;
}
public static SignalAccount load(File dataPath, String username) throws IOException {
- final File fileName = getFileName(dataPath, username);
- final Pair<FileChannel, FileLock> pair = openFileChannel(fileName);
+ final var fileName = getFileName(dataPath, username);
+ final var pair = openFileChannel(fileName);
try {
- SignalAccount account = new SignalAccount(pair.first(), pair.second());
+ var account = new SignalAccount(pair.first(), pair.second());
account.load(dataPath);
account.migrateLegacyConfigs();
File dataPath, String username, IdentityKeyPair identityKey, int registrationId, ProfileKey profileKey
) throws IOException {
IOUtils.createPrivateDirectories(dataPath);
- File fileName = getFileName(dataPath, username);
+ var fileName = getFileName(dataPath, username);
if (!fileName.exists()) {
IOUtils.createPrivateFile(fileName);
}
- final Pair<FileChannel, FileLock> pair = openFileChannel(fileName);
- SignalAccount account = new SignalAccount(pair.first(), pair.second());
+ final var pair = openFileChannel(fileName);
+ var account = new SignalAccount(pair.first(), pair.second());
account.username = username;
account.profileKey = profileKey;
ProfileKey profileKey
) throws IOException {
IOUtils.createPrivateDirectories(dataPath);
- File fileName = getFileName(dataPath, username);
+ var fileName = getFileName(dataPath, username);
if (!fileName.exists()) {
IOUtils.createPrivateFile(fileName);
}
- final Pair<FileChannel, FileLock> pair = openFileChannel(fileName);
- SignalAccount account = new SignalAccount(pair.first(), pair.second());
+ final var pair = openFileChannel(fileName);
+ var account = new SignalAccount(pair.first(), pair.second());
account.username = username;
account.uuid = uuid;
save();
}
// Store profile keys only in profile store
- for (ContactInfo contact : getContactStore().getContacts()) {
- String profileKeyString = contact.profileKey;
+ for (var contact : getContactStore().getContacts()) {
+ var profileKeyString = contact.profileKey;
if (profileKeyString == null) {
continue;
}
if (username == null) {
return false;
}
- File f = getFileName(dataPath, username);
+ var f = getFileName(dataPath, username);
return !(!f.exists() || f.isDirectory());
}
signalProtocolStore = jsonProcessor.convertValue(Utils.getNotNullNode(rootNode, "axolotlStore"),
JsonSignalProtocolStore.class);
registered = Utils.getNotNullNode(rootNode, "registered").asBoolean();
- JsonNode groupStoreNode = rootNode.get("groupStore");
+ var groupStoreNode = rootNode.get("groupStore");
if (groupStoreNode != null) {
groupStore = jsonProcessor.convertValue(groupStoreNode, JsonGroupStore.class);
groupStore.groupCachePath = getGroupCachePath(dataPath, username);
groupStore = new JsonGroupStore(getGroupCachePath(dataPath, username));
}
- JsonNode contactStoreNode = rootNode.get("contactStore");
+ var contactStoreNode = rootNode.get("contactStore");
if (contactStoreNode != null) {
contactStore = jsonProcessor.convertValue(contactStoreNode, JsonContactsStore.class);
}
contactStore = new JsonContactsStore();
}
- JsonNode recipientStoreNode = rootNode.get("recipientStore");
+ var recipientStoreNode = rootNode.get("recipientStore");
if (recipientStoreNode != null) {
recipientStore = jsonProcessor.convertValue(recipientStoreNode, RecipientStore.class);
}
recipientStore.resolveServiceAddress(getSelfAddress());
- for (ContactInfo contact : contactStore.getContacts()) {
+ for (var contact : contactStore.getContacts()) {
recipientStore.resolveServiceAddress(contact.getAddress());
}
- for (GroupInfo group : groupStore.getGroups()) {
+ for (var group : groupStore.getGroups()) {
if (group instanceof GroupInfoV1) {
- GroupInfoV1 groupInfoV1 = (GroupInfoV1) group;
+ var groupInfoV1 = (GroupInfoV1) group;
groupInfoV1.members = groupInfoV1.members.stream()
.map(m -> recipientStore.resolveServiceAddress(m))
.collect(Collectors.toSet());
}
}
- for (SessionInfo session : signalProtocolStore.getSessions()) {
+ for (var session : signalProtocolStore.getSessions()) {
session.address = recipientStore.resolveServiceAddress(session.address);
}
- for (IdentityInfo identity : signalProtocolStore.getIdentities()) {
+ for (var identity : signalProtocolStore.getIdentities()) {
identity.setAddress(recipientStore.resolveServiceAddress(identity.getAddress()));
}
}
- JsonNode profileStoreNode = rootNode.get("profileStore");
+ var profileStoreNode = rootNode.get("profileStore");
if (profileStoreNode != null) {
profileStore = jsonProcessor.convertValue(profileStoreNode, ProfileStore.class);
}
profileStore = new ProfileStore();
}
- JsonNode stickerStoreNode = rootNode.get("stickerStore");
+ var stickerStoreNode = rootNode.get("stickerStore");
if (stickerStoreNode != null) {
stickerStore = jsonProcessor.convertValue(stickerStoreNode, StickerStore.class);
}
messageCache = new MessageCache(getMessageCachePath(dataPath, username));
- JsonNode threadStoreNode = rootNode.get("threadStore");
+ var threadStoreNode = rootNode.get("threadStore");
if (threadStoreNode != null && !threadStoreNode.isNull()) {
- LegacyJsonThreadStore threadStore = jsonProcessor.convertValue(threadStoreNode,
- LegacyJsonThreadStore.class);
+ var threadStore = jsonProcessor.convertValue(threadStoreNode, LegacyJsonThreadStore.class);
// Migrate thread info to group and contact store
- for (ThreadInfo thread : threadStore.getThreads()) {
+ for (var thread : threadStore.getThreads()) {
if (thread.id == null || thread.id.isEmpty()) {
continue;
}
try {
- ContactInfo contactInfo = contactStore.getContact(new SignalServiceAddress(null, thread.id));
+ var contactInfo = contactStore.getContact(new SignalServiceAddress(null, thread.id));
if (contactInfo != null) {
contactInfo.messageExpirationTime = thread.messageExpirationTime;
contactStore.updateContact(contactInfo);
} else {
- GroupInfo groupInfo = groupStore.getGroup(GroupId.fromBase64(thread.id));
+ var groupInfo = groupStore.getGroup(GroupId.fromBase64(thread.id));
if (groupInfo instanceof GroupInfoV1) {
((GroupInfoV1) groupInfo).messageExpirationTime = thread.messageExpirationTime;
groupStore.updateGroup(groupInfo);
if (fileChannel == null) {
return;
}
- ObjectNode rootNode = jsonProcessor.createObjectNode();
+ var rootNode = jsonProcessor.createObjectNode();
rootNode.put("username", username)
.put("uuid", uuid == null ? null : uuid.toString())
.put("deviceId", deviceId)
.putPOJO("profileStore", profileStore)
.putPOJO("stickerStore", stickerStore);
try {
- try (ByteArrayOutputStream output = new ByteArrayOutputStream()) {
+ try (var output = new ByteArrayOutputStream()) {
// Write to memory first to prevent corrupting the file in case of serialization errors
jsonProcessor.writeValue(output, rootNode);
- ByteArrayInputStream input = new ByteArrayInputStream(output.toByteArray());
+ var input = new ByteArrayInputStream(output.toByteArray());
synchronized (fileChannel) {
fileChannel.position(0);
input.transferTo(Channels.newOutputStream(fileChannel));
}
private static Pair<FileChannel, FileLock> openFileChannel(File fileName) throws IOException {
- FileChannel fileChannel = new RandomAccessFile(fileName, "rw").getChannel();
- FileLock lock = fileChannel.tryLock();
+ var fileChannel = new RandomAccessFile(fileName, "rw").getChannel();
+ var lock = fileChannel.tryLock();
if (lock == null) {
logger.info("Config file is in use by another instance, waiting…");
lock = fileChannel.lock();
}
public void addPreKeys(Collection<PreKeyRecord> records) {
- for (PreKeyRecord record : records) {
+ for (var record : records) {
signalProtocolStore.storePreKey(record.getId(), record);
}
preKeyIdOffset = (preKeyIdOffset + records.size()) % Medium.MAX_VALUE;
private List<ContactInfo> contacts = new ArrayList<>();
public void updateContact(ContactInfo contact) {
- final SignalServiceAddress contactAddress = contact.getAddress();
- for (int i = 0; i < contacts.size(); i++) {
+ final var contactAddress = contact.getAddress();
+ for (var i = 0; i < contacts.size(); i++) {
if (contacts.get(i).getAddress().matches(contactAddress)) {
contacts.set(i, contact);
return;
}
public ContactInfo getContact(SignalServiceAddress address) {
- for (ContactInfo contact : contacts) {
+ for (var contact : contacts) {
if (contact.getAddress().matches(address)) {
if (contact.uuid == null) {
contact.uuid = address.getUuid().orNull();
@JsonIgnore
public boolean isMember(SignalServiceAddress address) {
- for (SignalServiceAddress member : getMembers()) {
+ for (var member : getMembers()) {
if (member.matches(address)) {
return true;
}
@JsonIgnore
public boolean isPendingMember(SignalServiceAddress address) {
- for (SignalServiceAddress member : getPendingMembers()) {
+ for (var member : getPendingMembers()) {
if (member.matches(address)) {
return true;
}
}
public void addMembers(Collection<SignalServiceAddress> addresses) {
- for (SignalServiceAddress address : addresses) {
+ for (var address : addresses) {
if (this.members.contains(address)) {
continue;
}
final Set<SignalServiceAddress> value, final JsonGenerator jgen, final SerializerProvider provider
) throws IOException {
jgen.writeStartArray(value.size());
- for (SignalServiceAddress address : value) {
+ for (var address : value) {
if (address.getUuid().isPresent()) {
jgen.writeObject(new JsonSignalServiceAddress(address));
} else {
public Set<SignalServiceAddress> deserialize(
JsonParser jsonParser, DeserializationContext deserializationContext
) throws IOException {
- Set<SignalServiceAddress> addresses = new HashSet<>();
+ var addresses = new HashSet<SignalServiceAddress>();
JsonNode node = jsonParser.getCodec().readTree(jsonParser);
- for (JsonNode n : node) {
+ for (var n : node) {
if (n.isTextual()) {
addresses.add(new SignalServiceAddress(null, n.textValue()));
} else {
- JsonSignalServiceAddress address = jsonProcessor.treeToValue(n, JsonSignalServiceAddress.class);
+ var address = jsonProcessor.treeToValue(n, JsonSignalServiceAddress.class);
addresses.add(address.toSignalServiceAddress());
}
}
import java.io.IOException;
import java.util.ArrayList;
import java.util.Base64;
-import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
if (group instanceof GroupInfoV2 && ((GroupInfoV2) group).getGroup() != null) {
try {
IOUtils.createPrivateDirectories(groupCachePath);
- try (FileOutputStream stream = new FileOutputStream(getGroupFile(group.getGroupId()))) {
+ try (var stream = new FileOutputStream(getGroupFile(group.getGroupId()))) {
((GroupInfoV2) group).getGroup().writeTo(stream);
}
- final File groupFileLegacy = getGroupFileLegacy(group.getGroupId());
+ final var groupFileLegacy = getGroupFileLegacy(group.getGroupId());
if (groupFileLegacy.exists()) {
groupFileLegacy.delete();
}
}
public GroupInfo getGroup(GroupId groupId) {
- GroupInfo group = groups.get(groupId);
+ var group = groups.get(groupId);
if (group == null) {
if (groupId instanceof GroupIdV1) {
group = groups.get(GroupUtils.getGroupIdV2((GroupIdV1) groupId));
}
private GroupInfoV1 getGroupV1ByV2Id(GroupIdV2 groupIdV2) {
- for (GroupInfo g : groups.values()) {
+ for (var g : groups.values()) {
if (g instanceof GroupInfoV1) {
- final GroupInfoV1 gv1 = (GroupInfoV1) g;
+ final var gv1 = (GroupInfoV1) g;
if (groupIdV2.equals(gv1.getExpectedV2Id())) {
return gv1;
}
private void loadDecryptedGroup(final GroupInfo group) {
if (group instanceof GroupInfoV2 && ((GroupInfoV2) group).getGroup() == null) {
- File groupFile = getGroupFile(group.getGroupId());
+ var groupFile = getGroupFile(group.getGroupId());
if (!groupFile.exists()) {
groupFile = getGroupFileLegacy(group.getGroupId());
}
if (!groupFile.exists()) {
return;
}
- try (FileInputStream stream = new FileInputStream(groupFile)) {
+ try (var stream = new FileInputStream(groupFile)) {
((GroupInfoV2) group).setGroup(DecryptedGroup.parseFrom(stream));
} catch (IOException ignored) {
}
}
public GroupInfoV1 getOrCreateGroupV1(GroupIdV1 groupId) {
- GroupInfo group = getGroup(groupId);
+ var group = getGroup(groupId);
if (group instanceof GroupInfoV1) {
return (GroupInfoV1) group;
}
}
public List<GroupInfo> getGroups() {
- final Collection<GroupInfo> groups = this.groups.values();
- for (GroupInfo group : groups) {
+ final var groups = this.groups.values();
+ for (var group : groups) {
loadDecryptedGroup(group);
}
return new ArrayList<>(groups);
public void serialize(
final Map<String, GroupInfo> value, final JsonGenerator jgen, final SerializerProvider provider
) throws IOException {
- final Collection<GroupInfo> groups = value.values();
+ final var groups = value.values();
jgen.writeStartArray(groups.size());
- for (GroupInfo group : groups) {
+ for (var group : groups) {
if (group instanceof GroupInfoV1) {
jgen.writeObject(group);
} else if (group instanceof GroupInfoV2) {
- final GroupInfoV2 groupV2 = (GroupInfoV2) group;
+ final var groupV2 = (GroupInfoV2) group;
jgen.writeStartObject();
jgen.writeStringField("groupId", groupV2.getGroupId().toBase64());
jgen.writeStringField("masterKey",
public Map<GroupId, GroupInfo> deserialize(
JsonParser jsonParser, DeserializationContext deserializationContext
) throws IOException {
- Map<GroupId, GroupInfo> groups = new HashMap<>();
+ var groups = new HashMap<GroupId, GroupInfo>();
JsonNode node = jsonParser.getCodec().readTree(jsonParser);
- for (JsonNode n : node) {
+ for (var n : node) {
GroupInfo g;
if (n.hasNonNull("masterKey")) {
// a v2 group
- GroupIdV2 groupId = GroupIdV2.fromBase64(n.get("groupId").asText());
+ var groupId = GroupIdV2.fromBase64(n.get("groupId").asText());
try {
- GroupMasterKey masterKey = new GroupMasterKey(Base64.getDecoder()
- .decode(n.get("masterKey").asText()));
+ var masterKey = new GroupMasterKey(Base64.getDecoder().decode(n.get("masterKey").asText()));
g = new GroupInfoV2(groupId, masterKey);
} catch (InvalidInputException | IllegalArgumentException e) {
throw new AssertionError("Invalid master key for group " + groupId.toBase64());
return Stream.of(dir);
}
- final File[] files = Objects.requireNonNull(dir.listFiles());
+ final var files = Objects.requireNonNull(dir.listFiles());
if (files.length == 0) {
try {
Files.delete(dir.toPath());
}
public CachedMessage cacheMessage(SignalServiceEnvelope envelope) {
- final long now = new Date().getTime();
- final String source = envelope.hasSource() ? envelope.getSourceAddress().getLegacyIdentifier() : "";
+ final var now = new Date().getTime();
+ final var source = envelope.hasSource() ? envelope.getSourceAddress().getLegacyIdentifier() : "";
try {
- File cacheFile = getMessageCacheFile(source, now, envelope.getTimestamp());
+ var cacheFile = getMessageCacheFile(source, now, envelope.getTimestamp());
MessageCacheUtils.storeEnvelope(envelope, cacheFile);
return new CachedMessage(cacheFile);
} catch (IOException e) {
}
private File getMessageCacheFile(String sender, long now, long timestamp) throws IOException {
- File cachePath = getMessageCachePath(sender);
+ var cachePath = getMessageCachePath(sender);
IOUtils.createPrivateDirectories(cachePath);
return new File(cachePath, now + "_" + timestamp);
}
import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
-import java.util.UUID;
public class ProfileStore {
private final List<SignalProfileEntry> profiles = new ArrayList<>();
public SignalProfileEntry getProfileEntry(SignalServiceAddress serviceAddress) {
- for (SignalProfileEntry entry : profiles) {
+ for (var entry : profiles) {
if (entry.getServiceAddress().matches(serviceAddress)) {
return entry;
}
}
public ProfileKey getProfileKey(SignalServiceAddress serviceAddress) {
- for (SignalProfileEntry entry : profiles) {
+ for (var entry : profiles) {
if (entry.getServiceAddress().matches(serviceAddress)) {
return entry.getProfileKey();
}
SignalProfile profile,
ProfileKeyCredential profileKeyCredential
) {
- SignalProfileEntry newEntry = new SignalProfileEntry(serviceAddress,
- profileKey,
- now,
- profile,
- profileKeyCredential);
- for (int i = 0; i < profiles.size(); i++) {
+ var newEntry = new SignalProfileEntry(serviceAddress, profileKey, now, profile, profileKeyCredential);
+ for (var i = 0; i < profiles.size(); i++) {
if (profiles.get(i).getServiceAddress().matches(serviceAddress)) {
profiles.set(i, newEntry);
return;
}
public void storeProfileKey(SignalServiceAddress serviceAddress, ProfileKey profileKey) {
- SignalProfileEntry newEntry = new SignalProfileEntry(serviceAddress, profileKey, 0, null, null);
- for (int i = 0; i < profiles.size(); i++) {
+ var newEntry = new SignalProfileEntry(serviceAddress, profileKey, 0, null, null);
+ for (var i = 0; i < profiles.size(); i++) {
if (profiles.get(i).getServiceAddress().matches(serviceAddress)) {
if (!profiles.get(i).getProfileKey().equals(profileKey)) {
profiles.set(i, newEntry);
) throws IOException {
JsonNode node = jsonParser.getCodec().readTree(jsonParser);
- List<SignalProfileEntry> addresses = new ArrayList<>();
+ var addresses = new ArrayList<SignalProfileEntry>();
if (node.isArray()) {
- for (JsonNode entry : node) {
- String name = entry.hasNonNull("name") ? entry.get("name").asText() : null;
- UUID uuid = entry.hasNonNull("uuid") ? UuidUtil.parseOrNull(entry.get("uuid").asText()) : null;
- final SignalServiceAddress serviceAddress = new SignalServiceAddress(uuid, name);
+ for (var entry : node) {
+ var name = entry.hasNonNull("name") ? entry.get("name").asText() : null;
+ var uuid = entry.hasNonNull("uuid") ? UuidUtil.parseOrNull(entry.get("uuid").asText()) : null;
+ final var serviceAddress = new SignalServiceAddress(uuid, name);
ProfileKey profileKey = null;
try {
profileKey = new ProfileKey(Base64.getDecoder().decode(entry.get("profileKey").asText()));
} catch (Throwable ignored) {
}
}
- long lastUpdateTimestamp = entry.get("lastUpdateTimestamp").asLong();
- SignalProfile profile = jsonProcessor.treeToValue(entry.get("profile"), SignalProfile.class);
+ var lastUpdateTimestamp = entry.get("lastUpdateTimestamp").asLong();
+ var profile = jsonProcessor.treeToValue(entry.get("profile"), SignalProfile.class);
addresses.add(new SignalProfileEntry(serviceAddress,
profileKey,
lastUpdateTimestamp,
List<SignalProfileEntry> profiles, JsonGenerator json, SerializerProvider serializerProvider
) throws IOException {
json.writeStartArray();
- for (SignalProfileEntry profileEntry : profiles) {
- final SignalServiceAddress address = profileEntry.getServiceAddress();
+ for (var profileEntry : profiles) {
+ final var address = profileEntry.getServiceAddress();
json.writeStartObject();
if (address.getNumber().isPresent()) {
json.writeStringField("name", address.getNumber().get());
import java.util.Base64;
import java.util.Date;
import java.util.List;
-import java.util.UUID;
public class JsonIdentityKeyStore implements IdentityKeyStore {
public boolean saveIdentity(
SignalServiceAddress serviceAddress, IdentityKey identityKey, TrustLevel trustLevel, Date added
) {
- for (IdentityInfo id : identities) {
+ for (var id : identities) {
if (!id.address.matches(serviceAddress) || !id.identityKey.equals(identityKey)) {
continue;
}
public void setIdentityTrustLevel(
SignalServiceAddress serviceAddress, IdentityKey identityKey, TrustLevel trustLevel
) {
- for (IdentityInfo id : identities) {
+ for (var id : identities) {
if (!id.address.matches(serviceAddress) || !id.identityKey.equals(identityKey)) {
continue;
}
@Override
public boolean isTrustedIdentity(SignalProtocolAddress address, IdentityKey identityKey, Direction direction) {
// TODO implement possibility for different handling of incoming/outgoing trust decisions
- SignalServiceAddress serviceAddress = resolveSignalServiceAddress(address.getName());
- boolean trustOnFirstUse = true;
+ var serviceAddress = resolveSignalServiceAddress(address.getName());
+ var trustOnFirstUse = true;
- for (IdentityInfo id : identities) {
+ for (var id : identities) {
if (!id.address.matches(serviceAddress)) {
continue;
}
@Override
public IdentityKey getIdentity(SignalProtocolAddress address) {
- SignalServiceAddress serviceAddress = resolveSignalServiceAddress(address.getName());
- IdentityInfo identity = getIdentity(serviceAddress);
+ var serviceAddress = resolveSignalServiceAddress(address.getName());
+ var identity = getIdentity(serviceAddress);
return identity == null ? null : identity.getIdentityKey();
}
public IdentityInfo getIdentity(SignalServiceAddress serviceAddress) {
long maxDate = 0;
IdentityInfo maxIdentity = null;
- for (IdentityInfo id : this.identities) {
+ for (var id : this.identities) {
if (!id.address.matches(serviceAddress)) {
continue;
}
- final long time = id.getDateAdded().getTime();
+ final var time = id.getDateAdded().getTime();
if (maxIdentity == null || maxDate <= time) {
maxDate = time;
maxIdentity = id;
}
public List<IdentityInfo> getIdentities(SignalServiceAddress serviceAddress) {
- List<IdentityInfo> identities = new ArrayList<>();
- for (IdentityInfo identity : this.identities) {
+ var identities = new ArrayList<IdentityInfo>();
+ for (var identity : this.identities) {
if (identity.address.matches(serviceAddress)) {
identities.add(identity);
}
) throws IOException {
JsonNode node = jsonParser.getCodec().readTree(jsonParser);
- int localRegistrationId = node.get("registrationId").asInt();
- IdentityKeyPair identityKeyPair = new IdentityKeyPair(Base64.getDecoder()
- .decode(node.get("identityKey").asText()));
+ var localRegistrationId = node.get("registrationId").asInt();
+ var identityKeyPair = new IdentityKeyPair(Base64.getDecoder().decode(node.get("identityKey").asText()));
- JsonIdentityKeyStore keyStore = new JsonIdentityKeyStore(identityKeyPair, localRegistrationId);
+ var keyStore = new JsonIdentityKeyStore(identityKeyPair, localRegistrationId);
- JsonNode trustedKeysNode = node.get("trustedKeys");
+ var trustedKeysNode = node.get("trustedKeys");
if (trustedKeysNode.isArray()) {
- for (JsonNode trustedKey : trustedKeysNode) {
- String trustedKeyName = trustedKey.hasNonNull("name") ? trustedKey.get("name").asText() : null;
+ for (var trustedKey : trustedKeysNode) {
+ var trustedKeyName = trustedKey.hasNonNull("name") ? trustedKey.get("name").asText() : null;
if (UuidUtil.isUuid(trustedKeyName)) {
// Ignore identities that were incorrectly created with UUIDs as name
continue;
}
- UUID uuid = trustedKey.hasNonNull("uuid")
+ var uuid = trustedKey.hasNonNull("uuid")
? UuidUtil.parseOrNull(trustedKey.get("uuid").asText())
: null;
- final SignalServiceAddress serviceAddress = uuid == null
+ final var serviceAddress = uuid == null
? Utils.getSignalServiceAddressFromIdentifier(trustedKeyName)
: new SignalServiceAddress(uuid, trustedKeyName);
try {
- IdentityKey id = new IdentityKey(Base64.getDecoder()
- .decode(trustedKey.get("identityKey").asText()), 0);
- TrustLevel trustLevel = trustedKey.hasNonNull("trustLevel") ? TrustLevel.fromInt(trustedKey.get(
+ var id = new IdentityKey(Base64.getDecoder().decode(trustedKey.get("identityKey").asText()), 0);
+ var trustLevel = trustedKey.hasNonNull("trustLevel") ? TrustLevel.fromInt(trustedKey.get(
"trustLevel").asInt()) : TrustLevel.TRUSTED_UNVERIFIED;
- Date added = trustedKey.hasNonNull("addedTimestamp") ? new Date(trustedKey.get("addedTimestamp")
+ var added = trustedKey.hasNonNull("addedTimestamp") ? new Date(trustedKey.get("addedTimestamp")
.asLong()) : new Date();
keyStore.saveIdentity(serviceAddress, id, trustLevel, added);
} catch (InvalidKeyException e) {
Base64.getEncoder()
.encodeToString(jsonIdentityKeyStore.getIdentityKeyPair().getPublicKey().serialize()));
json.writeArrayFieldStart("trustedKeys");
- for (IdentityInfo trustedKey : jsonIdentityKeyStore.identities) {
+ for (var trustedKey : jsonIdentityKeyStore.identities) {
json.writeStartObject();
if (trustedKey.getAddress().getNumber().isPresent()) {
json.writeStringField("name", trustedKey.getAddress().getNumber().get());
) throws IOException {
JsonNode node = jsonParser.getCodec().readTree(jsonParser);
- Map<Integer, byte[]> preKeyMap = new HashMap<>();
+ var preKeyMap = new HashMap<Integer, byte[]>();
if (node.isArray()) {
- for (JsonNode preKey : node) {
- final int preKeyId = preKey.get("id").asInt();
- final byte[] preKeyRecord = Base64.getDecoder().decode(preKey.get("record").asText());
+ for (var preKey : node) {
+ final var preKeyId = preKey.get("id").asInt();
+ final var preKeyRecord = Base64.getDecoder().decode(preKey.get("record").asText());
preKeyMap.put(preKeyId, preKeyRecord);
}
}
- JsonPreKeyStore keyStore = new JsonPreKeyStore();
+ var keyStore = new JsonPreKeyStore();
keyStore.addPreKeys(preKeyMap);
return keyStore;
JsonPreKeyStore jsonPreKeyStore, JsonGenerator json, SerializerProvider serializerProvider
) throws IOException {
json.writeStartArray();
- for (Map.Entry<Integer, byte[]> preKey : jsonPreKeyStore.store.entrySet()) {
+ for (var preKey : jsonPreKeyStore.store.entrySet()) {
json.writeStartObject();
json.writeNumberField("id", preKey.getKey());
json.writeStringField("record", Base64.getEncoder().encodeToString(preKey.getValue()));
import java.util.Base64;
import java.util.LinkedList;
import java.util.List;
-import java.util.UUID;
class JsonSessionStore implements SignalServiceSessionStore {
@Override
public synchronized SessionRecord loadSession(SignalProtocolAddress address) {
- SignalServiceAddress serviceAddress = resolveSignalServiceAddress(address.getName());
- for (SessionInfo info : sessions) {
+ var serviceAddress = resolveSignalServiceAddress(address.getName());
+ for (var info : sessions) {
if (info.address.matches(serviceAddress) && info.deviceId == address.getDeviceId()) {
try {
return new SessionRecord(info.sessionRecord);
} catch (IOException e) {
logger.warn("Failed to load session, resetting session: {}", e.getMessage());
- final SessionRecord sessionRecord = new SessionRecord();
+ final var sessionRecord = new SessionRecord();
info.sessionRecord = sessionRecord.serialize();
return sessionRecord;
}
@Override
public synchronized List<Integer> getSubDeviceSessions(String name) {
- SignalServiceAddress serviceAddress = resolveSignalServiceAddress(name);
+ var serviceAddress = resolveSignalServiceAddress(name);
- List<Integer> deviceIds = new LinkedList<>();
- for (SessionInfo info : sessions) {
+ var deviceIds = new LinkedList<Integer>();
+ for (var info : sessions) {
if (info.address.matches(serviceAddress) && info.deviceId != 1) {
deviceIds.add(info.deviceId);
}
@Override
public synchronized void storeSession(SignalProtocolAddress address, SessionRecord record) {
- SignalServiceAddress serviceAddress = resolveSignalServiceAddress(address.getName());
- for (SessionInfo info : sessions) {
+ var serviceAddress = resolveSignalServiceAddress(address.getName());
+ for (var info : sessions) {
if (info.address.matches(serviceAddress) && info.deviceId == address.getDeviceId()) {
if (!info.address.getUuid().isPresent() || !info.address.getNumber().isPresent()) {
info.address = serviceAddress;
@Override
public synchronized boolean containsSession(SignalProtocolAddress address) {
- SignalServiceAddress serviceAddress = resolveSignalServiceAddress(address.getName());
- for (SessionInfo info : sessions) {
+ var serviceAddress = resolveSignalServiceAddress(address.getName());
+ for (var info : sessions) {
if (info.address.matches(serviceAddress) && info.deviceId == address.getDeviceId()) {
return true;
}
@Override
public synchronized void deleteSession(SignalProtocolAddress address) {
- SignalServiceAddress serviceAddress = resolveSignalServiceAddress(address.getName());
+ var serviceAddress = resolveSignalServiceAddress(address.getName());
sessions.removeIf(info -> info.address.matches(serviceAddress) && info.deviceId == address.getDeviceId());
}
@Override
public synchronized void deleteAllSessions(String name) {
- SignalServiceAddress serviceAddress = resolveSignalServiceAddress(name);
+ var serviceAddress = resolveSignalServiceAddress(name);
deleteAllSessions(serviceAddress);
}
@Override
public void archiveSession(final SignalProtocolAddress address) {
- final SessionRecord sessionRecord = loadSession(address);
+ final var sessionRecord = loadSession(address);
if (sessionRecord == null) {
return;
}
}
public void archiveAllSessions() {
- for (SessionInfo info : sessions) {
+ for (var info : sessions) {
try {
- final SessionRecord sessionRecord = new SessionRecord(info.sessionRecord);
+ final var sessionRecord = new SessionRecord(info.sessionRecord);
sessionRecord.archiveCurrentState();
info.sessionRecord = sessionRecord.serialize();
} catch (IOException ignored) {
) throws IOException {
JsonNode node = jsonParser.getCodec().readTree(jsonParser);
- JsonSessionStore sessionStore = new JsonSessionStore();
+ var sessionStore = new JsonSessionStore();
if (node.isArray()) {
- for (JsonNode session : node) {
- String sessionName = session.hasNonNull("name") ? session.get("name").asText() : null;
+ for (var session : node) {
+ var sessionName = session.hasNonNull("name") ? session.get("name").asText() : null;
if (UuidUtil.isUuid(sessionName)) {
// Ignore sessions that were incorrectly created with UUIDs as name
continue;
}
- UUID uuid = session.hasNonNull("uuid") ? UuidUtil.parseOrNull(session.get("uuid").asText()) : null;
- final SignalServiceAddress serviceAddress = uuid == null
+ var uuid = session.hasNonNull("uuid") ? UuidUtil.parseOrNull(session.get("uuid").asText()) : null;
+ final var serviceAddress = uuid == null
? Utils.getSignalServiceAddressFromIdentifier(sessionName)
: new SignalServiceAddress(uuid, sessionName);
- final int deviceId = session.get("deviceId").asInt();
- final byte[] record = Base64.getDecoder().decode(session.get("record").asText());
- SessionInfo sessionInfo = new SessionInfo(serviceAddress, deviceId, record);
+ final var deviceId = session.get("deviceId").asInt();
+ final var record = Base64.getDecoder().decode(session.get("record").asText());
+ var sessionInfo = new SessionInfo(serviceAddress, deviceId, record);
sessionStore.sessions.add(sessionInfo);
}
}
JsonSessionStore jsonSessionStore, JsonGenerator json, SerializerProvider serializerProvider
) throws IOException {
json.writeStartArray();
- for (SessionInfo sessionInfo : jsonSessionStore.sessions) {
+ for (var sessionInfo : jsonSessionStore.sessions) {
json.writeStartObject();
if (sessionInfo.address.getNumber().isPresent()) {
json.writeStringField("name", sessionInfo.address.getNumber().get());
@Override
public List<SignedPreKeyRecord> loadSignedPreKeys() {
try {
- List<SignedPreKeyRecord> results = new LinkedList<>();
+ var results = new LinkedList<SignedPreKeyRecord>();
- for (byte[] serialized : store.values()) {
+ for (var serialized : store.values()) {
results.add(new SignedPreKeyRecord(serialized));
}
) throws IOException {
JsonNode node = jsonParser.getCodec().readTree(jsonParser);
- Map<Integer, byte[]> preKeyMap = new HashMap<>();
+ var preKeyMap = new HashMap<Integer, byte[]>();
if (node.isArray()) {
- for (JsonNode preKey : node) {
- final int preKeyId = preKey.get("id").asInt();
- final byte[] preKeyRecord = Base64.getDecoder().decode(preKey.get("record").asText());
+ for (var preKey : node) {
+ final var preKeyId = preKey.get("id").asInt();
+ final var preKeyRecord = Base64.getDecoder().decode(preKey.get("record").asText());
preKeyMap.put(preKeyId, preKeyRecord);
}
}
- JsonSignedPreKeyStore keyStore = new JsonSignedPreKeyStore();
+ var keyStore = new JsonSignedPreKeyStore();
keyStore.addSignedPreKeys(preKeyMap);
return keyStore;
JsonSignedPreKeyStore jsonPreKeyStore, JsonGenerator json, SerializerProvider serializerProvider
) throws IOException {
json.writeStartArray();
- for (Map.Entry<Integer, byte[]> signedPreKey : jsonPreKeyStore.store.entrySet()) {
+ for (var signedPreKey : jsonPreKeyStore.store.entrySet()) {
json.writeStartObject();
json.writeNumberField("id", signedPreKey.getKey());
json.writeStringField("record", Base64.getEncoder().encodeToString(signedPreKey.getValue()));
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
-import java.util.UUID;
public class RecipientStore {
return serviceAddress;
}
- for (SignalServiceAddress address : addresses) {
+ for (var address : addresses) {
if (address.matches(serviceAddress)) {
return address;
}
) throws IOException {
JsonNode node = jsonParser.getCodec().readTree(jsonParser);
- Set<SignalServiceAddress> addresses = new HashSet<>();
+ var addresses = new HashSet<SignalServiceAddress>();
if (node.isArray()) {
- for (JsonNode recipient : node) {
- String recipientName = recipient.get("name").asText();
- UUID uuid = UuidUtil.parseOrThrow(recipient.get("uuid").asText());
- final SignalServiceAddress serviceAddress = new SignalServiceAddress(uuid, recipientName);
+ for (var recipient : node) {
+ var recipientName = recipient.get("name").asText();
+ var uuid = UuidUtil.parseOrThrow(recipient.get("uuid").asText());
+ final var serviceAddress = new SignalServiceAddress(uuid, recipientName);
addresses.add(serviceAddress);
}
}
Set<SignalServiceAddress> addresses, JsonGenerator json, SerializerProvider serializerProvider
) throws IOException {
json.writeStartArray();
- for (SignalServiceAddress address : addresses) {
+ for (var address : addresses) {
json.writeStartObject();
json.writeStringField("name", address.getNumber().get());
json.writeStringField("uuid", address.getUuid().get().toString());
import java.io.IOException;
import java.util.Base64;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
public void serialize(
final Map<byte[], Sticker> value, final JsonGenerator jgen, final SerializerProvider provider
) throws IOException {
- final Collection<Sticker> stickers = value.values();
+ final var stickers = value.values();
jgen.writeStartArray(stickers.size());
- for (Sticker sticker : stickers) {
+ for (var sticker : stickers) {
jgen.writeStartObject();
jgen.writeStringField("packId", Base64.getEncoder().encodeToString(sticker.getPackId()));
jgen.writeStringField("packKey", Base64.getEncoder().encodeToString(sticker.getPackKey()));
public Map<byte[], Sticker> deserialize(
JsonParser jsonParser, DeserializationContext deserializationContext
) throws IOException {
- Map<byte[], Sticker> stickers = new HashMap<>();
+ var stickers = new HashMap<byte[], Sticker>();
JsonNode node = jsonParser.getCodec().readTree(jsonParser);
- for (JsonNode n : node) {
- byte[] packId = Base64.getDecoder().decode(n.get("packId").asText());
- byte[] packKey = Base64.getDecoder().decode(n.get("packKey").asText());
- boolean installed = n.get("installed").asBoolean(false);
+ for (var n : node) {
+ var packId = Base64.getDecoder().decode(n.get("packId").asText());
+ var packKey = Base64.getDecoder().decode(n.get("packKey").asText());
+ var installed = n.get("installed").asBoolean(false);
stickers.put(packId, new Sticker(packId, packKey, installed));
}
public Map<String, ThreadInfo> deserialize(
JsonParser jsonParser, DeserializationContext deserializationContext
) throws IOException {
- Map<String, ThreadInfo> threads = new HashMap<>();
+ var threads = new HashMap<String, ThreadInfo>();
JsonNode node = jsonParser.getCodec().readTree(jsonParser);
- for (JsonNode n : node) {
- ThreadInfo t = jsonProcessor.treeToValue(n, ThreadInfo.class);
+ for (var n : node) {
+ var t = jsonProcessor.treeToValue(n, ThreadInfo.class);
threads.put(t.id, t);
}
List<SignalServiceAttachment> signalServiceAttachments = null;
if (attachments != null) {
signalServiceAttachments = new ArrayList<>(attachments.size());
- for (String attachment : attachments) {
+ for (var attachment : attachments) {
try {
signalServiceAttachments.add(createAttachment(new File(attachment)));
} catch (IOException e) {
}
public static SignalServiceAttachmentStream createAttachment(File attachmentFile) throws IOException {
- final StreamDetails streamDetails = Utils.createStreamDetailsFromFile(attachmentFile);
+ final var streamDetails = Utils.createStreamDetailsFromFile(attachmentFile);
return createAttachment(streamDetails, Optional.of(attachmentFile.getName()));
}
StreamDetails streamDetails, Optional<String> name
) {
// TODO mabybe add a parameter to set the voiceNote, borderless, preview, width, height and caption option
- final long uploadTimestamp = System.currentTimeMillis();
+ final var uploadTimestamp = System.currentTimeMillis();
Optional<byte[]> preview = Optional.absent();
Optional<String> caption = Optional.absent();
Optional<String> blurHash = Optional.absent();
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.file.Files;
-import java.nio.file.Path;
import java.nio.file.attribute.PosixFilePermission;
import java.nio.file.attribute.PosixFilePermissions;
import java.util.EnumSet;
public class IOUtils {
public static File createTempFile() throws IOException {
- final File tempFile = File.createTempFile("signal-cli_tmp_", ".tmp");
+ final var tempFile = File.createTempFile("signal-cli_tmp_", ".tmp");
tempFile.deleteOnExit();
return tempFile;
}
public static byte[] readFully(InputStream in) throws IOException {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ var baos = new ByteArrayOutputStream();
IOUtils.copyStream(in, baos);
return baos.toByteArray();
}
return;
}
- final Path path = file.toPath();
+ final var path = file.toPath();
try {
Set<PosixFilePermission> perms = EnumSet.of(OWNER_READ, OWNER_WRITE, OWNER_EXECUTE);
Files.createDirectories(path, PosixFilePermissions.asFileAttribute(perms));
}
public static void createPrivateFile(File path) throws IOException {
- final Path file = path.toPath();
+ final var file = path.toPath();
try {
Set<PosixFilePermission> perms = EnumSet.of(OWNER_READ, OWNER_WRITE);
Files.createFile(file, PosixFilePermissions.asFileAttribute(perms));
}
public static void copyStream(InputStream input, OutputStream output, int bufferSize) throws IOException {
- byte[] buffer = new byte[bufferSize];
+ var buffer = new byte[bufferSize];
int read;
while ((read = input.read(buffer)) != -1) {
import org.whispersystems.libsignal.IdentityKeyPair;
import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.libsignal.ecc.Curve;
-import org.whispersystems.libsignal.ecc.ECKeyPair;
-import org.whispersystems.libsignal.ecc.ECPrivateKey;
import org.whispersystems.libsignal.state.PreKeyRecord;
import org.whispersystems.libsignal.state.SignedPreKeyRecord;
import org.whispersystems.libsignal.util.Medium;
}
public static IdentityKeyPair generateIdentityKeyPair() {
- ECKeyPair djbKeyPair = Curve.generateKeyPair();
- IdentityKey djbIdentityKey = new IdentityKey(djbKeyPair.getPublicKey());
- ECPrivateKey djbPrivateKey = djbKeyPair.getPrivateKey();
+ var djbKeyPair = Curve.generateKeyPair();
+ var djbIdentityKey = new IdentityKey(djbKeyPair.getPublicKey());
+ var djbPrivateKey = djbKeyPair.getPrivateKey();
return new IdentityKeyPair(djbIdentityKey, djbPrivateKey);
}
public static List<PreKeyRecord> generatePreKeyRecords(final int offset, final int batchSize) {
- List<PreKeyRecord> records = new ArrayList<>(batchSize);
- for (int i = 0; i < batchSize; i++) {
- int preKeyId = (offset + i) % Medium.MAX_VALUE;
- ECKeyPair keyPair = Curve.generateKeyPair();
- PreKeyRecord record = new PreKeyRecord(preKeyId, keyPair);
+ var records = new ArrayList<PreKeyRecord>(batchSize);
+ for (var i = 0; i < batchSize; i++) {
+ var preKeyId = (offset + i) % Medium.MAX_VALUE;
+ var keyPair = Curve.generateKeyPair();
+ var record = new PreKeyRecord(preKeyId, keyPair);
records.add(record);
}
public static SignedPreKeyRecord generateSignedPreKeyRecord(
final IdentityKeyPair identityKeyPair, final int signedPreKeyId
) {
- ECKeyPair keyPair = Curve.generateKeyPair();
+ var keyPair = Curve.generateKeyPair();
byte[] signature;
try {
signature = Curve.calculateSignature(identityKeyPair.getPrivateKey(), keyPair.getPublicKey().serialize());
}
private static String getSecret(int size) {
- byte[] secret = getSecretBytes(size);
+ var secret = getSecretBytes(size);
return Base64.getEncoder().encodeToString(secret);
}
public static byte[] getSecretBytes(int size) {
- byte[] secret = new byte[size];
+ var secret = new byte[size];
secureRandom.nextBytes(secret);
return secret;
}
public class MessageCacheUtils {
public static SignalServiceEnvelope loadEnvelope(File file) throws IOException {
- try (FileInputStream f = new FileInputStream(file)) {
- DataInputStream in = new DataInputStream(f);
- int version = in.readInt();
+ try (var f = new FileInputStream(file)) {
+ var in = new DataInputStream(f);
+ var version = in.readInt();
if (version > 4) {
return null;
}
- int type = in.readInt();
- String source = in.readUTF();
+ var type = in.readInt();
+ var source = in.readUTF();
UUID sourceUuid = null;
if (version >= 3) {
sourceUuid = UuidUtil.parseOrNull(in.readUTF());
}
- int sourceDevice = in.readInt();
+ var sourceDevice = in.readInt();
if (version == 1) {
// read legacy relay field
in.readUTF();
}
- long timestamp = in.readLong();
+ var timestamp = in.readLong();
byte[] content = null;
- int contentLen = in.readInt();
+ var contentLen = in.readInt();
if (contentLen > 0) {
content = new byte[contentLen];
in.readFully(content);
}
byte[] legacyMessage = null;
- int legacyMessageLen = in.readInt();
+ var legacyMessageLen = in.readInt();
if (legacyMessageLen > 0) {
legacyMessage = new byte[legacyMessageLen];
in.readFully(legacyMessage);
}
public static void storeEnvelope(SignalServiceEnvelope envelope, File file) throws IOException {
- try (FileOutputStream f = new FileOutputStream(file)) {
- try (DataOutputStream out = new DataOutputStream(f)) {
+ try (var f = new FileOutputStream(file)) {
+ try (var out = new DataOutputStream(f)) {
out.writeInt(4); // version
out.writeInt(envelope.getType());
out.writeUTF(envelope.getSourceE164().isPresent() ? envelope.getSourceE164().get() : "");
out.writeInt(0);
}
out.writeLong(envelope.getServerReceivedTimestamp());
- String uuid = envelope.getUuid();
+ var uuid = envelope.getUuid();
out.writeUTF(uuid == null ? "" : uuid);
out.writeLong(envelope.getServerDeliveredTimestamp());
}
}
public static HashedPin hashPin(String pin, KeyBackupService.HashSession hashSession) {
- final Argon2Parameters params = new Argon2Parameters.Builder(Argon2Parameters.ARGON2_id).withParallelism(1)
+ final var params = new Argon2Parameters.Builder(Argon2Parameters.ARGON2_id).withParallelism(1)
.withIterations(32)
.withVersion(Argon2Parameters.ARGON2_VERSION_13)
.withMemoryAsKB(16 * 1024)
.withSalt(hashSession.hashSalt())
.build();
- final Argon2BytesGenerator generator = new Argon2BytesGenerator();
+ final var generator = new Argon2BytesGenerator();
generator.init(params);
return PinHasher.hashPin(PinHasher.normalize(pin), password -> {
- byte[] output = new byte[64];
+ var output = new byte[64];
generator.generateBytes(password, output);
return output;
});
public static SignalProfile decryptProfile(
final ProfileKey profileKey, final SignalServiceProfile encryptedProfile
) {
- ProfileCipher profileCipher = new ProfileCipher(profileKey);
+ var profileCipher = new ProfileCipher(profileKey);
try {
- String name = decryptName(encryptedProfile.getName(), profileCipher);
- String about = decryptName(encryptedProfile.getAbout(), profileCipher);
- String aboutEmoji = decryptName(encryptedProfile.getAboutEmoji(), profileCipher);
+ var name = decryptName(encryptedProfile.getName(), profileCipher);
+ var about = decryptName(encryptedProfile.getAbout(), profileCipher);
+ var aboutEmoji = decryptName(encryptedProfile.getAboutEmoji(), profileCipher);
String unidentifiedAccess;
try {
unidentifiedAccess = encryptedProfile.getUnidentifiedAccess() == null
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
-import java.util.List;
-import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
public class StickerUtils {
throw new StickerPackInvalidException("Could not find manifest.json");
}
- JsonStickerPack pack = parseStickerPack(rootPath, zip);
+ var pack = parseStickerPack(rootPath, zip);
if (pack.stickers == null) {
throw new StickerPackInvalidException("Must set a 'stickers' field.");
throw new StickerPackInvalidException("Must include stickers.");
}
- List<SignalServiceStickerManifestUpload.StickerInfo> stickers = new ArrayList<>(pack.stickers.size());
- for (JsonStickerPack.JsonSticker sticker : pack.stickers) {
+ var stickers = new ArrayList<SignalServiceStickerManifestUpload.StickerInfo>(pack.stickers.size());
+ for (var sticker : pack.stickers) {
if (sticker.file == null) {
throw new StickerPackInvalidException("Must set a 'file' field on each sticker.");
}
throw new StickerPackInvalidException("Could not find find " + sticker.file);
}
- String contentType = Utils.getFileMimeType(new File(sticker.file), null);
- SignalServiceStickerManifestUpload.StickerInfo stickerInfo = new SignalServiceStickerManifestUpload.StickerInfo(
- data.first(),
+ var contentType = Utils.getFileMimeType(new File(sticker.file), null);
+ var stickerInfo = new SignalServiceStickerManifestUpload.StickerInfo(data.first(),
data.second(),
Optional.fromNullable(sticker.emoji).or(""),
contentType);
throw new StickerPackInvalidException("Could not find find " + pack.cover.file);
}
- String contentType = Utils.getFileMimeType(new File(pack.cover.file), null);
+ var contentType = Utils.getFileMimeType(new File(pack.cover.file), null);
cover = new SignalServiceStickerManifestUpload.StickerInfo(data.first(),
data.second(),
Optional.fromNullable(pack.cover.emoji).or(""),
final String rootPath, final ZipFile zip, final String subfile
) throws IOException {
if (zip != null) {
- final ZipEntry entry = zip.getEntry(subfile);
+ final var entry = zip.getEntry(subfile);
return new Pair<>(zip.getInputStream(entry), entry.getSize());
} else {
- final File file = new File(rootPath, subfile);
+ final var file = new File(rootPath, subfile);
return new Pair<>(new FileInputStream(file), file.length());
}
}
import com.fasterxml.jackson.databind.JsonNode;
import org.whispersystems.libsignal.IdentityKey;
-import org.whispersystems.libsignal.fingerprint.Fingerprint;
import org.whispersystems.libsignal.fingerprint.NumericFingerprintGenerator;
import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import org.whispersystems.signalservice.api.util.StreamDetails;
public class Utils {
public static String getFileMimeType(File file, String defaultMimeType) throws IOException {
- String mime = Files.probeContentType(file.toPath());
+ var mime = Files.probeContentType(file.toPath());
if (mime == null) {
try (InputStream bufferedStream = new BufferedInputStream(new FileInputStream(file))) {
mime = URLConnection.guessContentTypeFromStream(bufferedStream);
public static StreamDetails createStreamDetailsFromFile(File file) throws IOException {
InputStream stream = new FileInputStream(file);
- final long size = file.length();
- final String mime = getFileMimeType(file, "application/octet-stream");
+ final var size = file.length();
+ final var mime = getFileMimeType(file, "application/octet-stream");
return new StreamDetails(stream, mime, size);
}
theirId = theirAddress.getNumber().get().getBytes();
}
- Fingerprint fingerprint = new NumericFingerprintGenerator(5200).createFor(version,
+ var fingerprint = new NumericFingerprintGenerator(5200).createFor(version,
ownId,
ownIdentityKey,
theirId,
}
public static JsonNode getNotNullNode(JsonNode parent, String name) throws InvalidObjectException {
- JsonNode node = parent.get(name);
+ var node = parent.get(name);
if (node == null || node.isNull()) {
throw new InvalidObjectException(String.format("Incorrect file format: expected parameter %s not found ",
name));
import net.sourceforge.argparse4j.ArgumentParsers;
import net.sourceforge.argparse4j.impl.Arguments;
import net.sourceforge.argparse4j.inf.ArgumentParser;
-import net.sourceforge.argparse4j.inf.MutuallyExclusiveGroup;
import net.sourceforge.argparse4j.inf.Namespace;
-import net.sourceforge.argparse4j.inf.Subparser;
-import net.sourceforge.argparse4j.inf.Subparsers;
import org.asamk.Signal;
import org.asamk.signal.commands.Command;
import java.io.File;
import java.io.IOException;
import java.util.List;
-import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
private final Namespace ns;
static ArgumentParser buildArgumentParser() {
- ArgumentParser parser = ArgumentParsers.newFor("signal-cli")
+ var parser = ArgumentParsers.newFor("signal-cli")
.build()
.defaultHelp(true)
.description("Commandline interface for Signal.")
parser.addArgument("-u", "--username").help("Specify your phone number, that will be used for verification.");
- MutuallyExclusiveGroup mut = parser.addMutuallyExclusiveGroup();
+ var mut = parser.addMutuallyExclusiveGroup();
mut.addArgument("--dbus").help("Make request via user dbus.").action(Arguments.storeTrue());
mut.addArgument("--dbus-system").help("Make request via system dbus.").action(Arguments.storeTrue());
.type(Arguments.enumStringType(OutputType.class))
.setDefault(OutputType.PLAIN_TEXT);
- Subparsers subparsers = parser.addSubparsers().title("subcommands").dest("command");
+ var subparsers = parser.addSubparsers().title("subcommands").dest("command");
- final Map<String, Command> commands = Commands.getCommands();
- for (Map.Entry<String, Command> entry : commands.entrySet()) {
- Subparser subparser = subparsers.addParser(entry.getKey());
+ final var commands = Commands.getCommands();
+ for (var entry : commands.entrySet()) {
+ var subparser = subparsers.addParser(entry.getKey());
entry.getValue().attachToSubparser(subparser);
}
}
public int init() {
- String commandKey = ns.getString("command");
- Command command = Commands.getCommand(commandKey);
+ var commandKey = ns.getString("command");
+ var command = Commands.getCommand(commandKey);
if (command == null) {
logger.error("Command not implemented!");
return 1;
return 1;
}
- String username = ns.getString("username");
+ var username = ns.getString("username");
final boolean useDbus = ns.getBoolean("dbus");
final boolean useDbusSystem = ns.getBoolean("dbus_system");
}
final File dataPath;
- String config = ns.getString("config");
+ var config = ns.getString("config");
if (config != null) {
dataPath = new File(config);
} else {
dataPath = getDefaultDataPath();
}
- final ServiceEnvironment serviceEnvironment = ServiceEnvironment.LIVE;
+ final var serviceEnvironment = ServiceEnvironment.LIVE;
if (!ServiceConfig.getCapabilities().isGv2()) {
logger.warn("WARNING: Support for new group V2 is disabled,"
}
if (username == null) {
- List<String> usernames = Manager.getAllLocalUsernames(dataPath);
+ var usernames = Manager.getAllLocalUsernames(dataPath);
if (usernames.size() == 0) {
System.err.println("No local users found, you first need to register or link an account");
return 1;
private int handleProvisioningCommand(
final ProvisioningCommand command, final File dataPath, final ServiceEnvironment serviceEnvironment
) {
- ProvisioningManager pm = ProvisioningManager.init(dataPath, serviceEnvironment, BaseConfig.USER_AGENT);
+ var pm = ProvisioningManager.init(dataPath, serviceEnvironment, BaseConfig.USER_AGENT);
return command.handleCommand(ns, pm);
}
logger.error("Error loading or creating state file: {}", e.getMessage());
return 2;
}
- try (RegistrationManager m = manager) {
+ try (var m = manager) {
return command.handleCommand(ns, m);
} catch (IOException e) {
logger.error("Cleanup failed", e);
final File dataPath,
final ServiceEnvironment serviceEnvironment
) {
- try (Manager m = loadManager(username, dataPath, serviceEnvironment)) {
+ try (var m = loadManager(username, dataPath, serviceEnvironment)) {
if (m == null) {
return 2;
}
final ServiceEnvironment serviceEnvironment,
final List<String> usernames
) {
- final List<Manager> managers = usernames.stream()
+ final var managers = usernames.stream()
.map(u -> loadManager(u, dataPath, serviceEnvironment))
.filter(Objects::nonNull)
.collect(Collectors.toList());
- int result = command.handleCommand(ns, managers);
+ var result = command.handleCommand(ns, managers);
- for (Manager m : managers) {
+ for (var m : managers) {
try {
m.close();
} catch (IOException e) {
} else {
busType = DBusConnection.DBusBusType.SESSION;
}
- try (DBusConnection dBusConn = DBusConnection.getConnection(busType)) {
- Signal ts = dBusConn.getRemoteObject(DbusConfig.getBusname(),
+ try (var dBusConn = DBusConnection.getConnection(busType)) {
+ var ts = dBusConn.getRemoteObject(DbusConfig.getBusname(),
DbusConfig.getObjectPath(username),
Signal.class);
* @return the data directory to be used by signal-cli.
*/
private static File getDefaultDataPath() {
- File dataPath = new File(IOUtils.getDataHomeDir(), "signal-cli");
+ var dataPath = new File(IOUtils.getDataHomeDir(), "signal-cli");
if (dataPath.exists()) {
return dataPath;
}
- File configPath = new File(System.getProperty("user.home"), ".config");
+ var configPath = new File(System.getProperty("user.home"), ".config");
- File legacySettingsPath = new File(configPath, "signal");
+ var legacySettingsPath = new File(configPath, "signal");
if (legacySettingsPath.exists()) {
return legacySettingsPath;
}
import org.asamk.signal.manager.groups.GroupUtils;
import org.freedesktop.dbus.connections.impl.DBusConnection;
import org.freedesktop.dbus.exceptions.DBusException;
-import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
import org.whispersystems.signalservice.api.messages.SignalServiceContent;
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.SignalServiceReceiptMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import java.util.ArrayList;
import java.util.List;
e.printStackTrace();
}
} else if (content != null) {
- final SignalServiceAddress sender = !envelope.isUnidentifiedSender() && envelope.hasSource()
+ final var sender = !envelope.isUnidentifiedSender() && envelope.hasSource()
? envelope.getSourceAddress()
: content.getSender();
if (content.getReceiptMessage().isPresent()) {
- final SignalServiceReceiptMessage receiptMessage = content.getReceiptMessage().get();
+ final var receiptMessage = content.getReceiptMessage().get();
if (receiptMessage.isDeliveryReceipt()) {
for (long timestamp : receiptMessage.getTimestamps()) {
try {
}
}
} else if (content.getDataMessage().isPresent()) {
- SignalServiceDataMessage message = content.getDataMessage().get();
+ var message = content.getDataMessage().get();
- byte[] groupId = getGroupId(message);
+ var groupId = getGroupId(message);
if (!message.isEndSession() && (
groupId == null
|| message.getGroupContext().get().getGroupV1Type() == null
}
}
} else if (content.getSyncMessage().isPresent()) {
- SignalServiceSyncMessage sync_message = content.getSyncMessage().get();
+ var sync_message = content.getSyncMessage().get();
if (sync_message.getSent().isPresent()) {
- SentTranscriptMessage transcript = sync_message.getSent().get();
+ var transcript = sync_message.getSent().get();
if (transcript.getDestination().isPresent() || transcript.getMessage()
.getGroupContext()
.isPresent()) {
- SignalServiceDataMessage message = transcript.getMessage();
- byte[] groupId = getGroupId(message);
+ var message = transcript.getMessage();
+ var groupId = getGroupId(message);
try {
conn.sendMessage(new Signal.SyncMessageReceived(objectPath,
}
static private List<String> getAttachments(SignalServiceDataMessage message, Manager m) {
- List<String> attachments = new ArrayList<>();
+ var attachments = new ArrayList<String>();
if (message.getAttachments().isPresent()) {
- for (SignalServiceAttachment attachment : message.getAttachments().get()) {
+ for (var attachment : message.getAttachments().get()) {
if (attachment.isPointer()) {
attachments.add(m.getAttachmentFile(attachment.asPointer().getRemoteId()).getAbsolutePath());
}
import java.io.IOException;
import java.util.HashMap;
-import java.util.Map;
public class JsonReceiveMessageHandler implements Manager.ReceiveMessageHandler {
@Override
public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
- final Map<String, Object> object = new HashMap<>();
+ final var object = new HashMap<String, Object>();
if (exception != null) {
object.put("error", new JsonError(exception));
}
import net.sourceforge.argparse4j.ArgumentParsers;
import net.sourceforge.argparse4j.impl.Arguments;
-import net.sourceforge.argparse4j.inf.ArgumentParser;
import net.sourceforge.argparse4j.inf.ArgumentParserException;
import net.sourceforge.argparse4j.inf.Namespace;
// Configuring the logger needs to happen before any logger is initialized
configureLogging(isVerbose(args));
- ArgumentParser parser = App.buildArgumentParser();
+ var parser = App.buildArgumentParser();
- Namespace ns = parser.parseArgsOrFail(args);
+ var ns = parser.parseArgsOrFail(args);
- int res = new App(ns).init();
+ var res = new App(ns).init();
System.exit(res);
}
}
private static boolean isVerbose(String[] args) {
- ArgumentParser parser = ArgumentParsers.newFor("signal-cli").build().defaultHelp(false);
+ var parser = ArgumentParsers.newFor("signal-cli").build().defaultHelp(false);
parser.addArgument("--verbose").action(Arguments.storeTrue());
Namespace ns;
@Override
public void println(String format, Object... args) throws IOException {
- final String message = MessageFormatter.arrayFormat(format, args).getMessage();
+ final var message = MessageFormatter.arrayFormat(format, args).getMessage();
writer.write(message);
writer.write(System.lineSeparator());
import org.asamk.signal.manager.Manager;
import org.asamk.signal.manager.groups.GroupId;
import org.asamk.signal.manager.groups.GroupUtils;
-import org.asamk.signal.manager.storage.groups.GroupInfo;
import org.asamk.signal.util.DateUtils;
import org.asamk.signal.util.Util;
import org.slf4j.helpers.MessageFormatter;
import org.whispersystems.libsignal.UntrustedIdentityException;
import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
-import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
import org.whispersystems.signalservice.api.messages.SignalServiceContent;
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.SignalServiceGroupContext;
-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.calls.AnswerMessage;
-import org.whispersystems.signalservice.api.messages.calls.BusyMessage;
-import org.whispersystems.signalservice.api.messages.calls.HangupMessage;
-import org.whispersystems.signalservice.api.messages.calls.IceUpdateMessage;
-import org.whispersystems.signalservice.api.messages.calls.OfferMessage;
-import org.whispersystems.signalservice.api.messages.calls.OpaqueMessage;
import org.whispersystems.signalservice.api.messages.calls.SignalServiceCallMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.BlockedListMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.ConfigurationMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.ContactsMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.KeysMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.MessageRequestResponseMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.ReadMessage;
-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.messages.multidevice.ViewOnceOpenMessage;
import org.whispersystems.signalservice.api.messages.shared.SharedContact;
import org.whispersystems.signalservice.api.push.SignalServiceAddress;
-import java.io.File;
import java.io.IOException;
import java.util.Base64;
-import java.util.List;
import java.util.stream.Collectors;
public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
PlainTextWriter writer = new PlainTextWriterImpl(System.out);
if (envelope.hasSource()) {
- SignalServiceAddress source = envelope.getSourceAddress();
+ var source = envelope.getSourceAddress();
writer.println("Envelope from: {} (device: {})", formatContact(source), envelope.getSourceDevice());
if (source.getRelay().isPresent()) {
writer.println("Relayed by: {}", source.getRelay().get());
} else if (envelope.isSignalMessage() || envelope.isPreKeySignalMessage() || envelope.isUnidentifiedSender()) {
if (exception != null) {
if (exception instanceof UntrustedIdentityException) {
- UntrustedIdentityException e = (UntrustedIdentityException) exception;
+ var e = (UntrustedIdentityException) exception;
writer.println(
"The user’s key is untrusted, either the user has reinstalled Signal or a third party sent this message.");
writer.println(
DateUtils.formatTimestamp(content.getServerDeliveredTimestamp()));
if (content.getDataMessage().isPresent()) {
- SignalServiceDataMessage message = content.getDataMessage().get();
+ var message = content.getDataMessage().get();
printDataMessage(writer, message);
}
if (content.getSyncMessage().isPresent()) {
writer.println("Received a sync message");
- SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();
+ var syncMessage = content.getSyncMessage().get();
printSyncMessage(writer, syncMessage);
}
if (content.getCallMessage().isPresent()) {
writer.println("Received a call message");
- SignalServiceCallMessage callMessage = content.getCallMessage().get();
+ var callMessage = content.getCallMessage().get();
printCallMessage(writer.indentedWriter(), callMessage);
}
if (content.getReceiptMessage().isPresent()) {
writer.println("Received a receipt message");
- SignalServiceReceiptMessage receiptMessage = content.getReceiptMessage().get();
+ var receiptMessage = content.getReceiptMessage().get();
printReceiptMessage(writer.indentedWriter(), receiptMessage);
}
if (content.getTypingMessage().isPresent()) {
writer.println("Received a typing message");
- SignalServiceTypingMessage typingMessage = content.getTypingMessage().get();
+ var typingMessage = content.getTypingMessage().get();
printTypingMessage(writer.indentedWriter(), typingMessage);
}
}
}
if (message.getGroupContext().isPresent()) {
writer.println("Group info:");
- final SignalServiceGroupContext groupContext = message.getGroupContext().get();
+ final var groupContext = message.getGroupContext().get();
printGroupContext(writer.indentedWriter(), groupContext);
}
if (message.getGroupCallUpdate().isPresent()) {
writer.println("Group call update:");
- final SignalServiceDataMessage.GroupCallUpdate groupCallUpdate = message.getGroupCallUpdate().get();
+ final var groupCallUpdate = message.getGroupCallUpdate().get();
writer.indentedWriter().println("Era id: {}", groupCallUpdate.getEraId());
}
if (message.getPreviews().isPresent()) {
writer.println("Previews:");
- final List<SignalServiceDataMessage.Preview> previews = message.getPreviews().get();
- for (SignalServiceDataMessage.Preview preview : previews) {
+ final var previews = message.getPreviews().get();
+ for (var preview : previews) {
writer.println("- Preview");
printPreview(writer.indentedWriter(), preview);
}
}
if (message.getSharedContacts().isPresent()) {
- final List<SharedContact> sharedContacts = message.getSharedContacts().get();
+ final var sharedContacts = message.getSharedContacts().get();
writer.println("Contacts:");
- for (SharedContact contact : sharedContacts) {
+ for (var contact : sharedContacts) {
writer.println("- Contact:");
printSharedContact(writer.indentedWriter(), contact);
}
}
if (message.getSticker().isPresent()) {
- final SignalServiceDataMessage.Sticker sticker = message.getSticker().get();
+ final var sticker = message.getSticker().get();
writer.println("Sticker:");
printSticker(writer.indentedWriter(), sticker);
}
}
if (message.getReaction().isPresent()) {
writer.println("Reaction:");
- final SignalServiceDataMessage.Reaction reaction = message.getReaction().get();
+ final var reaction = message.getReaction().get();
printReaction(writer.indentedWriter(), reaction);
}
if (message.getQuote().isPresent()) {
writer.println("Quote:");
- SignalServiceDataMessage.Quote quote = message.getQuote().get();
+ var quote = message.getQuote().get();
printQuote(writer.indentedWriter(), quote);
}
if (message.getRemoteDelete().isPresent()) {
- final SignalServiceDataMessage.RemoteDelete remoteDelete = message.getRemoteDelete().get();
+ final var remoteDelete = message.getRemoteDelete().get();
writer.println("Remote delete message: timestamp = {}", remoteDelete.getTargetSentTimestamp());
}
if (message.getMentions().isPresent()) {
writer.println("Mentions:");
- for (SignalServiceDataMessage.Mention mention : message.getMentions().get()) {
+ for (var mention : message.getMentions().get()) {
printMention(writer, mention);
}
}
if (message.getAttachments().isPresent()) {
writer.println("Attachments:");
- for (SignalServiceAttachment attachment : message.getAttachments().get()) {
+ for (var attachment : message.getAttachments().get()) {
writer.println("- Attachment:");
printAttachment(writer.indentedWriter(), attachment);
}
writer.println("Timestamp: {}", DateUtils.formatTimestamp(typingMessage.getTimestamp()));
if (typingMessage.getGroupId().isPresent()) {
writer.println("Group Info:");
- final GroupId groupId = GroupId.unknownVersion(typingMessage.getGroupId().get());
+ final var groupId = GroupId.unknownVersion(typingMessage.getGroupId().get());
printGroupInfo(writer.indentedWriter(), groupId);
}
}
final PlainTextWriter writer, final SignalServiceCallMessage callMessage
) throws IOException {
if (callMessage.getDestinationDeviceId().isPresent()) {
- final Integer deviceId = callMessage.getDestinationDeviceId().get();
+ final var deviceId = callMessage.getDestinationDeviceId().get();
writer.println("Destination device id: {}", deviceId);
}
if (callMessage.getAnswerMessage().isPresent()) {
- AnswerMessage answerMessage = callMessage.getAnswerMessage().get();
+ var answerMessage = callMessage.getAnswerMessage().get();
writer.println("Answer message: {}, sdp: {})", answerMessage.getId(), answerMessage.getSdp());
}
if (callMessage.getBusyMessage().isPresent()) {
- BusyMessage busyMessage = callMessage.getBusyMessage().get();
+ var busyMessage = callMessage.getBusyMessage().get();
writer.println("Busy message: {}", busyMessage.getId());
}
if (callMessage.getHangupMessage().isPresent()) {
- HangupMessage hangupMessage = callMessage.getHangupMessage().get();
+ var hangupMessage = callMessage.getHangupMessage().get();
writer.println("Hangup message: {}", hangupMessage.getId());
}
if (callMessage.getIceUpdateMessages().isPresent()) {
writer.println("Ice update messages:");
- List<IceUpdateMessage> iceUpdateMessages = callMessage.getIceUpdateMessages().get();
- for (IceUpdateMessage iceUpdateMessage : iceUpdateMessages) {
+ var iceUpdateMessages = callMessage.getIceUpdateMessages().get();
+ for (var iceUpdateMessage : iceUpdateMessages) {
writer.println("- {}, sdp: {}", iceUpdateMessage.getId(), iceUpdateMessage.getSdp());
}
}
if (callMessage.getOfferMessage().isPresent()) {
- OfferMessage offerMessage = callMessage.getOfferMessage().get();
+ var offerMessage = callMessage.getOfferMessage().get();
writer.println("Offer message: {}, sdp: {}", offerMessage.getId(), offerMessage.getSdp());
}
if (callMessage.getOpaqueMessage().isPresent()) {
- final OpaqueMessage opaqueMessage = callMessage.getOpaqueMessage().get();
+ final var opaqueMessage = callMessage.getOpaqueMessage().get();
writer.println("Opaque message: size {}", opaqueMessage.getOpaque().length);
}
}
final PlainTextWriter writer, final SignalServiceSyncMessage syncMessage
) throws IOException {
if (syncMessage.getContacts().isPresent()) {
- final ContactsMessage contactsMessage = syncMessage.getContacts().get();
- String type = contactsMessage.isComplete() ? "complete" : "partial";
+ final var contactsMessage = syncMessage.getContacts().get();
+ var type = contactsMessage.isComplete() ? "complete" : "partial";
writer.println("Received {} sync contacts:", type);
printAttachment(writer.indentedWriter(), contactsMessage.getContactsStream());
}
}
if (syncMessage.getRead().isPresent()) {
writer.println("Received sync read messages list");
- for (ReadMessage rm : syncMessage.getRead().get()) {
+ for (var rm : syncMessage.getRead().get()) {
writer.println("- From: {} Message timestamp: {}",
formatContact(rm.getSender()),
DateUtils.formatTimestamp(rm.getTimestamp()));
}
if (syncMessage.getSent().isPresent()) {
writer.println("Received sync sent message");
- final SentTranscriptMessage sentTranscriptMessage = syncMessage.getSent().get();
+ final var sentTranscriptMessage = syncMessage.getSent().get();
String to;
if (sentTranscriptMessage.getDestination().isPresent()) {
to = formatContact(sentTranscriptMessage.getDestination().get());
.println("Expiration started at: {}",
DateUtils.formatTimestamp(sentTranscriptMessage.getExpirationStartTimestamp()));
}
- SignalServiceDataMessage message = sentTranscriptMessage.getMessage();
+ var message = sentTranscriptMessage.getMessage();
printDataMessage(writer.indentedWriter(), message);
}
if (syncMessage.getBlockedList().isPresent()) {
writer.println("Received sync message with block list");
writer.println("Blocked numbers:");
- final BlockedListMessage blockedList = syncMessage.getBlockedList().get();
- for (SignalServiceAddress address : blockedList.getAddresses()) {
+ final var blockedList = syncMessage.getBlockedList().get();
+ for (var address : blockedList.getAddresses()) {
writer.println("- {}", address.getLegacyIdentifier());
}
}
if (syncMessage.getVerified().isPresent()) {
writer.println("Received sync message with verified identities:");
- final VerifiedMessage verifiedMessage = syncMessage.getVerified().get();
+ final var verifiedMessage = syncMessage.getVerified().get();
writer.println("- {}: {}", formatContact(verifiedMessage.getDestination()), verifiedMessage.getVerified());
- String safetyNumber = Util.formatSafetyNumber(m.computeSafetyNumber(verifiedMessage.getDestination(),
+ var safetyNumber = Util.formatSafetyNumber(m.computeSafetyNumber(verifiedMessage.getDestination(),
verifiedMessage.getIdentityKey()));
writer.indentedWriter().println(safetyNumber);
}
if (syncMessage.getConfiguration().isPresent()) {
writer.println("Received sync message with configuration:");
- final ConfigurationMessage configurationMessage = syncMessage.getConfiguration().get();
+ final var configurationMessage = syncMessage.getConfiguration().get();
if (configurationMessage.getReadReceipts().isPresent()) {
writer.println("- Read receipts: {}",
configurationMessage.getReadReceipts().get() ? "enabled" : "disabled");
}
}
if (syncMessage.getFetchType().isPresent()) {
- final SignalServiceSyncMessage.FetchType fetchType = syncMessage.getFetchType().get();
+ final var fetchType = syncMessage.getFetchType().get();
writer.println("Received sync message with fetch type: {}", fetchType);
}
if (syncMessage.getViewOnceOpen().isPresent()) {
- final ViewOnceOpenMessage viewOnceOpenMessage = syncMessage.getViewOnceOpen().get();
+ final var viewOnceOpenMessage = syncMessage.getViewOnceOpen().get();
writer.println("Received sync message with view once open message:");
writer.indentedWriter().println("Sender: {}", formatContact(viewOnceOpenMessage.getSender()));
writer.indentedWriter()
.println("Timestamp: {}", DateUtils.formatTimestamp(viewOnceOpenMessage.getTimestamp()));
}
if (syncMessage.getStickerPackOperations().isPresent()) {
- final List<StickerPackOperationMessage> stickerPackOperationMessages = syncMessage.getStickerPackOperations()
- .get();
+ final var stickerPackOperationMessages = syncMessage.getStickerPackOperations().get();
writer.println("Received sync message with sticker pack operations:");
- for (StickerPackOperationMessage m : stickerPackOperationMessages) {
+ for (var m : stickerPackOperationMessages) {
writer.println("- {}", m.getType().isPresent() ? m.getType().get() : "<unknown>");
if (m.getPackId().isPresent()) {
writer.indentedWriter()
}
}
if (syncMessage.getMessageRequestResponse().isPresent()) {
- final MessageRequestResponseMessage requestResponseMessage = syncMessage.getMessageRequestResponse().get();
+ final var requestResponseMessage = syncMessage.getMessageRequestResponse().get();
writer.println("Received message request response:");
writer.indentedWriter().println("Type: {}", requestResponseMessage.getType());
if (requestResponseMessage.getGroupId().isPresent()) {
}
}
if (syncMessage.getKeys().isPresent()) {
- final KeysMessage keysMessage = syncMessage.getKeys().get();
+ final var keysMessage = syncMessage.getKeys().get();
writer.println("Received sync message with keys:");
if (keysMessage.getStorageService().isPresent()) {
writer.println("- storage key: length: {}", keysMessage.getStorageService().get().serialize().length);
writer.println("Text: {}", quote.getText());
if (quote.getMentions() != null && quote.getMentions().size() > 0) {
writer.println("Mentions:");
- for (SignalServiceDataMessage.Mention mention : quote.getMentions()) {
+ for (var mention : quote.getMentions()) {
printMention(writer, mention);
}
}
if (quote.getAttachments().size() > 0) {
writer.println("Attachments:");
- for (SignalServiceDataMessage.Quote.QuotedAttachment attachment : quote.getAttachments()) {
+ for (var attachment : quote.getAttachments()) {
writer.println("- Filename: {}", attachment.getFileName());
writer.indent(w -> {
w.println("Type: {}", attachment.getContentType());
private void printSharedContact(final PlainTextWriter writer, final SharedContact contact) throws IOException {
writer.println("Name:");
- SharedContact.Name name = contact.getName();
+ var name = contact.getName();
writer.indent(w -> {
if (name.getDisplay().isPresent() && !name.getDisplay().get().isBlank()) {
w.println("Display name: {}", name.getDisplay().get());
});
if (contact.getAvatar().isPresent()) {
- SharedContact.Avatar avatar = contact.getAvatar().get();
+ var avatar = contact.getAvatar().get();
writer.println("Avatar: (profile: {})", avatar.isProfile());
printAttachment(writer.indentedWriter(), avatar.getAttachment());
}
if (contact.getPhone().isPresent()) {
writer.println("Phone details:");
- for (SharedContact.Phone phone : contact.getPhone().get()) {
+ for (var phone : contact.getPhone().get()) {
writer.println("- Phone:");
writer.indent(w -> {
if (phone.getValue() != null) {
if (contact.getEmail().isPresent()) {
writer.println("Email details:");
- for (SharedContact.Email email : contact.getEmail().get()) {
+ for (var email : contact.getEmail().get()) {
writer.println("- Email:");
writer.indent(w -> {
if (email.getValue() != null) {
if (contact.getAddress().isPresent()) {
writer.println("Address details:");
- for (SharedContact.PostalAddress address : contact.getAddress().get()) {
+ for (var address : contact.getAddress().get()) {
writer.println("- Address:");
writer.indent(w -> {
if (address.getType() != null) {
private void printGroupContext(
final PlainTextWriter writer, final SignalServiceGroupContext groupContext
) throws IOException {
- final GroupId groupId = GroupUtils.getGroupId(groupContext);
+ final var groupId = GroupUtils.getGroupId(groupContext);
if (groupContext.getGroupV1().isPresent()) {
- SignalServiceGroup groupInfo = groupContext.getGroupV1().get();
+ var groupInfo = groupContext.getGroupV1().get();
printGroupInfo(writer, groupId);
writer.println("Type: {}", groupInfo.getType());
if (groupInfo.getMembers().isPresent()) {
writer.println("Members:");
- for (SignalServiceAddress member : groupInfo.getMembers().get()) {
+ for (var member : groupInfo.getMembers().get()) {
writer.println("- {}", formatContact(member));
}
}
printAttachment(writer.indentedWriter(), groupInfo.getAvatar().get());
}
} else if (groupContext.getGroupV2().isPresent()) {
- final SignalServiceGroupV2 groupInfo = groupContext.getGroupV2().get();
+ final var groupInfo = groupContext.getGroupV2().get();
printGroupInfo(writer, groupId);
writer.println("Revision: {}", groupInfo.getRevision());
writer.println("Master key length: {}", groupInfo.getMasterKey().serialize().length);
private void printGroupInfo(final PlainTextWriter writer, final GroupId groupId) throws IOException {
writer.println("Id: {}", groupId.toBase64());
- GroupInfo group = m.getGroup(groupId);
+ var group = m.getGroup(groupId);
if (group != null) {
writer.println("Name: {}", group.getTitle());
} else {
private void printMention(
PlainTextWriter writer, SignalServiceDataMessage.Mention mention
) throws IOException {
- final SignalServiceAddress address = m.resolveSignalServiceAddress(new SignalServiceAddress(mention.getUuid(),
- null));
+ final var address = m.resolveSignalServiceAddress(new SignalServiceAddress(mention.getUuid(), null));
writer.println("- {}: {} (length: {})", formatContact(address), mention.getStart(), mention.getLength());
}
writer.println("Content-Type: {}", attachment.getContentType());
writer.println("Type: {}", attachment.isPointer() ? "Pointer" : attachment.isStream() ? "Stream" : "<unknown>");
if (attachment.isPointer()) {
- final SignalServiceAttachmentPointer pointer = attachment.asPointer();
+ final var pointer = attachment.asPointer();
writer.println("Id: {} Key length: {}", pointer.getRemoteId(), pointer.getKey().length);
if (pointer.getUploadTimestamp() > 0) {
writer.println("Upload timestamp: {}", DateUtils.formatTimestamp(pointer.getUploadTimestamp()));
if (pointer.getWidth() > 0 || pointer.getHeight() > 0) {
writer.println("Dimensions: {}x{}", pointer.getWidth(), pointer.getHeight());
}
- File file = m.getAttachmentFile(pointer.getRemoteId());
+ var file = m.getAttachmentFile(pointer.getRemoteId());
if (file.exists()) {
writer.println("Stored plaintext in: {}", file);
}
}
private String formatContact(SignalServiceAddress address) {
- final String number = address.getLegacyIdentifier();
- String name = m.getContactOrProfileName(number);
+ final var number = address.getLegacyIdentifier();
+ var name = m.getContactOrProfileName(number);
if (name == null) {
return number;
} else {
import net.sourceforge.argparse4j.inf.Subparser;
import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.groups.GroupId;
import org.asamk.signal.manager.groups.GroupIdFormatException;
import org.asamk.signal.manager.groups.GroupNotFoundException;
import org.asamk.signal.util.Util;
@Override
public int handleCommand(final Namespace ns, final Manager m) {
- for (String contact_number : ns.<String>getList("contact")) {
+ for (var contact_number : ns.<String>getList("contact")) {
try {
m.setContactBlocked(contact_number, true);
} catch (InvalidNumberException e) {
}
if (ns.<String>getList("group") != null) {
- for (String groupIdString : ns.<String>getList("group")) {
+ for (var groupIdString : ns.<String>getList("group")) {
try {
- GroupId groupId = Util.decodeGroupId(groupIdString);
+ var groupId = Util.decodeGroupId(groupIdString);
m.setGroupBlocked(groupId, true);
} catch (GroupIdFormatException | GroupNotFoundException e) {
System.err.println(e.getMessage());
@Override
public int handleCommand(final Namespace ns, final Manager m) {
- boolean inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
+ var inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
// TODO delete later when "json" variable is removed
if (ns.getBoolean("json")) {
busType = DBusConnection.DBusBusType.SESSION;
}
- try (DBusConnection conn = DBusConnection.getConnection(busType)) {
- String objectPath = DbusConfig.getObjectPath();
- Thread t = run(conn, objectPath, m, ignoreAttachments, inJson);
+ try (var conn = DBusConnection.getConnection(busType)) {
+ var objectPath = DbusConfig.getObjectPath();
+ var t = run(conn, objectPath, m, ignoreAttachments, inJson);
conn.requestBusName(DbusConfig.getBusname());
@Override
public int handleCommand(final Namespace ns, final List<Manager> managers) {
- boolean inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
+ var inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
// TODO delete later when "json" variable is removed
if (ns.getBoolean("json")) {
busType = DBusConnection.DBusBusType.SESSION;
}
- try (DBusConnection conn = DBusConnection.getConnection(busType)) {
- List<Thread> receiveThreads = new ArrayList<>();
- for (Manager m : managers) {
- String objectPath = DbusConfig.getObjectPath(m.getUsername());
- Thread thread = run(conn, objectPath, m, ignoreAttachments, inJson);
+ try (var conn = DBusConnection.getConnection(busType)) {
+ var receiveThreads = new ArrayList<Thread>();
+ for (var m : managers) {
+ var objectPath = DbusConfig.getObjectPath(m.getUsername());
+ var thread = run(conn, objectPath, m, ignoreAttachments, inJson);
receiveThreads.add(thread);
}
conn.requestBusName(DbusConfig.getBusname());
- for (Thread t : receiveThreads) {
+ for (var t : receiveThreads) {
try {
t.join();
} catch (InterruptedException ignored) {
) throws DBusException {
conn.exportObject(objectPath, new DbusSignalImpl(m));
- final Thread thread = new Thread(() -> {
+ final var thread = new Thread(() -> {
while (true) {
try {
m.receiveMessages(1,
import java.io.IOException;
import java.util.HashSet;
-import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
@Override
public int handleCommand(final Namespace ns, final Manager m) {
// Setup the json object mapper
- boolean inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
+ var inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
// TODO delete later when "json" variable is removed
if (ns.getBoolean("json")) {
// Output
if (inJson) {
- final JsonWriter jsonWriter = new JsonWriter(System.out);
+ final var jsonWriter = new JsonWriter(System.out);
- List<JsonUserStatus> jsonUserStatuses = registered.entrySet()
+ var jsonUserStatuses = registered.entrySet()
.stream()
.map(entry -> new JsonUserStatus(entry.getKey(), entry.getValue()))
.collect(Collectors.toList());
return 3;
}
} else {
- for (Map.Entry<String, Boolean> entry : registered.entrySet()) {
+ for (var entry : registered.entrySet()) {
System.out.println(entry.getKey() + ": " + entry.getValue());
}
}
import net.sourceforge.argparse4j.inf.Subparser;
import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.groups.GroupId;
import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
import org.freedesktop.dbus.exceptions.DBusExecutionException;
-import org.whispersystems.libsignal.util.Pair;
import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
-import org.whispersystems.signalservice.api.messages.SendMessageResult;
import org.whispersystems.signalservice.internal.push.exceptions.GroupPatchNotAcceptedException;
import java.io.IOException;
-import java.util.List;
import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
import static org.asamk.signal.util.ErrorUtils.handleIOException;
@Override
public int handleCommand(final Namespace ns, final Manager m) {
final GroupInviteLinkUrl linkUrl;
- String uri = ns.getString("uri");
+ var uri = ns.getString("uri");
try {
linkUrl = GroupInviteLinkUrl.fromUri(uri);
} catch (GroupInviteLinkUrl.InvalidGroupLinkException e) {
}
try {
- final Pair<GroupId, List<SendMessageResult>> results = m.joinGroup(linkUrl);
- GroupId newGroupId = results.first();
+ final var results = m.joinGroup(linkUrl);
+ var newGroupId = results.first();
if (!m.getGroup(newGroupId).isMember(m.getSelfAddress())) {
System.out.println("Requested to join group \"" + newGroupId.toBase64() + "\"");
} else {
@Override
public int handleCommand(final Namespace ns, final ProvisioningManager m) {
- String deviceName = ns.getString("name");
+ var deviceName = ns.getString("name");
if (deviceName == null) {
deviceName = "cli";
}
try {
System.out.println(m.getDeviceLinkUri());
- String username = m.finishDeviceLink(deviceName);
+ var username = m.finishDeviceLink(deviceName);
System.out.println("Associated with: " + username);
} catch (TimeoutException e) {
System.err.println("Link request timed out, please try again.");
import net.sourceforge.argparse4j.inf.Subparser;
import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.storage.contacts.ContactInfo;
-
-import java.util.List;
public class ListContactsCommand implements LocalCommand {
@Override
public int handleCommand(final Namespace ns, final Manager m) {
- List<ContactInfo> contacts = m.getContacts();
- for (ContactInfo c : contacts) {
+ var contacts = m.getContacts();
+ for (var c : contacts) {
System.out.println(String.format("Number: %s Name: %s Blocked: %b", c.number, c.name, c.blocked));
}
return 0;
import org.asamk.signal.manager.Manager;
import org.asamk.signal.util.DateUtils;
-import org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo;
import java.io.IOException;
-import java.util.List;
public class ListDevicesCommand implements LocalCommand {
@Override
public int handleCommand(final Namespace ns, final Manager m) {
try {
- List<DeviceInfo> devices = m.getLinkedDevices();
- for (DeviceInfo d : devices) {
+ var devices = m.getLinkedDevices();
+ for (var d : devices) {
System.out.println("Device "
+ d.getId()
+ (d.getId() == m.getDeviceId() ? " (this device)" : "")
import org.asamk.signal.JsonWriter;
import org.asamk.signal.OutputType;
import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
import org.asamk.signal.manager.storage.groups.GroupInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
private static void printGroupPlainText(Manager m, GroupInfo group, boolean detailed) {
if (detailed) {
- final GroupInviteLinkUrl groupInviteLink = group.getGroupInviteLink();
+ final var groupInviteLink = group.getGroupInviteLink();
System.out.println(String.format(
"Id: %s Name: %s Active: %s Blocked: %b Members: %s Pending members: %s Requesting members: %s Link: %s",
@Override
public int handleCommand(final Namespace ns, final Manager m) {
if (ns.get("output") == OutputType.JSON) {
- final JsonWriter jsonWriter = new JsonWriter(System.out);
+ final var jsonWriter = new JsonWriter(System.out);
- List<JsonGroup> jsonGroups = new ArrayList<>();
- for (GroupInfo group : m.getGroups()) {
- final GroupInviteLinkUrl groupInviteLink = group.getGroupInviteLink();
+ var jsonGroups = new ArrayList<JsonGroup>();
+ for (var group : m.getGroups()) {
+ final var groupInviteLink = group.getGroupInviteLink();
jsonGroups.add(new JsonGroup(group.getGroupId().toBase64(),
group.getTitle(),
return 0;
} else {
boolean detailed = ns.getBoolean("detailed");
- for (GroupInfo group : m.getGroups()) {
+ for (var group : m.getGroups()) {
printGroupPlainText(m, group, detailed);
}
}
import org.asamk.signal.util.Util;
import org.whispersystems.signalservice.api.util.InvalidNumberException;
-import java.util.List;
-
public class ListIdentitiesCommand implements LocalCommand {
private static void printIdentityFingerprint(Manager m, IdentityInfo theirId) {
- String digits = Util.formatSafetyNumber(m.computeSafetyNumber(theirId.getAddress(), theirId.getIdentityKey()));
+ var digits = Util.formatSafetyNumber(m.computeSafetyNumber(theirId.getAddress(), theirId.getIdentityKey()));
System.out.println(String.format("%s: %s Added: %s Fingerprint: %s Safety Number: %s",
theirId.getAddress().getNumber().orNull(),
theirId.getTrustLevel(),
@Override
public int handleCommand(final Namespace ns, final Manager m) {
if (ns.get("number") == null) {
- for (IdentityInfo identity : m.getIdentities()) {
+ for (var identity : m.getIdentities()) {
printIdentityFingerprint(m, identity);
}
} else {
- String number = ns.getString("number");
+ var number = ns.getString("number");
try {
- List<IdentityInfo> identities = m.getIdentities(number);
- for (IdentityInfo id : identities) {
+ var identities = m.getIdentities(number);
+ for (var id : identities) {
printIdentityFingerprint(m, id);
}
} catch (InvalidNumberException e) {
import net.sourceforge.argparse4j.inf.Subparser;
import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.groups.GroupId;
import org.asamk.signal.manager.groups.GroupIdFormatException;
import org.asamk.signal.manager.groups.GroupNotFoundException;
import org.asamk.signal.manager.groups.NotAGroupMemberException;
import org.asamk.signal.util.Util;
-import org.whispersystems.libsignal.util.Pair;
-import org.whispersystems.signalservice.api.messages.SendMessageResult;
import java.io.IOException;
-import java.util.List;
import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
import static org.asamk.signal.util.ErrorUtils.handleGroupIdFormatException;
@Override
public int handleCommand(final Namespace ns, final Manager m) {
try {
- final GroupId groupId = Util.decodeGroupId(ns.getString("group"));
- final Pair<Long, List<SendMessageResult>> results = m.sendQuitGroupMessage(groupId);
+ final var groupId = Util.decodeGroupId(ns.getString("group"));
+ final var results = m.sendQuitGroupMessage(groupId);
return handleTimestampAndSendMessageResults(results.first(), results.second());
} catch (IOException e) {
handleIOException(e);
}
public int handleCommand(final Namespace ns, final Signal signal, DBusConnection dbusconnection) {
- boolean inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
+ var inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
// TODO delete later when "json" variable is removed
if (ns.getBoolean("json")) {
logger.warn("\"--json\" option has been deprecated, please use the global \"--output=json\" instead.");
}
- final JsonWriter jsonWriter = inJson ? new JsonWriter(System.out) : null;
+ final var jsonWriter = inJson ? new JsonWriter(System.out) : null;
try {
dbusconnection.addSigHandler(Signal.MessageReceived.class, messageReceived -> {
if (jsonWriter != null) {
- JsonMessageEnvelope envelope = new JsonMessageEnvelope(messageReceived);
- final Map<String, JsonMessageEnvelope> object = Map.of("envelope", envelope);
+ var envelope = new JsonMessageEnvelope(messageReceived);
+ final var object = Map.of("envelope", envelope);
try {
jsonWriter.write(object);
} catch (IOException e) {
}
if (messageReceived.getAttachments().size() > 0) {
System.out.println("Attachments: ");
- for (String attachment : messageReceived.getAttachments()) {
+ for (var attachment : messageReceived.getAttachments()) {
System.out.println("- Stored plaintext in: " + attachment);
}
}
dbusconnection.addSigHandler(Signal.ReceiptReceived.class, receiptReceived -> {
if (jsonWriter != null) {
- JsonMessageEnvelope envelope = new JsonMessageEnvelope(receiptReceived);
- final Map<String, JsonMessageEnvelope> object = Map.of("envelope", envelope);
+ var envelope = new JsonMessageEnvelope(receiptReceived);
+ final var object = Map.of("envelope", envelope);
try {
jsonWriter.write(object);
} catch (IOException e) {
dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, syncReceived -> {
if (jsonWriter != null) {
- JsonMessageEnvelope envelope = new JsonMessageEnvelope(syncReceived);
- final Map<String, JsonMessageEnvelope> object = Map.of("envelope", envelope);
+ var envelope = new JsonMessageEnvelope(syncReceived);
+ final var object = Map.of("envelope", envelope);
try {
jsonWriter.write(object);
} catch (IOException e) {
}
if (syncReceived.getAttachments().size() > 0) {
System.out.println("Attachments: ");
- for (String attachment : syncReceived.getAttachments()) {
+ for (var attachment : syncReceived.getAttachments()) {
System.out.println("- Stored plaintext in: " + attachment);
}
}
@Override
public int handleCommand(final Namespace ns, final Manager m) {
- boolean inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
+ var inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
// TODO delete later when "json" variable is removed
if (ns.getBoolean("json")) {
if (ns.getDouble("timeout") != null) {
timeout = ns.getDouble("timeout");
}
- boolean returnOnTimeout = true;
+ var returnOnTimeout = true;
if (timeout < 0) {
returnOnTimeout = false;
timeout = 3600;
}
boolean ignoreAttachments = ns.getBoolean("ignore_attachments");
try {
- final Manager.ReceiveMessageHandler handler = inJson
- ? new JsonReceiveMessageHandler(m)
- : new ReceiveMessageHandler(m);
+ final var handler = inJson ? new JsonReceiveMessageHandler(m) : new ReceiveMessageHandler(m);
m.receiveMessages((long) (timeout * 1000),
TimeUnit.MILLISECONDS,
returnOnTimeout,
@Override
public int handleCommand(final Namespace ns, final RegistrationManager m) {
final boolean voiceVerification = ns.getBoolean("voice");
- final String captcha = ns.getString("captcha");
+ final var captcha = ns.getString("captcha");
try {
m.register(voiceVerification, captcha);
package org.asamk.signal.commands;
import net.sourceforge.argparse4j.impl.Arguments;
-import net.sourceforge.argparse4j.inf.MutuallyExclusiveGroup;
import net.sourceforge.argparse4j.inf.Namespace;
import net.sourceforge.argparse4j.inf.Subparser;
@Override
public void attachToSubparser(final Subparser subparser) {
subparser.addArgument("recipient").help("Specify the recipients' phone number.").nargs("*");
- final MutuallyExclusiveGroup mutuallyExclusiveGroup = subparser.addMutuallyExclusiveGroup();
+ final var mutuallyExclusiveGroup = subparser.addMutuallyExclusiveGroup();
mutuallyExclusiveGroup.addArgument("-g", "--group").help("Specify the recipient group ID.");
mutuallyExclusiveGroup.addArgument("--note-to-self")
.help("Send the message to self without notification.")
@Override
public int handleCommand(final Namespace ns, final Signal signal) {
final List<String> recipients = ns.getList("recipient");
- final Boolean isEndSession = ns.getBoolean("endsession");
- final String groupIdString = ns.getString("group");
- final Boolean isNoteToSelf = ns.getBoolean("note_to_self");
+ final var isEndSession = ns.getBoolean("endsession");
+ final var groupIdString = ns.getString("group");
+ final var isNoteToSelf = ns.getBoolean("note_to_self");
- final boolean noRecipients = recipients == null || recipients.isEmpty();
+ final var noRecipients = recipients == null || recipients.isEmpty();
if ((noRecipients && isEndSession) || (noRecipients && groupIdString == null && !isNoteToSelf)) {
System.err.println("No recipients given");
System.err.println("Aborting sending.");
}
}
- String messageText = ns.getString("message");
+ var messageText = ns.getString("message");
if (messageText == null) {
try {
messageText = IOUtils.readAll(System.in, Charset.defaultCharset());
return 1;
}
- long timestamp = signal.sendGroupMessage(messageText, attachments, groupId);
+ var timestamp = signal.sendGroupMessage(messageText, attachments, groupId);
System.out.println(timestamp);
return 0;
} catch (AssertionError e) {
if (isNoteToSelf) {
try {
- long timestamp = signal.sendNoteToSelfMessage(messageText, attachments);
+ var timestamp = signal.sendNoteToSelfMessage(messageText, attachments);
System.out.println(timestamp);
return 0;
} catch (AssertionError e) {
}
try {
- long timestamp = signal.sendMessage(messageText, attachments, recipients);
+ var timestamp = signal.sendMessage(messageText, attachments, recipients);
System.out.println(timestamp);
return 0;
} catch (AssertionError e) {
import net.sourceforge.argparse4j.inf.Subparser;
import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.groups.GroupId;
import org.asamk.signal.manager.groups.GroupIdFormatException;
import org.asamk.signal.manager.groups.GroupNotFoundException;
import org.asamk.signal.manager.groups.NotAGroupMemberException;
@Override
public int handleCommand(final Namespace ns, final Manager m) {
final List<String> recipients = ns.getList("recipient");
- final String groupIdString = ns.getString("group");
+ final var groupIdString = ns.getString("group");
- final boolean noRecipients = recipients == null || recipients.isEmpty();
+ final var noRecipients = recipients == null || recipients.isEmpty();
if (noRecipients && groupIdString == null) {
System.err.println("No recipients given");
System.err.println("Aborting sending.");
return 1;
}
- final String emoji = ns.getString("emoji");
+ final var emoji = ns.getString("emoji");
final boolean isRemove = ns.getBoolean("remove");
- final String targetAuthor = ns.getString("target_author");
+ final var targetAuthor = ns.getString("target_author");
final long targetTimestamp = ns.getLong("target_timestamp");
try {
final Pair<Long, List<SendMessageResult>> results;
if (groupIdString != null) {
- GroupId groupId = Util.decodeGroupId(groupIdString);
+ var groupId = Util.decodeGroupId(groupIdString);
results = m.sendGroupMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, groupId);
} else {
results = m.sendMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, recipients);
@Override
public int handleCommand(final Namespace ns, final Manager m) {
try {
- String registrationLockPin = ns.getString("registrationLockPin");
+ var registrationLockPin = ns.getString("registrationLockPin");
m.setRegistrationLockPin(Optional.of(registrationLockPin));
return 0;
} catch (UnauthenticatedResponseException e) {
package org.asamk.signal.commands;
import net.sourceforge.argparse4j.impl.Arguments;
-import net.sourceforge.argparse4j.inf.MutuallyExclusiveGroup;
import net.sourceforge.argparse4j.inf.Namespace;
import net.sourceforge.argparse4j.inf.Subparser;
@Override
public void attachToSubparser(final Subparser subparser) {
subparser.addArgument("number").help("Specify the phone number, for which to set the trust.").required(true);
- MutuallyExclusiveGroup mutTrust = subparser.addMutuallyExclusiveGroup();
+ var mutTrust = subparser.addMutuallyExclusiveGroup();
mutTrust.addArgument("-a", "--trust-all-known-keys")
.help("Trust all known keys of this user, only use this for testing.")
.action(Arguments.storeTrue());
@Override
public int handleCommand(final Namespace ns, final Manager m) {
- String number = ns.getString("number");
+ var number = ns.getString("number");
if (ns.getBoolean("trust_all_known_keys")) {
- boolean res = m.trustIdentityAllKeys(number);
+ var res = m.trustIdentityAllKeys(number);
if (!res) {
System.err.println("Failed to set the trust for this number, make sure the number is correct.");
return 1;
}
} else {
- String safetyNumber = ns.getString("verified_safety_number");
+ var safetyNumber = ns.getString("verified_safety_number");
if (safetyNumber != null) {
safetyNumber = safetyNumber.replaceAll(" ", "");
if (safetyNumber.length() == 66) {
import net.sourceforge.argparse4j.inf.Subparser;
import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.groups.GroupId;
import org.asamk.signal.manager.groups.GroupIdFormatException;
import org.asamk.signal.manager.groups.GroupNotFoundException;
import org.asamk.signal.util.Util;
@Override
public int handleCommand(final Namespace ns, final Manager m) {
- for (String contact_number : ns.<String>getList("contact")) {
+ for (var contact_number : ns.<String>getList("contact")) {
try {
m.setContactBlocked(contact_number, false);
} catch (InvalidNumberException e) {
}
if (ns.<String>getList("group") != null) {
- for (String groupIdString : ns.<String>getList("group")) {
+ for (var groupIdString : ns.<String>getList("group")) {
try {
- GroupId groupId = Util.decodeGroupId(groupIdString);
+ var groupId = Util.decodeGroupId(groupIdString);
m.setGroupBlocked(groupId, false);
} catch (GroupIdFormatException | GroupNotFoundException e) {
System.err.println(e.getMessage());
@Override
public int handleCommand(final Namespace ns, final Manager m) {
- String number = ns.getString("number");
- String name = ns.getString("name");
+ var number = ns.getString("number");
+ var name = ns.getString("name");
try {
m.setContactName(number, name);
- Integer expiration = ns.getInt("expiration");
+ var expiration = ns.getInt("expiration");
if (expiration != null) {
m.setExpirationTimer(number, expiration);
}
groupId = new byte[0];
}
- String groupName = ns.getString("name");
+ var groupName = ns.getString("name");
if (groupName == null) {
groupName = "";
}
groupMembers = new ArrayList<>();
}
- String groupAvatar = ns.getString("avatar");
+ var groupAvatar = ns.getString("avatar");
if (groupAvatar == null) {
groupAvatar = "";
}
try {
- byte[] newGroupId = signal.updateGroup(groupId, groupName, groupMembers, groupAvatar);
+ var newGroupId = signal.updateGroup(groupId, groupName, groupMembers, groupAvatar);
if (groupId.length != newGroupId.length) {
System.out.println("Creating new group \"" + Base64.getEncoder().encodeToString(newGroupId) + "\" …");
}
package org.asamk.signal.commands;
import net.sourceforge.argparse4j.impl.Arguments;
-import net.sourceforge.argparse4j.inf.MutuallyExclusiveGroup;
import net.sourceforge.argparse4j.inf.Namespace;
import net.sourceforge.argparse4j.inf.Subparser;
subparser.addArgument("--about").help("New profile about text");
subparser.addArgument("--about-emoji").help("New profile about emoji");
- final MutuallyExclusiveGroup avatarOptions = subparser.addMutuallyExclusiveGroup();
+ final var avatarOptions = subparser.addMutuallyExclusiveGroup();
avatarOptions.addArgument("--avatar").help("Path to new profile avatar");
avatarOptions.addArgument("--remove-avatar").action(Arguments.storeTrue());
@Override
public int handleCommand(final Namespace ns, final Manager m) {
- String name = ns.getString("name");
- String about = ns.getString("about");
- String aboutEmoji = ns.getString("about_emoji");
- String avatarPath = ns.getString("avatar");
+ var name = ns.getString("name");
+ var about = ns.getString("about");
+ var aboutEmoji = ns.getString("about_emoji");
+ var avatarPath = ns.getString("avatar");
boolean removeAvatar = ns.getBoolean("remove_avatar");
try {
@Override
public int handleCommand(final Namespace ns, final Manager m) {
try {
- File path = new File(ns.getString("path"));
- String url = m.uploadStickerPack(path);
+ var path = new File(ns.getString("path"));
+ var url = m.uploadStickerPack(path);
System.out.println(url);
return 0;
} catch (IOException e) {
@Override
public int handleCommand(final Namespace ns, final RegistrationManager m) {
try {
- String verificationCode = ns.getString("verificationCode");
- String pin = ns.getString("pin");
+ var verificationCode = ns.getString("verificationCode");
+ var pin = ns.getString("pin");
m.verifyAccount(verificationCode, pin);
return 0;
} catch (LockedException e) {
import org.asamk.signal.manager.groups.GroupId;
import org.asamk.signal.manager.groups.GroupNotFoundException;
import org.asamk.signal.manager.groups.NotAGroupMemberException;
-import org.asamk.signal.manager.storage.groups.GroupInfo;
import org.asamk.signal.util.ErrorUtils;
import org.freedesktop.dbus.exceptions.DBusExecutionException;
-import org.whispersystems.libsignal.util.Pair;
import org.whispersystems.libsignal.util.guava.Optional;
import org.whispersystems.signalservice.api.messages.SendMessageResult;
import org.whispersystems.signalservice.api.push.SignalServiceAddress;
@Override
public long sendMessage(final String message, final List<String> attachments, final String recipient) {
- List<String> recipients = new ArrayList<>(1);
+ var recipients = new ArrayList<String>(1);
recipients.add(recipient);
return sendMessage(message, attachments, recipients);
}
private static void checkSendMessageResult(long timestamp, SendMessageResult result) throws DBusExecutionException {
- String error = ErrorUtils.getErrorMessageFromSendMessageResult(result);
+ var error = ErrorUtils.getErrorMessageFromSendMessageResult(result);
if (error == null) {
return;
}
- final String message = timestamp + "\nFailed to send message:\n" + error + '\n';
+ final var message = timestamp + "\nFailed to send message:\n" + error + '\n';
if (result.getIdentityFailure() != null) {
throw new Error.UntrustedIdentity(message);
return;
}
- List<String> errors = ErrorUtils.getErrorMessagesFromSendMessageResults(results);
+ var errors = ErrorUtils.getErrorMessagesFromSendMessageResults(results);
if (errors.size() == 0) {
return;
}
- StringBuilder message = new StringBuilder();
+ var message = new StringBuilder();
message.append(timestamp).append('\n');
message.append("Failed to send (some) messages:\n");
- for (String error : errors) {
+ for (var error : errors) {
message.append(error).append('\n');
}
@Override
public long sendMessage(final String message, final List<String> attachments, final List<String> recipients) {
try {
- final Pair<Long, List<SendMessageResult>> results = m.sendMessage(message, attachments, recipients);
+ final var results = m.sendMessage(message, attachments, recipients);
checkSendMessageResults(results.first(), results.second());
return results.first();
} catch (InvalidNumberException e) {
final String message, final List<String> attachments
) throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {
try {
- final Pair<Long, SendMessageResult> results = m.sendSelfMessage(message, attachments);
+ final var results = m.sendSelfMessage(message, attachments);
checkSendMessageResult(results.first(), results.second());
return results.first();
} catch (AttachmentInvalidException e) {
@Override
public void sendEndSessionMessage(final List<String> recipients) {
try {
- final Pair<Long, List<SendMessageResult>> results = m.sendEndSessionMessage(recipients);
+ final var results = m.sendEndSessionMessage(recipients);
checkSendMessageResults(results.first(), results.second());
} catch (IOException e) {
throw new Error.Failure(e.getMessage());
@Override
public long sendGroupMessage(final String message, final List<String> attachments, final byte[] groupId) {
try {
- Pair<Long, List<SendMessageResult>> results = m.sendGroupMessage(message,
- attachments,
- GroupId.unknownVersion(groupId));
+ var results = m.sendGroupMessage(message, attachments, GroupId.unknownVersion(groupId));
checkSendMessageResults(results.first(), results.second());
return results.first();
} catch (IOException e) {
@Override
public List<byte[]> getGroupIds() {
- List<GroupInfo> groups = m.getGroups();
- List<byte[]> ids = new ArrayList<>(groups.size());
- for (GroupInfo group : groups) {
+ var groups = m.getGroups();
+ var ids = new ArrayList<byte[]>(groups.size());
+ for (var group : groups) {
ids.add(group.getGroupId().serialize());
}
return ids;
@Override
public String getGroupName(final byte[] groupId) {
- GroupInfo group = m.getGroup(GroupId.unknownVersion(groupId));
+ var group = m.getGroup(GroupId.unknownVersion(groupId));
if (group == null) {
return "";
} else {
@Override
public List<String> getGroupMembers(final byte[] groupId) {
- GroupInfo group = m.getGroup(GroupId.unknownVersion(groupId));
+ var group = m.getGroup(GroupId.unknownVersion(groupId));
if (group == null) {
return List.of();
} else {
if (avatar.isEmpty()) {
avatar = null;
}
- final Pair<GroupId, List<SendMessageResult>> results = m.updateGroup(groupId == null
- ? null
- : GroupId.unknownVersion(groupId), name, members, avatar == null ? null : new File(avatar));
+ final var results = m.updateGroup(groupId == null ? null : GroupId.unknownVersion(groupId),
+ name,
+ members,
+ avatar == null ? null : new File(avatar));
checkSendMessageResults(0, results.second());
return results.first().serialize();
} catch (IOException e) {
import com.fasterxml.jackson.annotation.JsonProperty;
import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
-import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
-import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
class JsonAttachment {
this.contentType = attachment.getContentType();
if (attachment.isPointer()) {
- final SignalServiceAttachmentPointer pointer = attachment.asPointer();
+ final var pointer = attachment.asPointer();
this.id = pointer.getRemoteId().toString();
this.filename = pointer.getFileName().orNull();
this.size = pointer.getSize().transform(Integer::longValue).orNull();
} else {
- final SignalServiceAttachmentStream stream = attachment.asStream();
+ final var stream = attachment.asStream();
this.id = null;
this.filename = stream.getFileName().orNull();
this.size = stream.getLength();
import org.asamk.Signal;
import org.asamk.signal.manager.Manager;
import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
-import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
-import org.whispersystems.signalservice.api.messages.SignalServiceGroupContext;
-import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2;
import java.util.List;
import java.util.stream.Collectors;
JsonDataMessage(SignalServiceDataMessage dataMessage, Manager m) {
this.timestamp = dataMessage.getTimestamp();
if (dataMessage.getGroupContext().isPresent()) {
- final SignalServiceGroupContext groupContext = dataMessage.getGroupContext().get();
+ final var groupContext = dataMessage.getGroupContext().get();
if (groupContext.getGroupV1().isPresent()) {
- SignalServiceGroup groupInfo = groupContext.getGroupV1().get();
+ var groupInfo = groupContext.getGroupV1().get();
this.groupInfo = new JsonGroupInfo(groupInfo);
} else if (groupContext.getGroupV2().isPresent()) {
- SignalServiceGroupV2 groupInfo = groupContext.getGroupV2().get();
+ var groupInfo = groupContext.getGroupV2().get();
this.groupInfo = new JsonGroupInfo(groupInfo);
} else {
this.groupInfo = null;
import org.asamk.signal.manager.Manager;
import org.whispersystems.signalservice.api.messages.SignalServiceContent;
import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import java.util.List;
public JsonMessageEnvelope(SignalServiceEnvelope envelope, SignalServiceContent content, Manager m) {
if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
- SignalServiceAddress source = envelope.getSourceAddress();
+ var source = envelope.getSourceAddress();
this.source = source.getLegacyIdentifier();
this.sourceDevice = envelope.getSourceDevice();
this.relay = source.getRelay().orNull();
? new JsonSyncDataMessage(syncMessage.getSent().get(), m)
: null;
if (syncMessage.getBlockedList().isPresent()) {
- final Base64.Encoder base64 = Base64.getEncoder();
+ final var base64 = Base64.getEncoder();
this.blockedNumbers = syncMessage.getBlockedList()
.get()
.getAddresses()
JsonTypingMessage(SignalServiceTypingMessage typingMessage) {
this.action = typingMessage.getAction().name();
this.timestamp = typingMessage.getTimestamp();
- final Base64.Encoder encoder = Base64.getEncoder();
+ final var encoder = Base64.getEncoder();
this.groupId = typingMessage.getGroupId().transform(encoder::encodeToString).orNull();
}
}
}
public static String formatTimestamp(long timestamp) {
- Date date = new Date(timestamp);
+ var date = new Date(timestamp);
final DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX"); // Quoted "Z" to indicate UTC, no timezone offset
df.setTimeZone(tzUTC);
return timestamp + " (" + df.format(date) + ")";
if (timestamp != 0) {
System.out.println(timestamp);
}
- List<String> errors = getErrorMessagesFromSendMessageResults(results);
+ var errors = getErrorMessagesFromSendMessageResults(results);
return handleSendMessageResultErrors(errors);
}
public static List<String> getErrorMessagesFromSendMessageResults(List<SendMessageResult> results) {
- List<String> errors = new ArrayList<>();
- for (SendMessageResult result : results) {
- String error = getErrorMessageFromSendMessageResult(result);
+ var errors = new ArrayList<String>();
+ for (var result : results) {
+ var error = getErrorMessageFromSendMessageResult(result);
if (error != null) {
errors.add(error);
}
return 0;
}
System.err.println("Failed to send (some) messages:");
- for (String error : errors) {
+ for (var error : errors) {
System.err.println(error);
}
return 3;
}
public static String toString(byte[] bytes) {
- StringBuffer buf = new StringBuffer();
- for (final byte aByte : bytes) {
+ var buf = new StringBuffer();
+ for (final var aByte : bytes) {
appendHexChar(buf, aByte);
buf.append(" ");
}
}
public static String toStringCondensed(byte[] bytes) {
- StringBuffer buf = new StringBuffer();
- for (final byte aByte : bytes) {
+ var buf = new StringBuffer();
+ for (final var aByte : bytes) {
appendHexChar(buf, aByte);
}
return buf.toString();
}
public static byte[] toByteArray(String s) {
- int len = s.length();
- byte[] data = new byte[len / 2];
- for (int i = 0; i < len; i += 2) {
+ var len = s.length();
+ var data = new byte[len / 2];
+ for (var i = 0; i < len; i += 2) {
data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4) + Character.digit(s.charAt(i + 1), 16));
}
return data;
}
public static String readAll(InputStream in, Charset charset) throws IOException {
- StringWriter output = new StringWriter();
- byte[] buffer = new byte[4096];
+ var output = new StringWriter();
+ var buffer = new byte[4096];
int n;
while (-1 != (n = in.read(buffer))) {
output.write(new String(buffer, 0, n, charset));
}
public static File getDataHomeDir() {
- String dataHome = System.getenv("XDG_DATA_HOME");
+ var dataHome = System.getenv("XDG_DATA_HOME");
if (dataHome != null) {
return new File(dataHome);
}
public class RandomUtils {
private static final ThreadLocal<SecureRandom> LOCAL_RANDOM = ThreadLocal.withInitial(() -> {
- SecureRandom rand = getSecureRandomUnseeded();
+ var rand = getSecureRandomUnseeded();
// Let the SecureRandom seed it self initially
rand.nextBoolean();
}
public static String getStringIfNotBlank(Optional<String> value) {
- String string = value.orNull();
+ var string = value.orNull();
if (string == null || string.isBlank()) {
return null;
}
}
public static String formatSafetyNumber(String digits) {
- final int partCount = 12;
- int partSize = digits.length() / partCount;
- StringBuilder f = new StringBuilder(digits.length() + partCount);
- for (int i = 0; i < partCount; i++) {
+ final var partCount = 12;
+ var partSize = digits.length() / partCount;
+ var f = new StringBuilder(digits.length() + partCount);
+ for (var i = 0; i < partCount; i++) {
f.append(digits, i * partSize, (i * partSize) + partSize).append(" ");
}
return f.toString();
git.nmode.ca / signal-cli / commitdiff
