Merge branch 'dev' into closed-group-fix

This commit is contained in:
nielsandriesse 2020-05-08 10:58:57 +10:00
commit e286871791
1 changed files with 7 additions and 7 deletions

View File

@ -987,15 +987,15 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
deviceMessages = @{};
} else {
deviceMessages = [self deviceMessagesForMessageSend:messageSend error:&deviceMessagesError];
// Loki: Remove this when we have shared sender keys
// ========
if (deviceMessages.count == 0) {
return messageSend.success();
}
// ========
}
// Loki: Remove this when we have shared sender keys
// ========
if (deviceMessages.count == 0) {
return messageSend.success();
}
// ========
if (deviceMessagesError || !deviceMessages) {
OWSAssertDebug(deviceMessagesError);
return messageSend.failure(deviceMessagesError);