mirror of
https://github.com/AsamK/signal-cli.git
synced 2026-09-20 06:09:21 +00:00
Reformat files
This commit is contained in:
parent
7cc0cc3e0e
commit
2c03e5fd8d
@ -202,10 +202,8 @@ public final class ProfileHelper {
|
|||||||
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)
|
||||||
|
|||||||
@ -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) {
|
||||||
|
|||||||
@ -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(""),
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user