From 21cf467bb448636430b537826b53489d17140828 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 23 Oct 2018 10:31:29 -0400 Subject: [PATCH] Don't use websocket after 409/410. --- SignalServiceKit/src/Messages/OWSMessageSender.m | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m index efceb602e..4689caec2 100644 --- a/SignalServiceKit/src/Messages/OWSMessageSender.m +++ b/SignalServiceKit/src/Messages/OWSMessageSender.m @@ -1219,6 +1219,12 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; } [self handleMismatchedDevicesWithResponseJson:responseJson recipient:recipient completion:retrySend]; + + if (messageSend.isLocalNumber) { + // Don't use websocket; it may have obsolete cached state. + [messageSend setHasWebsocketSendFailed:YES]; + } + break; } case 410: { @@ -1238,6 +1244,12 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; } [self handleStaleDevicesWithResponseJson:responseJson recipientId:recipient.uniqueId completion:retrySend]; + + if (messageSend.isLocalNumber) { + // Don't use websocket; it may have obsolete cached state. + [messageSend setHasWebsocketSendFailed:YES]; + } + break; } default: