signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Merge branch 'charlesmchen/deviceChangeVsWebsocket'

Browse Source
This commit is contained in:
Matthew Chen 2018-10-23 15:09:32 -04:00
commit cc9dad02af
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SignalServiceKit/src/Messages/OWSMessageSender.m
View File

@ -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: