From 9b9edbae0e0b55520454544644901ef7e242deb6 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Mon, 7 Mar 2022 10:40:08 -0500
Subject: [PATCH] Drop `DeadLetterHandler` (which is functionally unused)

---
 .../textsecuregcm/WhisperServerService.java   |  4 +-
 .../websocket/DeadLetterHandler.java          | 76 -------------------
 2 files changed, 1 insertion(+), 79 deletions(-)
 delete mode 100644 service/src/main/java/org/whispersystems/textsecuregcm/websocket/DeadLetterHandler.java

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index 0c82652c7..52777291e 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -207,7 +207,6 @@ import org.whispersystems.textsecuregcm.util.HostnameUtil;
 import org.whispersystems.textsecuregcm.util.logging.LoggingUnhandledExceptionMapper;
 import org.whispersystems.textsecuregcm.util.logging.UncaughtExceptionHandler;
 import org.whispersystems.textsecuregcm.websocket.AuthenticatedConnectListener;
-import org.whispersystems.textsecuregcm.websocket.DeadLetterHandler;
 import org.whispersystems.textsecuregcm.websocket.ProvisioningConnectListener;
 import org.whispersystems.textsecuregcm.websocket.WebSocketAccountAuthenticator;
 import org.whispersystems.textsecuregcm.workers.AssignUsernameCommand;
@@ -442,8 +441,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
         deletedAccountsManager, directoryQueue, keys, messagesManager, reservedUsernames, profilesManager,
         pendingAccountsManager, secureStorageClient, secureBackupClient, clientPresenceManager, clock);
     RemoteConfigsManager       remoteConfigsManager       = new RemoteConfigsManager(remoteConfigs);
-    DeadLetterHandler          deadLetterHandler          = new DeadLetterHandler(accountsManager, messagesManager);
-    DispatchManager            dispatchManager            = new DispatchManager(pubSubClientFactory, Optional.of(deadLetterHandler));
+    DispatchManager            dispatchManager            = new DispatchManager(pubSubClientFactory, Optional.empty());
     PubSubManager              pubSubManager              = new PubSubManager(pubsubClient, dispatchManager);
     APNSender                  apnSender                  = new APNSender(apnSenderExecutor, accountsManager, config.getApnConfiguration());
     GCMSender                  gcmSender                  = new GCMSender(gcmSenderExecutor, accountsManager, config.getGcmConfiguration().getApiKey());
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/websocket/DeadLetterHandler.java b/service/src/main/java/org/whispersystems/textsecuregcm/websocket/DeadLetterHandler.java
deleted file mode 100644
index e67c96fbf..000000000
--- a/service/src/main/java/org/whispersystems/textsecuregcm/websocket/DeadLetterHandler.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2013-2020 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.websocket;
-
-import com.google.protobuf.InvalidProtocolBufferException;
-import io.micrometer.core.instrument.Counter;
-import io.micrometer.core.instrument.Metrics;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.whispersystems.dispatch.DispatchChannel;
-import org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope;
-import org.whispersystems.textsecuregcm.storage.Account;
-import org.whispersystems.textsecuregcm.storage.AccountsManager;
-import org.whispersystems.textsecuregcm.storage.MessagesManager;
-import org.whispersystems.textsecuregcm.storage.PubSubProtos.PubSubMessage;
-
-import java.util.Optional;
-
-import static com.codahale.metrics.MetricRegistry.name;
-
-public class DeadLetterHandler implements DispatchChannel {
-
-  private final Logger logger = LoggerFactory.getLogger(DeadLetterHandler.class);
-
-  private final AccountsManager accountsManager;
-  private final MessagesManager messagesManager;
-
-  private final Counter deadLetterCounter = Metrics.counter(name(getClass(), "deadLetterCounter"));
-
-  public DeadLetterHandler(AccountsManager accountsManager, MessagesManager messagesManager) {
-    this.accountsManager = accountsManager;
-    this.messagesManager = messagesManager;
-  }
-
-  @Override
-  public void onDispatchMessage(String channel, byte[] data) {
-    try {
-      logger.info("Handling dead letter to: " + channel);
-      deadLetterCounter.increment();
-
-      WebsocketAddress address       = new WebsocketAddress(channel);
-      PubSubMessage    pubSubMessage = PubSubMessage.parseFrom(data);
-
-      switch (pubSubMessage.getType().getNumber()) {
-        case PubSubMessage.Type.DELIVER_VALUE:
-          Envelope          message      = Envelope.parseFrom(pubSubMessage.getContent());
-          Optional<Account> maybeAccount = accountsManager.getByE164(address.getNumber());
-
-          if (maybeAccount.isPresent()) {
-            messagesManager.insert(maybeAccount.get().getUuid(), address.getDeviceId(), message);
-          } else {
-            logger.warn("Dead letter for account that no longer exists: {}", address);
-          }
-
-          break;
-      }
-    } catch (InvalidProtocolBufferException e) {
-      logger.warn("Bad pubsub message", e);
-    } catch (InvalidWebsocketAddressException e) {
-      logger.warn("Invalid websocket address", e);
-    }
-  }
-
-  @Override
-  public void onDispatchSubscribed(String channel) {
-    logger.warn("DeadLetterHandler subscription notice! " + channel);
-  }
-
-  @Override
-  public void onDispatchUnsubscribed(String channel) {
-    logger.warn("DeadLetterHandler unsubscribe notice! " + channel);
-  }
-}