From 2da00e162add89a69b514e826293c8c01e2c2b97 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Mon, 11 Nov 2024 11:46:47 -0500
Subject: [PATCH] Resolve a merge-related naming conflict

---
 .../textsecuregcm/push/PubSubClientEventManager.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/push/PubSubClientEventManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/push/PubSubClientEventManager.java
index 6d3afa693..f9485f328 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/push/PubSubClientEventManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/push/PubSubClientEventManager.java
@@ -304,7 +304,7 @@ public class PubSubClientEventManager extends RedisClusterPubSubAdapter<byte[],
       if (existingListener == null && pubSubConnection != null) {
         // Enqueue, but do not block on, an "unsubscribe" operation
         pubSubConnection.usePubSubConnection(connection ->
-            connection.async().sunsubscribe(getClientPresenceKey(accountAndDeviceIdentifier.accountIdentifier(),
+            connection.async().sunsubscribe(getClientEventChannel(accountAndDeviceIdentifier.accountIdentifier(),
                 accountAndDeviceIdentifier.deviceId())));
       }