nik/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli.git synced 2026-09-20 06:09:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reformat files

Browse Source
This commit is contained in:
AsamK 2026-09-10 16:26:57 +02:00
parent 7cc0cc3e0e
commit 2c03e5fd8d
11 changed files with 42 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
View File

@ -267,19 +267,19 @@ public record MessageEnvelope(
quote.getMentions() == null quote.getMentions() == null
? List.of() ? List.of()
: quote.getMentions() : quote.getMentions()
.stream() .stream()
.map(m -> Mention.from(m, recipientResolver, addressResolver)) .map(m -> Mention.from(m, recipientResolver, addressResolver))
.toList(), .toList(),
quote.getAttachments() == null quote.getAttachments() == null
? List.of() ? List.of()
: quote.getAttachments().stream().map(a -> Attachment.from(a, fileProvider)).toList(), : quote.getAttachments().stream().map(a -> Attachment.from(a, fileProvider)).toList(),
quote.getBodyRanges() == null quote.getBodyRanges() == null
? List.of() ? List.of()
: quote.getBodyRanges() : quote.getBodyRanges()
.stream() .stream()
.filter(r -> r.style != null) .filter(r -> r.style != null)
.map(TextStyle::from) .map(TextStyle::from)
.toList()); .toList());
} }
} }
@ -598,7 +598,7 @@ public record MessageEnvelope(
Boolean.TRUE.equals(pinnedMessage.getForever()) Boolean.TRUE.equals(pinnedMessage.getForever())
? -1 ? -1
: pinnedMessage.getPinDurationInSeconds() == null : pinnedMessage.getPinDurationInSeconds() == null
? 0 ? 0
: pinnedMessage.getPinDurationInSeconds()); : pinnedMessage.getPinDurationInSeconds());
} }
} }
@ -1034,14 +1034,14 @@ public record MessageEnvelope(
final var source = !envelope.isUnidentifiedSender() && serviceId != null final var source = !envelope.isUnidentifiedSender() && serviceId != null
? recipientResolver.resolveRecipient(serviceId) ? recipientResolver.resolveRecipient(serviceId)
: envelope.isUnidentifiedSender() && content != null : envelope.isUnidentifiedSender() && content != null
? recipientResolver.resolveRecipient(content.getSender()) ? recipientResolver.resolveRecipient(content.getSender())
: exception instanceof ProtocolException e : exception instanceof ProtocolException e
? recipientResolver.resolveRecipient(e.getSender()) ? recipientResolver.resolveRecipient(e.getSender())
: null; : null;
final var sourceDevice = envelope.hasSourceDevice() final var sourceDevice = envelope.hasSourceDevice()
? envelope.getSourceDevice() ? envelope.getSourceDevice()
: content != null : content != null
? content.getSenderDevice() ? content.getSenderDevice()
: exception instanceof ProtocolException e ? e.getSenderDevice() : 0; : exception instanceof ProtocolException e ? e.getSenderDevice() : 0;
Optional<Receipt> receipt; Optional<Receipt> receipt;

2
lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
View File

@ -55,7 +55,7 @@ public class ContactHelper {
final var version = contact == null final var version = contact == null
? 1 ? 1
: contact.messageExpirationTimeVersion() == Integer.MAX_VALUE : contact.messageExpirationTimeVersion() == Integer.MAX_VALUE
? Integer.MAX_VALUE ? Integer.MAX_VALUE
: contact.messageExpirationTimeVersion() + 1; : contact.messageExpirationTimeVersion() + 1;
account.getContactStore() account.getContactStore()
.storeContact(recipientId, .storeContact(recipientId,

8
lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
View File

@ -201,11 +201,9 @@ public final class ProfileHelper {
if (uploadProfile) { if (uploadProfile) {
final var streamDetails = avatar != null && avatar.isPresent() final var streamDetails = avatar != null && avatar.isPresent()
? Utils.createStreamDetails(avatar.get()) ? Utils.createStreamDetails(avatar.get())
.first() .first()
: forceUploadAvatar && avatar == null : forceUploadAvatar && avatar == null ? context.getAvatarStore()
? context.getAvatarStore() .retrieveProfileAvatar(account.getSelfRecipientAddress()) : null;
.retrieveProfileAvatar(account.getSelfRecipientAddress())
: null;
try (streamDetails) { try (streamDetails) {
final var avatarUploadParams = streamDetails != null final var avatarUploadParams = streamDetails != null
? AvatarUploadParams.forAvatar(streamDetails) ? AvatarUploadParams.forAvatar(streamDetails)

20
lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
View File

@ -637,11 +637,11 @@ public class SendHelper {
Set<RecipientId> senderKeyTargets = groupInfo.getDistributionId() == null || groupSendEndorsements == null Set<RecipientId> senderKeyTargets = groupInfo.getDistributionId() == null || groupSendEndorsements == null
? Set.of() ? Set.of()
: targetRecipientIds.stream() : targetRecipientIds.stream()
.filter(s -> this.isSenderKeyCapable(s, .filter(s -> this.isSenderKeyCapable(s,
addressesMap.get(s), addressesMap.get(s),
unidentifiedAccessesMap.get(s), unidentifiedAccessesMap.get(s),
groupSendEndorsements)) groupSendEndorsements))
.collect(Collectors.toSet()); .collect(Collectors.toSet());
if (senderKeyTargets.size() < 2) { if (senderKeyTargets.size() < 2) {
logger.debug("Too few sender-key-capable users ({}). Doing all legacy sends.", senderKeyTargets.size()); logger.debug("Too few sender-key-capable users ({}). Doing all legacy sends.", senderKeyTargets.size());
senderKeyTargets = Set.of(); senderKeyTargets = Set.of();
@ -705,11 +705,11 @@ public class SendHelper {
final var expirationMs = Instant.ofEpochMilli(groupSendEndorsementsExpirationMs); final var expirationMs = Instant.ofEpochMilli(groupSendEndorsementsExpirationMs);
final var groupSendTokens = groupSendEndorsements != null && groupSecretParams != null final var groupSendTokens = groupSendEndorsements != null && groupSecretParams != null
? legacyTargets.stream() ? legacyTargets.stream()
.map(groupSendEndorsements::get) .map(groupSendEndorsements::get)
.map(endorsement -> Optional.ofNullable(endorsement) .map(endorsement -> Optional.ofNullable(endorsement)
.map(e -> e.toFullToken(groupSecretParams, expirationMs)) .map(e -> e.toFullToken(groupSecretParams, expirationMs))
.orElse(null)) .orElse(null))
.toList() .toList()
: null; : null;
final var sealedSenderAccesses = SealedSenderAccess.forFanOutGroupSend(groupSendTokens, final var sealedSenderAccesses = SealedSenderAccess.forFanOutGroupSend(groupSendTokens,
senderCertificate, senderCertificate,

11
lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
View File

@ -300,7 +300,7 @@ public class ManagerImpl implements Manager {
final var profile = serviceId == null final var profile = serviceId == null
? null ? null
: context.getProfileHelper() : context.getProfileHelper()
.getRecipientProfile(account.getRecipientResolver().resolveRecipient(serviceId)); .getRecipientProfile(account.getRecipientResolver().resolveRecipient(serviceId));
return new UserStatus(number.isEmpty() ? null : number, return new UserStatus(number.isEmpty() ? null : number,
serviceId == null ? null : serviceId.getRawUuid(), serviceId == null ? null : serviceId.getRawUuid(),
profile != null profile != null
@ -327,7 +327,7 @@ public class ManagerImpl implements Manager {
final var profile = serviceId == null final var profile = serviceId == null
? null ? null
: context.getProfileHelper() : context.getProfileHelper()
.getRecipientProfile(account.getRecipientResolver().resolveRecipient(serviceId)); .getRecipientProfile(account.getRecipientResolver().resolveRecipient(serviceId));
return new UsernameStatus(username, return new UsernameStatus(username,
serviceId == null ? null : serviceId.getRawUuid(), serviceId == null ? null : serviceId.getRawUuid(),
profile != null profile != null
@ -715,10 +715,7 @@ public class ManagerImpl implements Manager {
)) { )) {
final var result = notifySelf final var result = notifySelf
? context.getSendHelper() ? context.getSendHelper()
.sendMessage(messageBuilder, .sendMessage(messageBuilder, account.getSelfRecipientId(), editTargetTimestamp, urgent)
account.getSelfRecipientId(),
editTargetTimestamp,
urgent)
: context.getSendHelper().sendSelfMessage(messageBuilder, editTargetTimestamp); : context.getSendHelper().sendSelfMessage(messageBuilder, editTargetTimestamp);
results.put(recipient, List.of(toSendMessageResult(result))); results.put(recipient, List.of(toSendMessageResult(result)));
} else if (recipient instanceof RecipientIdentifier.Single single) { } else if (recipient instanceof RecipientIdentifier.Single single) {
@ -1041,7 +1038,7 @@ public class ManagerImpl implements Manager {
final var previews = new ArrayList<SignalServicePreview>(message.previews().size()); final var previews = new ArrayList<SignalServicePreview>(message.previews().size());
for (final var p : message.previews()) { for (final var p : message.previews()) {
final var image = p.image().isPresent() ? context.getAttachmentHelper() final var image = p.image().isPresent() ? context.getAttachmentHelper()
.uploadAttachment(p.image().get()) : null; .uploadAttachment(p.image().get()) : null;
previews.add(new SignalServicePreview(p.url(), previews.add(new SignalServicePreview(p.url(),
p.title(), p.title(),
p.description(), p.description(),

2
lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
View File

@ -959,7 +959,7 @@ public class SignalAccount implements Closeable {
profile.isUnrestrictedUnidentifiedAccess() profile.isUnrestrictedUnidentifiedAccess()
? Profile.UnidentifiedAccessMode.UNRESTRICTED ? Profile.UnidentifiedAccessMode.UNRESTRICTED
: profile.getUnidentifiedAccess() != null : profile.getUnidentifiedAccess() != null
? Profile.UnidentifiedAccessMode.ENABLED ? Profile.UnidentifiedAccessMode.ENABLED
: Profile.UnidentifiedAccessMode.DISABLED, : Profile.UnidentifiedAccessMode.DISABLED,
capabilities, capabilities,
null); null);

6
lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
View File

@ -884,9 +884,9 @@ public class GroupStore {
final var members = membersString == null final var members = membersString == null
? Set.<RecipientId>of() ? Set.<RecipientId>of()
: Arrays.stream(membersString.split(",")) : Arrays.stream(membersString.split(","))
.map(Integer::valueOf) .map(Integer::valueOf)
.map(recipientIdCreator::create) .map(recipientIdCreator::create)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
final var expirationTime = resultSet.getInt("expiration_time"); final var expirationTime = resultSet.getInt("expiration_time");
final var blocked = resultSet.getBoolean("blocked"); final var blocked = resultSet.getBoolean("blocked");
final var blockedAt = resultSet.getLong("blocked_at"); final var blockedAt = resultSet.getLong("blocked_at");

2
lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java
View File

@ -115,7 +115,7 @@ public class LegacyJsonIdentityKeyStore {
var trustLevel = trustedKey.hasNonNull("trustLevel") ? TrustLevel.fromInt(trustedKey.get( var trustLevel = trustedKey.hasNonNull("trustLevel") ? TrustLevel.fromInt(trustedKey.get(
"trustLevel").asInt()) : TrustLevel.TRUSTED_UNVERIFIED; "trustLevel").asInt()) : TrustLevel.TRUSTED_UNVERIFIED;
var added = trustedKey.hasNonNull("addedTimestamp") ? new Date(trustedKey.get("addedTimestamp") var added = trustedKey.hasNonNull("addedTimestamp") ? new Date(trustedKey.get("addedTimestamp")
.asLong()) : new Date(); .asLong()) : new Date();
identities.add(new LegacyIdentityInfo(address, id, trustLevel, added)); identities.add(new LegacyIdentityInfo(address, id, trustLevel, added));
} catch (InvalidKeyException e) { } catch (InvalidKeyException e) {
logger.warn("Error while decoding key for {}: {}", trustedKeyName, e.getMessage()); logger.warn("Error while decoding key for {}: {}", trustedKeyName, e.getMessage());

6
lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
View File

@ -1791,9 +1791,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
profileCapabilities == null profileCapabilities == null
? Set.of() ? Set.of()
: Arrays.stream(profileCapabilities.split(",")) : Arrays.stream(profileCapabilities.split(","))
.map(Profile.Capability::valueOfOrNull) .map(Profile.Capability::valueOfOrNull)
.filter(Objects::nonNull) .filter(Objects::nonNull)
.collect(Collectors.toSet()), .collect(Collectors.toSet()),
PhoneNumberSharingMode.valueOfOrNull(resultSet.getString("profile_phone_number_sharing"))); PhoneNumberSharingMode.valueOfOrNull(resultSet.getString("profile_phone_number_sharing")));
} }

6
lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
View File

@ -321,10 +321,10 @@ public class MessageSendLogStore implements AutoCloseable {
return content.dataMessage == null return content.dataMessage == null
? null ? null
: content.dataMessage.group != null && content.dataMessage.group.id != null : content.dataMessage.group != null && content.dataMessage.group.id != null
? content.dataMessage.group.id.toByteArray() ? content.dataMessage.group.id.toByteArray()
: content.dataMessage.groupV2 != null && content.dataMessage.groupV2.masterKey != null : content.dataMessage.groupV2 != null && content.dataMessage.groupV2.masterKey != null
? GroupUtils.getGroupIdV2(new GroupMasterKey(content.dataMessage.groupV2.masterKey.toByteArray())) ? GroupUtils.getGroupIdV2(new GroupMasterKey(content.dataMessage.groupV2.masterKey.toByteArray()))
.serialize() .serialize()
: null; : null;
} catch (InvalidInputException e) { } catch (InvalidInputException e) {
logger.warn("Failed to parse groupId id from content"); logger.warn("Failed to parse groupId id from content");

6
lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java
View File

@ -78,10 +78,8 @@ public class StickerUtils {
throw new StickerPackInvalidException("Could not find find " + pack.cover().file()); throw new StickerPackInvalidException("Could not find find " + pack.cover().file());
} }
var contentType = pack.cover().contentType() != null && !pack.cover().contentType().isEmpty() var contentType = pack.cover().contentType() != null && !pack.cover().contentType().isEmpty() ? pack.cover()
? pack.cover() .contentType() : getContentType(rootPath, zip, pack.cover().file());
.contentType()
: getContentType(rootPath, zip, pack.cover().file());
cover = new SignalServiceStickerManifestUpload.StickerInfo(data.first(), cover = new SignalServiceStickerManifestUpload.StickerInfo(data.first(),
data.second(), data.second(),
Optional.ofNullable(pack.cover().emoji()).orElse(""), Optional.ofNullable(pack.cover().emoji()).orElse(""),