MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix weird indentation

This commit is contained in:
Jon Chambers 2024-06-11 16:15:52 -04:00 committed by Jon Chambers
parent 09bc4ef1d6
commit 155450380e
1 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
View File

@ -8,8 +8,6 @@ import static com.codahale.metrics.MetricRegistry.name;
import com.codahale.metrics.annotation.Timed; import com.codahale.metrics.annotation.Timed;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.net.HttpHeaders; import com.google.common.net.HttpHeaders;
import com.google.protobuf.ByteString; import com.google.protobuf.ByteString;
import io.dropwizard.auth.Auth; import io.dropwizard.auth.Auth;
@ -633,40 +631,41 @@ public class MessageController {
try { try {
CompletableFuture.allOf( CompletableFuture.allOf(
recipients.values().stream() recipients.values().stream()
.flatMap(recipientData -> { .flatMap(recipientData -> {
final Counter sentMessageCounter = Metrics.counter(SENT_MESSAGE_COUNTER_NAME, Tags.of( final Counter sentMessageCounter = Metrics.counter(SENT_MESSAGE_COUNTER_NAME, Tags.of(
UserAgentTagUtil.getPlatformTag(userAgent), UserAgentTagUtil.getPlatformTag(userAgent),
Tag.of(EPHEMERAL_TAG_NAME, String.valueOf(online)), Tag.of(EPHEMERAL_TAG_NAME, String.valueOf(online)),
Tag.of(SENDER_TYPE_TAG_NAME, SENDER_TYPE_UNIDENTIFIED), Tag.of(SENDER_TYPE_TAG_NAME, SENDER_TYPE_UNIDENTIFIED),
Tag.of(IDENTITY_TYPE_TAG_NAME, recipientData.serviceIdentifier().identityType().name()))); Tag.of(IDENTITY_TYPE_TAG_NAME, recipientData.serviceIdentifier().identityType().name())));
validateContentLength(multiRecipientMessage.messageSizeForRecipient(recipientData.recipient()), true, userAgent); validateContentLength(multiRecipientMessage.messageSizeForRecipient(recipientData.recipient()), true, userAgent);
return recipientData.deviceIdToRegistrationId().keySet().stream().map( return recipientData.deviceIdToRegistrationId().keySet().stream().map(
deviceId ->CompletableFuture.runAsync( deviceId -> CompletableFuture.runAsync(
() -> { () -> {
final Account destinationAccount = recipientData.account(); final Account destinationAccount = recipientData.account();
final byte[] payload = multiRecipientMessage.messageForRecipient(recipientData.recipient()); final byte[] payload = multiRecipientMessage.messageForRecipient(recipientData.recipient());
// we asserted this must exist in validateCompleteDeviceList // we asserted this must exist in validateCompleteDeviceList
final Device destinationDevice = destinationAccount.getDevice(deviceId).orElseThrow(); final Device destinationDevice = destinationAccount.getDevice(deviceId).orElseThrow();
try { try {
sentMessageCounter.increment(); sentMessageCounter.increment();
sendCommonPayloadMessage( sendCommonPayloadMessage(
destinationAccount, destinationDevice, recipientData.serviceIdentifier(), timestamp, online, destinationAccount, destinationDevice, recipientData.serviceIdentifier(), timestamp,
isStory, isUrgent, payload); online,
} catch (NoSuchUserException e) { isStory, isUrgent, payload);
// this should never happen, because we already asserted the device is present and enabled } catch (NoSuchUserException e) {
Metrics.counter( // this should never happen, because we already asserted the device is present and enabled
UNEXPECTED_MISSING_USER_COUNTER_NAME, Metrics.counter(
Tags.of("isPrimary", String.valueOf(destinationDevice.isPrimary()))).increment(); UNEXPECTED_MISSING_USER_COUNTER_NAME,
uuids404.add(recipientData.serviceIdentifier()); Tags.of("isPrimary", String.valueOf(destinationDevice.isPrimary()))).increment();
} uuids404.add(recipientData.serviceIdentifier());
}, }
multiRecipientMessageExecutor)); },
}) multiRecipientMessageExecutor));
.toArray(CompletableFuture[]::new)) })
.toArray(CompletableFuture[]::new))
.get(); .get();
} catch (InterruptedException e) { } catch (InterruptedException e) {
logger.error("interrupted while delivering multi-recipient messages", e); logger.error("interrupted while delivering multi-recipient messages", e);