Ignore messages with unknown Envelope.Contents

// FREEBIE

src/Messages/TSMessagesManager.m

@@ -183,20 +183,7 @@ NS_ASSUME_NONNULL_BEGIN
             return;
         }
 
-        if (messageEnvelope.hasContent) {
+        [self handleEnvelope:messageEnvelope plaintextData:plaintextData];
-            OWSSignalServiceProtosContent *content = [OWSSignalServiceProtosContent parseFromData:plaintextData];
-            if (content.hasSyncMessage) {
-                [self handleIncomingEnvelope:messageEnvelope withSyncMessage:content.syncMessage];
-            } else if (content.dataMessage) {
-                [self handleIncomingEnvelope:messageEnvelope withDataMessage:content.dataMessage];
-            }
-        } else if (messageEnvelope.hasLegacyMessage) { // DEPRECATED - Remove after all clients have been upgraded.
-            OWSSignalServiceProtosDataMessage *dataMessage =
-                [OWSSignalServiceProtosDataMessage parseFromData:plaintextData];
-            [self handleIncomingEnvelope:messageEnvelope withDataMessage:dataMessage];
-        } else {
-            DDLogWarn(@"Ignoring content that has no dataMessage or syncMessage.");
-        }
     }
 }
 
@@ -230,20 +217,27 @@ NS_ASSUME_NONNULL_BEGIN
             return;
         }
 
-        if (preKeyEnvelope.hasContent) {
+        [self handleEnvelope:preKeyEnvelope plaintextData:plaintextData];
-            OWSSignalServiceProtosContent *content = [OWSSignalServiceProtosContent parseFromData:plaintextData];
+    }
-            if (content.hasSyncMessage) {
+}
-                [self handleIncomingEnvelope:preKeyEnvelope withSyncMessage:content.syncMessage];
+
-            } else if (content.dataMessage) {
+- (void)handleEnvelope:(OWSSignalServiceProtosEnvelope *)envelope plaintextData:(NSData *)plaintextData
-                [self handleIncomingEnvelope:preKeyEnvelope withDataMessage:content.dataMessage];
+{
-            }
+    if (envelope.hasContent) {
-        } else if (preKeyEnvelope.hasLegacyMessage) { // DEPRECATED - Remove after all clients have been upgraded.
+        OWSSignalServiceProtosContent *content = [OWSSignalServiceProtosContent parseFromData:plaintextData];
-            OWSSignalServiceProtosDataMessage *dataMessage =
+        if (content.hasSyncMessage) {
-                [OWSSignalServiceProtosDataMessage parseFromData:plaintextData];
+            [self handleIncomingEnvelope:envelope withSyncMessage:content.syncMessage];
-            [self handleIncomingEnvelope:preKeyEnvelope withDataMessage:dataMessage];
+        } else if (content.hasDataMessage) {
+            [self handleIncomingEnvelope:envelope withDataMessage:content.dataMessage];
         } else {
-            DDLogWarn(@"Ignoring content that has no dataMessage or syncMessage.");
+            DDLogWarn(@"%@ Ignoring envelope.Content with no known payload", self.tag);
         }
+    } else if (envelope.hasLegacyMessage) { // DEPRECATED - Remove after all clients have been upgraded.
+        OWSSignalServiceProtosDataMessage *dataMessage =
+            [OWSSignalServiceProtosDataMessage parseFromData:plaintextData];
+        [self handleIncomingEnvelope:envelope withDataMessage:dataMessage];
+    } else {
+        DDLogWarn(@"%@ Ignoring envelope with neither DataMessage nor Content.", self.tag);
     }
 }