From c183aeca8e524a10aa4f0c53d1c19eb0340c4092 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Thu, 29 Nov 2018 14:30:16 -0500
Subject: [PATCH] Refine asserts around message sending.

---
 SignalServiceKit/src/Messages/OWSMessageSender.m | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m
index 7c5b6655bc..d0c0e37e35 100644
--- a/SignalServiceKit/src/Messages/OWSMessageSender.m
+++ b/SignalServiceKit/src/Messages/OWSMessageSender.m
@@ -1053,6 +1053,17 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
         }
     }
 
+    for (NSDictionary *deviceMessage in deviceMessages) {
+        NSNumber *_Nullable messageType = deviceMessage[@"type"];
+        OWSAssertDebug(messageType);
+        if (messageSend.isUDSend) {
+            OWSAssertDebug([messageType isEqualToNumber:@(TSUnidentifiedSenderMessageType)]);
+        } else {
+            OWSAssertDebug([messageType isEqualToNumber:@(TSEncryptedWhisperMessageType)] ||
+                [messageType isEqualToNumber:@(TSPreKeyWhisperMessageType)]);
+        }
+    }
+
     if (deviceMessages.count == 0) {
         // This might happen:
         //