From 39bab1782154122de35c5fdc2eabe28d9cc43d6c Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Wed, 26 Jun 2019 10:08:15 -0600
Subject: [PATCH] adapt to optional enum

---
 .../src/SMKUnidentifiedSenderMessageContent.swift      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/SignalMetadataKit/src/SMKUnidentifiedSenderMessageContent.swift b/SignalMetadataKit/src/SMKUnidentifiedSenderMessageContent.swift
index 63acf78..5e24461 100644
--- a/SignalMetadataKit/src/SMKUnidentifiedSenderMessageContent.swift
+++ b/SignalMetadataKit/src/SMKUnidentifiedSenderMessageContent.swift
@@ -32,10 +32,12 @@ import Foundation
         // TODO: Should we have a default case in our switches? Probably.
         var messageType: SMKMessageType
         switch (proto.type) {
-        case .prekeyMessage:
+        case .prekeyMessage?:
             messageType = .prekey
-        case .message:
+        case .message?:
             messageType = .whisper
+        case .none:
+            throw SMKProtoError.invalidProtobuf(description: "\(logTag) missing required field: proto.type")
         }
 
         let contentData = proto.content
@@ -54,9 +56,9 @@ import Foundation
             builderType = .prekeyMessage
         }
 
-        let builder = SMKProtoUnidentifiedSenderMessageMessage.builder(type: builderType,
-                                                                       senderCertificate: try senderCertificate.toProto(),
+        let builder = SMKProtoUnidentifiedSenderMessageMessage.builder(senderCertificate: try senderCertificate.toProto(),
                                                                        content: contentData)
+        builder.setType(builderType)
         return try builder.build()
     }