Make QuotedAttachment an explicit data type

Author: Trolldemorted

libsignal-service-dotnet/SignalServiceMessageSender.cs

@@ -16,6 +16,8 @@
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
+using static libsignalservice.messages.SignalServiceDataMessage;
+using static libsignalservice.push.DataMessage.Types.Quote.Types;
 using static libsignalservice.push.SyncMessage.Types;
 
 namespace libsignalservice
@@ -300,25 +302,22 @@ private byte[] CreateMessageContent(SignalServiceDataMessage message)// throws I
                     Author = message.Quote.Author.E164number,
                     Text = message.Quote.Text
                 };
-                foreach (SignalServiceAttachment attachment in message.Quote.Attachments)
+                foreach (SignalServiceQuotedAttachment attachment in message.Quote.Attachments)
                 {
-                    if (attachment.IsPointer())
+                    QuotedAttachment protoAttachment = new QuotedAttachment()
                     {
-                        var pointer = attachment.AsPointer();
-                        var protoPointer = new AttachmentPointer()
-                        {
-                            ContentType = pointer.ContentType
-                        };
-                        if (pointer.FileName != null)
-                        {
-                            protoPointer.FileName = pointer.FileName;
-                        }
-                        quote.Attachments.Add(protoPointer);
+                        ContentType = attachment.ContentType
+                    };
+                    if (attachment.FileName != null)
+                    {
+                        protoAttachment.FileName = attachment.FileName;
                     }
-                    else
+
+                    if (attachment.Thumbnail != null)
                     {
-                        quote.Attachments.Add(CreateAttachmentPointer(attachment.AsStream()));
+                        protoAttachment.Thumbnail = CreateAttachmentPointer(attachment.Thumbnail.AsStream());
                     }
+                    quote.Attachments.Add(protoAttachment);
                 }
                 dataMessage.Quote = quote;
             }

libsignal-service-dotnet/crypto/SignalServiceCipher.cs

@@ -10,6 +10,7 @@
 
 using System;
 using System.Collections.Generic;
+using static libsignalservice.messages.SignalServiceDataMessage;
 using static libsignalservice.push.DataMessage;
 
 namespace libsignalservice.crypto
@@ -341,11 +342,13 @@ private SignalServiceDataMessage.SignalServiceQuote CreateQuote(SignalServiceEnv
             if (content.QuoteOneofCase != QuoteOneofOneofCase.Quote)
                 return null;
 
-            List<SignalServiceAttachment> attachments = new List<SignalServiceAttachment>();
+            List<SignalServiceQuotedAttachment> attachments = new List<SignalServiceQuotedAttachment>();
 
-            foreach (AttachmentPointer pointer in content.Quote.Attachments)
+            foreach (var pointer in content.Quote.Attachments)
             {
-                attachments.Add(CreateAttachmentPointer(envelope, pointer));
+                attachments.Add(new SignalServiceQuotedAttachment(pointer.ContentType,
+                    pointer.FileName,
+                    pointer.ThumbnailOneofCase == Types.Quote.Types.QuotedAttachment.ThumbnailOneofOneofCase.Thumbnail ? CreateAttachmentPointer(envelope, pointer.Thumbnail) : null));
             }
 
             return new SignalServiceDataMessage.SignalServiceQuote((long) content.Quote.Id,

libsignal-service-dotnet/messages/SignalServiceDataMessage.cs

@@ -35,16 +35,30 @@ public class SignalServiceQuote
             public long Id { get; }
             public SignalServiceAddress Author { get; }
             public string Text { get; }
-            public List<SignalServiceAttachment> Attachments { get; }
+            public List<SignalServiceQuotedAttachment> Attachments { get; }
 
-            public SignalServiceQuote(long id, SignalServiceAddress author, string text, List<SignalServiceAttachment> attachments)
+            public SignalServiceQuote(long id, SignalServiceAddress author, string text, List<SignalServiceQuotedAttachment> attachments)
             {
                 Id = id;
                 Author = author;
                 Text = text;
                 Attachments = attachments;
             }
         }
+
+        public class SignalServiceQuotedAttachment
+        {
+            public string ContentType { get; }
+            public string FileName { get; }
+            public SignalServiceAttachment Thumbnail { get; }
+
+            public SignalServiceQuotedAttachment(string contentType, string filename, SignalServiceAttachment thumbnail)
+            {
+                ContentType = contentType;
+                FileName = filename;
+                Thumbnail = thumbnail;
+            }
+        }
     }
 #pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
 }

libsignal-service-dotnet/protobuf/SignalService.proto

@@ -73,10 +73,15 @@ message DataMessage {
   }
 
   message Quote {
+    message QuotedAttachment {
+	  oneof contentType_oneof { string contentType = 1; }
+	  oneof fileName_oneof { string fileName = 2;}
+	  oneof thumbnail_oneof { AttachmentPointer thumbnail = 3; }
+	}
     oneof id_oneof { uint64 id = 1; }
 	oneof author_oneof { string author = 2; }
 	oneof text_oneof { string text = 3; }
-	repeated AttachmentPointer attachments = 4;
+	repeated QuotedAttachment attachments = 4;
   }
 
   oneof body_oneof						{ string             body        = 1; }