Merge branch 'dev' into closed-group-fix

5 years ago · e286871791
parent cbeb454860 d7ce594866
commit e286871791
1 changed files with 7 additions and 7 deletions
--- a/SignalServiceKit/src/Messages/OWSMessageSender.m
+++ b/SignalServiceKit/src/Messages/OWSMessageSender.m
@ -987,7 +987,6 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
        deviceMessages = @{};
    } else {
        deviceMessages = [self deviceMessagesForMessageSend:messageSend error:&deviceMessagesError];
-    }
        
        // Loki: Remove this when we have shared sender keys
        // ========
@ -995,6 +994,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
            return messageSend.success();
        }
        // ========
+    }

    if (deviceMessagesError || !deviceMessages) {
        OWSAssertDebug(deviceMessagesError);