Merge branch 'dev' of github.com:loki-project/session-ios into shared-sender-keys

pull/218/head
nielsandriesse 5 years ago
commit a92e50b49b

@ -114,11 +114,11 @@ public final class MultiDeviceProtocol : NSObject {
/// See [Multi Device Message Sending](https://github.com/loki-project/session-protocol-docs/wiki/Multi-Device-Message-Sending) for more information. /// See [Multi Device Message Sending](https://github.com/loki-project/session-protocol-docs/wiki/Multi-Device-Message-Sending) for more information.
@objc(sendMessageToDestinationAndLinkedDevices:transaction:) @objc(sendMessageToDestinationAndLinkedDevices:transaction:)
public static func sendMessageToDestinationAndLinkedDevices(_ messageSend: OWSMessageSend, in transaction: YapDatabaseReadTransaction) { public static func sendMessageToDestinationAndLinkedDevices(_ messageSend: OWSMessageSend, in transaction: YapDatabaseReadTransaction) {
if !messageSend.isUDSend && messageSend.recipient.recipientId() != getUserHexEncodedPublicKey() { // if !messageSend.isUDSend && messageSend.recipient.recipientId() != getUserHexEncodedPublicKey() {
#if DEBUG // #if DEBUG
preconditionFailure() // preconditionFailure()
#endif // #endif
} // }
let message = messageSend.message let message = messageSend.message
let messageSender = SSKEnvironment.shared.messageSender let messageSender = SSKEnvironment.shared.messageSender
if !isMultiDeviceRequired(for: message, to: messageSend.recipient.recipientId()) { if !isMultiDeviceRequired(for: message, to: messageSend.recipient.recipientId()) {

Loading…
Cancel
Save