Merge branch 'dev' into closed-group-fix

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);