Merge branch 'dev' into closed-group-fix
This commit is contained in:
commit
e286871791
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue