From 29ca544c95f6c5e4aca5f905615b2d2a32f5c4c2 Mon Sep 17 00:00:00 2001
From: Chris Eager <79161849+eager-signal@users.noreply.github.com>
Date: Thu, 7 Sep 2023 16:59:17 -0500
Subject: [PATCH] Revert "Set `suppressCancel=true` in `Mono.fromFuture`"

This reverts commit 8348263fab2d9f136d8f10a36c1f00413112c94c.
---
 .../textsecuregcm/websocket/WebSocketConnection.java         | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java b/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java
index c7a58247f..e81a1446a 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java
@@ -361,10 +361,7 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac
         .limitRate(MESSAGE_PUBLISHER_LIMIT_RATE)
         .flatMapSequential(envelope ->
             Mono.fromFuture(() -> sendMessage(envelope)
-                        .orTimeout(sendFuturesTimeoutMillis, TimeUnit.MILLISECONDS),
-                    // suppressCancel=true, because attempting to cancel the future has no effect, other than
-                    // causing dropped errors
-                    true)
+                    .orTimeout(sendFuturesTimeoutMillis, TimeUnit.MILLISECONDS))
                 .onErrorResume(
                     // let the first error pass through to terminate the subscription
                     e -> {