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

Clarify the purpose of an `addListener` method

This commit is contained in:
Jon Chambers 2023-04-07 11:21:17 -04:00 committed by Jon Chambers
parent fd5e9ea016
commit d1eb247d8c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
service/src/main/java/org/whispersystems/textsecuregcm/websocket/AuthenticatedConnectListener.java
View File

@ -116,7 +116,7 @@ public class AuthenticatedConnectListener implements WebSocketConnectListener {
final AtomicReference<ScheduledFuture<?>> renewPresenceFutureReference = new AtomicReference<>(); final AtomicReference<ScheduledFuture<?>> renewPresenceFutureReference = new AtomicReference<>();
context.addListener((closingContext, statusCode, reason) -> { context.addWebsocketClosedListener((closingContext, statusCode, reason) -> {
openWebsocketAtomicInteger.decrementAndGet(); openWebsocketAtomicInteger.decrementAndGet();
openWebsocketCounter.dec(); openWebsocketCounter.dec();
@ -160,7 +160,7 @@ public class AuthenticatedConnectListener implements WebSocketConnectListener {
} }
} else { } else {
final Timer.Context timer = unauthenticatedDurationTimer.time(); final Timer.Context timer = unauthenticatedDurationTimer.time();
context.addListener((context1, statusCode, reason) -> timer.stop()); context.addWebsocketClosedListener((context1, statusCode, reason) -> timer.stop());
} }
} }

2
service/src/main/java/org/whispersystems/textsecuregcm/websocket/ProvisioningConnectListener.java
View File

@ -25,7 +25,7 @@ public class ProvisioningConnectListener implements WebSocketConnectListener {
@Override @Override
public void onWebSocketConnect(WebSocketSessionContext context) { public void onWebSocketConnect(WebSocketSessionContext context) {
final ProvisioningAddress provisioningAddress = ProvisioningAddress.generate(); final ProvisioningAddress provisioningAddress = ProvisioningAddress.generate();
context.addListener((context1, statusCode, reason) -> provisioningManager.removeListener(provisioningAddress)); context.addWebsocketClosedListener((context1, statusCode, reason) -> provisioningManager.removeListener(provisioningAddress));
provisioningManager.addListener(provisioningAddress, message -> { provisioningManager.addListener(provisioningAddress, message -> {
assert message.getType() == PubSubProtos.PubSubMessage.Type.DELIVER; assert message.getType() == PubSubProtos.PubSubMessage.Type.DELIVER;

2
service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionTest.java
View File

@ -136,7 +136,7 @@ class WebSocketConnectionTest {
connectListener.onWebSocketConnect(sessionContext); connectListener.onWebSocketConnect(sessionContext);
verify(sessionContext).addListener(any(WebSocketSessionContext.WebSocketEventListener.class)); verify(sessionContext).addWebsocketClosedListener(any(WebSocketSessionContext.WebSocketEventListener.class));
when(upgradeRequest.getParameterMap()).thenReturn(Map.of( when(upgradeRequest.getParameterMap()).thenReturn(Map.of(
"login", List.of(INVALID_USER), "login", List.of(INVALID_USER),

2
websocket-resources/src/main/java/org/whispersystems/websocket/session/WebSocketSessionContext.java
View File

@ -38,7 +38,7 @@ public class WebSocketSessionContext {
return authenticated; return authenticated;
} }
public synchronized void addListener(WebSocketEventListener listener) { public synchronized void addWebsocketClosedListener(WebSocketEventListener listener) {
if (!closed) this.closeListeners.add(listener); if (!closed) this.closeListeners.add(listener);
else listener.onWebSocketClose(this, 1000, "Closed"); else listener.onWebSocketClose(this, 1000, "Closed");
} }