Reformat files

This commit is contained in:
AsamK 2026-04-11 12:29:16 +02:00
parent 398faa50b0
commit d0ee90dbbc
28 changed files with 144 additions and 123 deletions

View File

@ -1,9 +1,7 @@
package org.asamk.signal.manager.api; package org.asamk.signal.manager.api;
public record CallOffer( public record CallOffer(
long callId, long callId, Type type, byte[] opaque
Type type,
byte[] opaque
) { ) {
public enum Type { public enum Type {

View File

@ -268,19 +268,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());
} }
} }
@ -599,7 +599,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());
} }
} }
@ -1032,14 +1032,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;

View File

@ -1,3 +1,9 @@
package org.asamk.signal.manager.api; package org.asamk.signal.manager.api;
public record ReceiveConfig(boolean ignoreAttachments, boolean ignoreStories, boolean ignoreAvatars, boolean ignoreStickers, boolean sendReadReceipts) {} public record ReceiveConfig(
boolean ignoreAttachments,
boolean ignoreStories,
boolean ignoreAvatars,
boolean ignoreStickers,
boolean sendReadReceipts
) {}

View File

@ -3,8 +3,5 @@ package org.asamk.signal.manager.api;
import java.util.List; import java.util.List;
public record TurnServer( public record TurnServer(
String username, String username, String password, List<String> urls
String password, ) {}
List<String> urls
) {
}

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,

View File

@ -191,9 +191,11 @@ 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 ? context.getAvatarStore() : forceUploadAvatar && avatar == null
.retrieveProfileAvatar(account.getSelfRecipientAddress()) : null; ? context.getAvatarStore()
.retrieveProfileAvatar(account.getSelfRecipientAddress())
: null;
try (streamDetails) { try (streamDetails) {
final var avatarUploadParams = streamDetails != null final var avatarUploadParams = streamDetails != null
? AvatarUploadParams.forAvatar(streamDetails) ? AvatarUploadParams.forAvatar(streamDetails)

View File

@ -524,11 +524,11 @@ public class SendHelper {
Set<RecipientId> senderKeyTargets = groupInfo.getDistributionId() == null || groupSendEndorsements == null Set<RecipientId> senderKeyTargets = groupInfo.getDistributionId() == null || groupSendEndorsements == null
? Set.of() ? Set.of()
: recipientIds.stream() : recipientIds.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();
@ -590,11 +590,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,

View File

@ -941,7 +941,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);

View File

@ -877,9 +877,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 archived = resultSet.getBoolean("archived"); final var archived = resultSet.getBoolean("archived");

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());

View File

@ -1606,9 +1606,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")));
} }

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");

View File

@ -78,8 +78,10 @@ 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() ? pack.cover() var contentType = pack.cover().contentType() != null && !pack.cover().contentType().isEmpty()
.contentType() : getContentType(rootPath, zip, pack.cover().file()); ? pack.cover()
.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(""),

View File

@ -204,9 +204,9 @@ public class App {
private OutputWriter getOutputWriter(final Command command) throws UserErrorException { private OutputWriter getOutputWriter(final Command command) throws UserErrorException {
final var outputTypeInput = ns.<OutputType>get("output"); final var outputTypeInput = ns.<OutputType>get("output");
final var outputType = outputTypeInput == null ? command.getSupportedOutputTypes() final var outputType = outputTypeInput == null ? command.getSupportedOutputTypes()
.stream() .stream()
.findFirst() .findFirst()
.orElse(null) : outputTypeInput; .orElse(null) : outputTypeInput;
final var writer = new BufferedWriter(new OutputStreamWriter(System.out, IOUtils.getConsoleCharset())); final var writer = new BufferedWriter(new OutputStreamWriter(System.out, IOUtils.getConsoleCharset()));
final var outputWriter = outputType == null final var outputWriter = outputType == null
? null ? null

View File

@ -612,8 +612,8 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
writer.println("Size: {}{}", writer.println("Size: {}{}",
attachment.size().isPresent() ? attachment.size().get() + " bytes" : "<unavailable>", attachment.size().isPresent() ? attachment.size().get() + " bytes" : "<unavailable>",
attachment.preview().isPresent() ? " (Preview is available: " attachment.preview().isPresent() ? " (Preview is available: "
+ attachment.preview().get().length + attachment.preview().get().length
+ " bytes)" : ""); + " bytes)" : "");
} }
if (attachment.thumbnail().isPresent()) { if (attachment.thumbnail().isPresent()) {
writer.println("Thumbnail:"); writer.println("Thumbnail:");

View File

@ -23,10 +23,7 @@ public class AcceptCallCommand implements JsonRpcLocalCommand {
@Override @Override
public void attachToSubparser(final Subparser subparser) { public void attachToSubparser(final Subparser subparser) {
subparser.help("Accept an incoming voice call."); subparser.help("Accept an incoming voice call.");
subparser.addArgument("--call-id") subparser.addArgument("--call-id").type(long.class).required(true).help("The call ID to accept.");
.type(long.class)
.required(true)
.help("The call ID to accept.");
} }
@Override @Override

View File

@ -21,10 +21,7 @@ public class HangupCallCommand implements JsonRpcLocalCommand {
@Override @Override
public void attachToSubparser(final Subparser subparser) { public void attachToSubparser(final Subparser subparser) {
subparser.help("Hang up an active voice call."); subparser.help("Hang up an active voice call.");
subparser.addArgument("--call-id") subparser.addArgument("--call-id").type(long.class).required(true).help("The call ID to hang up.");
.type(long.class)
.required(true)
.help("The call ID to hang up.");
} }
@Override @Override

View File

@ -5,13 +5,10 @@ import net.sourceforge.argparse4j.inf.Subparser;
import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.CommandException;
import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.Manager;
import org.asamk.signal.manager.api.CallInfo;
import org.asamk.signal.output.JsonWriter; import org.asamk.signal.output.JsonWriter;
import org.asamk.signal.output.OutputWriter; import org.asamk.signal.output.OutputWriter;
import org.asamk.signal.output.PlainTextWriter; import org.asamk.signal.output.PlainTextWriter;
import java.util.List;
public class ListCallsCommand implements JsonRpcLocalCommand { public class ListCallsCommand implements JsonRpcLocalCommand {
@Override @Override

View File

@ -109,7 +109,7 @@ public class ListContactsCommand implements JsonRpcLocalCommand {
r.getProfile().getPhoneNumberSharingMode() == null r.getProfile().getPhoneNumberSharingMode() == null
? "" ? ""
: String.valueOf(r.getProfile().getPhoneNumberSharingMode() : String.valueOf(r.getProfile().getPhoneNumberSharingMode()
== PhoneNumberSharingMode.EVERYBODY), == PhoneNumberSharingMode.EVERYBODY),
r.getDiscoverable() == null ? "" : String.valueOf(r.getDiscoverable())); r.getDiscoverable() == null ? "" : String.valueOf(r.getDiscoverable()));
} }
} }
@ -121,17 +121,17 @@ public class ListContactsCommand implements JsonRpcLocalCommand {
final var jsonInternal = !internal final var jsonInternal = !internal
? null ? null
: new JsonContact.JsonInternal(r.getProfile() : new JsonContact.JsonInternal(r.getProfile()
.getCapabilities() .getCapabilities()
.stream() .stream()
.map(Enum::name) .map(Enum::name)
.toList(), .toList(),
r.getProfile().getUnidentifiedAccessMode() == Profile.UnidentifiedAccessMode.UNKNOWN r.getProfile().getUnidentifiedAccessMode() == Profile.UnidentifiedAccessMode.UNKNOWN
? null ? null
: r.getProfile().getUnidentifiedAccessMode().name(), : r.getProfile().getUnidentifiedAccessMode().name(),
r.getProfile().getPhoneNumberSharingMode() == null r.getProfile().getPhoneNumberSharingMode() == null
? null ? null
: r.getProfile().getPhoneNumberSharingMode() : r.getProfile().getPhoneNumberSharingMode()
== PhoneNumberSharingMode.EVERYBODY, == PhoneNumberSharingMode.EVERYBODY,
r.getDiscoverable()); r.getDiscoverable());
return new JsonContact(address.number().orElse(null), return new JsonContact(address.number().orElse(null),
address.uuid().map(UUID::toString).orElse(null), address.uuid().map(UUID::toString).orElse(null),
@ -159,9 +159,9 @@ public class ListContactsCommand implements JsonRpcLocalCommand {
r.getProfile().getAboutEmoji(), r.getProfile().getAboutEmoji(),
r.getProfile().getAvatarUrlPath() != null, r.getProfile().getAvatarUrlPath() != null,
r.getProfile().getMobileCoinAddress() == null r.getProfile().getMobileCoinAddress() == null
? null ? null
: Base64.getEncoder() : Base64.getEncoder()
.encodeToString(r.getProfile().getMobileCoinAddress())), .encodeToString(r.getProfile().getMobileCoinAddress())),
jsonInternal); jsonInternal);
}).toList(); }).toList();
writer.write(jsonContacts); writer.write(jsonContacts);

View File

@ -21,10 +21,7 @@ public class RejectCallCommand implements JsonRpcLocalCommand {
@Override @Override
public void attachToSubparser(final Subparser subparser) { public void attachToSubparser(final Subparser subparser) {
subparser.help("Reject an incoming voice call."); subparser.help("Reject an incoming voice call.");
subparser.addArgument("--call-id") subparser.addArgument("--call-id").type(long.class).required(true).help("The call ID to reject.");
.type(long.class)
.required(true)
.help("The call ID to reject.");
} }
@Override @Override

View File

@ -82,7 +82,11 @@ public class SendPollCreateCommand implements JsonRpcLocalCommand {
throw new UserErrorException("Poll options must not be empty"); throw new UserErrorException("Poll options must not be empty");
} }
if (option.length() > MAX_POLL_OPTION_LENGTH) { if (option.length() > MAX_POLL_OPTION_LENGTH) {
throw new UserErrorException("Poll option \"" + option + "\" exceeds the maximum length of " + MAX_POLL_OPTION_LENGTH + " characters"); throw new UserErrorException("Poll option \""
+ option
+ "\" exceeds the maximum length of "
+ MAX_POLL_OPTION_LENGTH
+ " characters");
} }
} }

View File

@ -18,15 +18,13 @@ public record JsonCallEvent(
) { ) {
public static JsonCallEvent from(CallInfo callInfo, String reason) { public static JsonCallEvent from(CallInfo callInfo, String reason) {
return new JsonCallEvent( return new JsonCallEvent(callInfo.callId(),
callInfo.callId(),
callInfo.state().name(), callInfo.state().name(),
callInfo.recipient().number().orElse(null), callInfo.recipient().number().orElse(null),
callInfo.recipient().aci().orElse(null), callInfo.recipient().aci().orElse(null),
callInfo.isOutgoing(), callInfo.isOutgoing(),
callInfo.inputDeviceName(), callInfo.inputDeviceName(),
callInfo.outputDeviceName(), callInfo.outputDeviceName(),
reason reason);
);
} }
} }

View File

@ -36,7 +36,7 @@ record JsonDataMessage(
static JsonDataMessage from(MessageEnvelope.Data dataMessage, Manager m) { static JsonDataMessage from(MessageEnvelope.Data dataMessage, Manager m) {
final var timestamp = dataMessage.timestamp(); final var timestamp = dataMessage.timestamp();
final var groupInfo = dataMessage.groupContext().isPresent() ? JsonGroupInfo.from(dataMessage.groupContext() final var groupInfo = dataMessage.groupContext().isPresent() ? JsonGroupInfo.from(dataMessage.groupContext()
.get(), m) : null; .get(), m) : null;
final var storyContext = dataMessage.storyContext().isPresent() final var storyContext = dataMessage.storyContext().isPresent()
? JsonStoryContext.from(dataMessage.storyContext().get()) ? JsonStoryContext.from(dataMessage.storyContext().get())
: null; : null;
@ -48,32 +48,32 @@ record JsonDataMessage(
final var quote = dataMessage.quote().isPresent() ? JsonQuote.from(dataMessage.quote().get()) : null; final var quote = dataMessage.quote().isPresent() ? JsonQuote.from(dataMessage.quote().get()) : null;
final var payment = dataMessage.payment().isPresent() ? JsonPayment.from(dataMessage.payment().get()) : null; final var payment = dataMessage.payment().isPresent() ? JsonPayment.from(dataMessage.payment().get()) : null;
final var mentions = !dataMessage.mentions().isEmpty() ? dataMessage.mentions() final var mentions = !dataMessage.mentions().isEmpty() ? dataMessage.mentions()
.stream() .stream()
.map(JsonMention::from) .map(JsonMention::from)
.toList() : null; .toList() : null;
final var previews = !dataMessage.previews().isEmpty() ? dataMessage.previews() final var previews = !dataMessage.previews().isEmpty() ? dataMessage.previews()
.stream() .stream()
.map(JsonPreview::from) .map(JsonPreview::from)
.toList() : null; .toList() : null;
final var remoteDelete = dataMessage.remoteDeleteId().isPresent() final var remoteDelete = dataMessage.remoteDeleteId().isPresent()
? new JsonRemoteDelete(dataMessage.remoteDeleteId().get()) ? new JsonRemoteDelete(dataMessage.remoteDeleteId().get())
: null; : null;
final var attachments = !dataMessage.attachments().isEmpty() ? dataMessage.attachments() final var attachments = !dataMessage.attachments().isEmpty() ? dataMessage.attachments()
.stream() .stream()
.map(JsonAttachment::from) .map(JsonAttachment::from)
.toList() : null; .toList() : null;
final var sticker = dataMessage.sticker().isPresent() ? JsonSticker.from(dataMessage.sticker().get()) : null; final var sticker = dataMessage.sticker().isPresent() ? JsonSticker.from(dataMessage.sticker().get()) : null;
final var contacts = !dataMessage.sharedContacts().isEmpty() ? dataMessage.sharedContacts() final var contacts = !dataMessage.sharedContacts().isEmpty() ? dataMessage.sharedContacts()
.stream() .stream()
.map(JsonSharedContact::from) .map(JsonSharedContact::from)
.toList() : null; .toList() : null;
final var pollCreate = dataMessage.pollCreate().map(JsonPollCreate::from).orElse(null); final var pollCreate = dataMessage.pollCreate().map(JsonPollCreate::from).orElse(null);
final var pollVote = dataMessage.pollVote().map(JsonPollVote::from).orElse(null); final var pollVote = dataMessage.pollVote().map(JsonPollVote::from).orElse(null);
final var pollTerminate = dataMessage.pollTerminate().map(JsonPollTerminate::from).orElse(null); final var pollTerminate = dataMessage.pollTerminate().map(JsonPollTerminate::from).orElse(null);
final var textStyles = !dataMessage.textStyles().isEmpty() ? dataMessage.textStyles() final var textStyles = !dataMessage.textStyles().isEmpty() ? dataMessage.textStyles()
.stream() .stream()
.map(JsonTextStyle::from) .map(JsonTextStyle::from)
.toList() : null; .toList() : null;
final var pinMessage = dataMessage.pinMessage().map(JsonPinMessage::from).orElse(null); final var pinMessage = dataMessage.pinMessage().map(JsonPinMessage::from).orElse(null);
final var unpinMessage = dataMessage.unpinMessage().map(JsonUnpinMessage::from).orElse(null); final var unpinMessage = dataMessage.unpinMessage().map(JsonUnpinMessage::from).orElse(null);
final var adminDelete = dataMessage.adminDelete().map(JsonAdminDelete::from).orElse(null); final var adminDelete = dataMessage.adminDelete().map(JsonAdminDelete::from).orElse(null);

View File

@ -31,14 +31,14 @@ public record JsonQuote(
: null; : null;
final var attachments = !quote.attachments().isEmpty() ? quote.attachments() final var attachments = !quote.attachments().isEmpty() ? quote.attachments()
.stream() .stream()
.map(JsonQuotedAttachment::from) .map(JsonQuotedAttachment::from)
.toList() : List.<JsonQuotedAttachment>of(); .toList() : List.<JsonQuotedAttachment>of();
final var textStyles = !quote.textStyles().isEmpty() ? quote.textStyles() final var textStyles = !quote.textStyles().isEmpty() ? quote.textStyles()
.stream() .stream()
.map(JsonTextStyle::from) .map(JsonTextStyle::from)
.toList() : null; .toList() : null;
return new JsonQuote(id, author, authorNumber, authorUuid, text, mentions, attachments, textStyles); return new JsonQuote(id, author, authorNumber, authorUuid, text, mentions, attachments, textStyles);
} }

View File

@ -23,13 +23,13 @@ public record JsonSendMessageResult(
result.isSuccess() result.isSuccess()
? Type.SUCCESS ? Type.SUCCESS
: result.isRateLimitFailure() : result.isRateLimitFailure()
? Type.RATE_LIMIT_FAILURE ? Type.RATE_LIMIT_FAILURE
: result.isNetworkFailure() : result.isNetworkFailure()
? Type.NETWORK_FAILURE ? Type.NETWORK_FAILURE
: result.isUnregisteredFailure() : result.isUnregisteredFailure()
? Type.UNREGISTERED_FAILURE ? Type.UNREGISTERED_FAILURE
: result.isInvalidPreKeyFailure() : result.isInvalidPreKeyFailure()
? Type.INVALID_PRE_KEY_FAILURE ? Type.INVALID_PRE_KEY_FAILURE
: Type.IDENTITY_FAILURE, : Type.IDENTITY_FAILURE,
result.proofRequiredFailure() != null ? result.proofRequiredFailure().getToken() : null, result.proofRequiredFailure() != null ? result.proofRequiredFailure().getToken() : null,
result.proofRequiredFailure() != null ? result.proofRequiredFailure().getRetryAfterSeconds() : null); result.proofRequiredFailure() != null ? result.proofRequiredFailure().getRetryAfterSeconds() : null);

View File

@ -28,9 +28,9 @@ public record JsonSharedContact(
: null; : null;
final var address = !contact.address().isEmpty() ? contact.address() final var address = !contact.address().isEmpty() ? contact.address()
.stream() .stream()
.map(JsonContactAddress::from) .map(JsonContactAddress::from)
.toList() : null; .toList() : null;
final var organization = contact.organization().orElse(null); final var organization = contact.organization().orElse(null);

View File

@ -47,9 +47,9 @@ record JsonSyncMessage(
} }
final var readMessages = !syncMessage.read().isEmpty() ? syncMessage.read() final var readMessages = !syncMessage.read().isEmpty() ? syncMessage.read()
.stream() .stream()
.map(JsonSyncReadMessage::from) .map(JsonSyncReadMessage::from)
.toList() : null; .toList() : null;
final JsonSyncMessageType type; final JsonSyncMessageType type;
if (syncMessage.contacts().isPresent()) { if (syncMessage.contacts().isPresent()) {

View File

@ -2,11 +2,8 @@ package org.asamk.signal.json;
import org.asamk.signal.manager.api.CallInfo; import org.asamk.signal.manager.api.CallInfo;
import org.asamk.signal.manager.api.RecipientAddress; import org.asamk.signal.manager.api.RecipientAddress;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.Optional;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertNull;
@ -17,7 +14,12 @@ class JsonCallEventTest {
@Test @Test
void fromWithNumberAndUuid() { void fromWithNumberAndUuid() {
var recipient = new RecipientAddress("a1b2c3d4-e5f6-7890-abcd-ef1234567890", null, "+15551234567", null); var recipient = new RecipientAddress("a1b2c3d4-e5f6-7890-abcd-ef1234567890", null, "+15551234567", null);
var callInfo = new CallInfo(123L, CallInfo.State.CONNECTED, recipient, "signal_input_123", "signal_output_123", true); var callInfo = new CallInfo(123L,
CallInfo.State.CONNECTED,
recipient,
"signal_input_123",
"signal_output_123",
true);
var event = JsonCallEvent.from(callInfo, null); var event = JsonCallEvent.from(callInfo, null);
@ -34,7 +36,12 @@ class JsonCallEventTest {
@Test @Test
void fromWithUuidOnly() { void fromWithUuidOnly() {
var recipient = new RecipientAddress("a1b2c3d4-e5f6-7890-abcd-ef1234567890", null, null, null); var recipient = new RecipientAddress("a1b2c3d4-e5f6-7890-abcd-ef1234567890", null, null, null);
var callInfo = new CallInfo(456L, CallInfo.State.RINGING_INCOMING, recipient, "signal_input_456", "signal_output_456", false); var callInfo = new CallInfo(456L,
CallInfo.State.RINGING_INCOMING,
recipient,
"signal_input_456",
"signal_output_456",
false);
var event = JsonCallEvent.from(callInfo, null); var event = JsonCallEvent.from(callInfo, null);
@ -48,7 +55,12 @@ class JsonCallEventTest {
@Test @Test
void fromWithNumberOnly() { void fromWithNumberOnly() {
var recipient = new RecipientAddress(null, null, "+15559876543", null); var recipient = new RecipientAddress(null, null, "+15559876543", null);
var callInfo = new CallInfo(789L, CallInfo.State.RINGING_OUTGOING, recipient, "signal_input_789", "signal_output_789", true); var callInfo = new CallInfo(789L,
CallInfo.State.RINGING_OUTGOING,
recipient,
"signal_input_789",
"signal_output_789",
true);
var event = JsonCallEvent.from(callInfo, null); var event = JsonCallEvent.from(callInfo, null);
@ -81,7 +93,12 @@ class JsonCallEventTest {
@Test @Test
void fromConnectingState() { void fromConnectingState() {
var recipient = new RecipientAddress("uuid-5678", null, "+15552222222", null); var recipient = new RecipientAddress("uuid-5678", null, "+15552222222", null);
var callInfo = new CallInfo(200L, CallInfo.State.CONNECTING, recipient, "signal_input_200", "signal_output_200", true); var callInfo = new CallInfo(200L,
CallInfo.State.CONNECTING,
recipient,
"signal_input_200",
"signal_output_200",
true);
var event = JsonCallEvent.from(callInfo, null); var event = JsonCallEvent.from(callInfo, null);
@ -97,8 +114,17 @@ class JsonCallEventTest {
void fromWithVariousEndReasons() { void fromWithVariousEndReasons() {
var recipient = new RecipientAddress("uuid-1234", null, "+15551111111", null); var recipient = new RecipientAddress("uuid-1234", null, "+15551111111", null);
var reasons = new String[]{"local_hangup", "remote_hangup", "rejected", "remote_busy", var reasons = new String[]{
"ring_timeout", "ice_failed", "tunnel_exit", "tunnel_error", "shutdown"}; "local_hangup",
"remote_hangup",
"rejected",
"remote_busy",
"ring_timeout",
"ice_failed",
"tunnel_exit",
"tunnel_error",
"shutdown"
};
for (var reason : reasons) { for (var reason : reasons) {
var callInfo = new CallInfo(1L, CallInfo.State.ENDED, recipient, null, null, false); var callInfo = new CallInfo(1L, CallInfo.State.ENDED, recipient, null, null, false);