Add support for image attachment width/height information

Author: Trolldemorted

libsignal-service-dotnet/SignalServiceMessageReceiver.cs

@@ -83,7 +83,7 @@ public Stream RetrieveProfileAvatar(string path, FileStream destination, byte[]
         /// <param name="tmpCipherDestination">The temporary destination for this attachment before decryption</param>
         /// <param name="maxSizeBytes">The maximum size for this attachment (not yet implemented)</param>
         /// <param name="listener">An optional listener (may be null) to receive callbacks on download progress.</param>
-        public Stream RetrieveAttachment(SignalServiceAttachmentPointer pointer, Stream tmpCipherDestination, int maxSizeBytes, ProgressListener listener)
+        public Stream RetrieveAttachment(SignalServiceAttachmentPointer pointer, Stream tmpCipherDestination, int maxSizeBytes, IProgressListener listener)
         {
             Socket.RetrieveAttachment(pointer.Relay, pointer.Id, tmpCipherDestination, maxSizeBytes);
             return AttachmentCipherInputStream.CreateFor(tmpCipherDestination, pointer.Size != null ? pointer.Size.Value : 0, pointer.Key, pointer.Digest);

libsignal-service-dotnet/SignalServiceMessageSender.cs

@@ -505,7 +505,7 @@ private GroupContext CreateGroupContent(SignalServiceGroup group)
                 if (group.Name != null) groupContext.Name = group.Name;
                 if (group.Members != null ) groupContext.Members.AddRange(group.Members);
 
-                if (group.Avatar != null && group.Avatar.isStream())
+                if (group.Avatar != null && group.Avatar.IsStream())
                 {
                     AttachmentPointer pointer = CreateAttachmentPointer(group.Avatar.AsStream());
                     groupContext.Avatar = pointer;
@@ -602,14 +602,14 @@ private IList<AttachmentPointer> CreateAttachmentPointers(List<SignalServiceAtta
 
             foreach (SignalServiceAttachment attachment in attachments)
             {
-                if (attachment.isStream())
+                if (attachment.IsStream())
                 {
                     Debug.WriteLine("Found attachment, creating pointer...", TAG);
                     pointers.Add(CreateAttachmentPointer(attachment.AsStream()));
                 }
-                else if (attachment.isPointer())
+                else if (attachment.IsPointer())
                 {
-                    pointers.Add(CreateAttachmentPointerFromPointer(attachment.asPointer()));
+                    pointers.Add(CreateAttachmentPointerFromPointer(attachment.AsPointer()));
                 }
             }
 
@@ -619,13 +619,13 @@ private IList<AttachmentPointer> CreateAttachmentPointers(List<SignalServiceAtta
         private AttachmentPointer CreateAttachmentPointer(SignalServiceAttachmentStream attachment)
         {
             byte[] attachmentKey = Util.getSecretBytes(64);
-            long paddedLength = PaddingInputStream.GetPaddedSize(attachment.getLength());
+            long paddedLength = PaddingInputStream.GetPaddedSize(attachment.Length);
             long ciphertextLength = AttachmentCipherInputStream.GetCiphertextLength(paddedLength);
             PushAttachmentData attachmentData = new PushAttachmentData(attachment.getContentType(),
-                                                                       new PaddingInputStream(attachment.getInputStream(), attachment.getLength()),
+                                                                       new PaddingInputStream(attachment.InputStream, attachment.Length),
                                                                        ciphertextLength,
                                                                        new AttachmentCipherOutputStreamFactory(attachmentKey),
-                                                                       attachment.getListener());
+                                                                       attachment.Listener);
 
             (ulong id, byte[] digest)  = socket.SendAttachment(attachmentData);
 
@@ -635,17 +635,27 @@ private AttachmentPointer CreateAttachmentPointer(SignalServiceAttachmentStream
                 Id = id,
                 Key = ByteString.CopyFrom(attachmentKey),
                 Digest = ByteString.CopyFrom(digest),
-                Size = (uint)attachment.getLength()
+                Size = (uint)attachment.Length
             };
 
             if (attachment.FileName != null)
             {
                 attachmentPointer.FileName = attachment.FileName;
             }
 
-            if (attachment.getPreview().HasValue)
+            if (attachment.Preview != null)
             {
-                attachmentPointer.Thumbnail = ByteString.CopyFrom(attachment.getPreview().ForceGetValue());
+                attachmentPointer.Thumbnail = ByteString.CopyFrom(attachment.Preview);
+            }
+
+            if (attachment.Width > 0)
+            {
+                attachmentPointer.Width = (uint) attachment.Width;
+            }
+
+            if (attachment.Height > 0)
+            {
+                attachmentPointer.Height = (uint)attachment.Height;
             }
 
             if (attachment.VoiceNote)

libsignal-service-dotnet/crypto/SignalServiceCipher.cs

@@ -151,6 +151,7 @@ private SignalServiceDataMessage CreateSignalServiceMessage(SignalServiceEnvelop
                                                                 envelope.getRelay(),
                                                                 pointer.SizeOneofCase == AttachmentPointer.SizeOneofOneofCase.Size ? pointer.Size : 0,
                                                                 pointer.ThumbnailOneofCase == AttachmentPointer.ThumbnailOneofOneofCase.Thumbnail ? pointer.Thumbnail.ToByteArray() : null,
+                                                                (int) pointer.Width, (int) pointer.Height,
                                                                 pointer.DigestOneofCase == AttachmentPointer.DigestOneofOneofCase.Digest ? pointer.Digest.ToByteArray() : null,
                                                                 pointer.FileNameOneofCase == AttachmentPointer.FileNameOneofOneofCase.FileName ? pointer.FileName : null,
                                                                 pointer.FlagsOneofCase == AttachmentPointer.FlagsOneofOneofCase.Flags && (pointer.Flags & (uint) AttachmentPointer.Types.Flags.VoiceMessage) != 0));
@@ -382,6 +383,7 @@ private SignalServiceGroup CreateGroupInfo(SignalServiceEnvelope envelope, DataM
                         envelope.getRelay(),
                         pointer.SizeOneofCase == AttachmentPointer.SizeOneofOneofCase.Size ? pointer.Size : 0,
                         null,
+                        0, 0,
                         pointer.DigestOneofCase == AttachmentPointer.DigestOneofOneofCase.Digest ? pointer.Digest.ToByteArray() : null,
                         null,
                         false);

libsignal-service-dotnet/messages/SignalServiceAttachment.cs

@@ -1,86 +1,67 @@
-/**
- * Copyright (C) 2017 smndtrl, golf1052
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 using System;
 using System.IO;
 
 namespace libsignalservice.messages
-{
-    public abstract class SignalServiceAttachment
+{
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+    public abstract class SignalServiceAttachment
     {
-        private readonly String contentType;
+        public String ContentType { get; }
 
         internal SignalServiceAttachment(String contentType)
         {
-            this.contentType = contentType;
+            this.ContentType = contentType;
         }
 
         public String getContentType()
         {
-            return contentType;
+            return ContentType;
         }
 
-        public abstract bool isStream();
+        public abstract bool IsStream();
 
-        public abstract bool isPointer();
+        public abstract bool IsPointer();
 
         public SignalServiceAttachmentStream AsStream()
         {
             return (SignalServiceAttachmentStream)this;
         }
 
-        public SignalServiceAttachmentPointer asPointer()
+        public SignalServiceAttachmentPointer AsPointer()
         {
             return (SignalServiceAttachmentPointer)this;
         }
 
-        public static Builder newStreamBuilder()
-        {
-            return new Builder();
-        }
-
         public class Builder
         {
-            private Stream inputStream;
-            private string contentType;
+            private Stream InputStream;
+            private string ContentType;
             private string FileName;
-            private long length;
-            private ProgressListener listener;
-            private bool voiceNote;
+            private long Length;
+            private IProgressListener Listener;
+            private bool VoiceNote;
+            private int Width;
+            private int Height;
 
-            internal Builder()
+            Builder()
             {
             }
 
-            public Builder withStream(Stream inputStream)
+            public Builder WithStream(Stream inputStream)
             {
-                this.inputStream = inputStream;
+                InputStream = inputStream;
                 return this;
             }
 
-            public Builder withContentType(string contentType)
+            public Builder WithContentType(string contentType)
             {
-                this.contentType = contentType;
+                ContentType = contentType;
                 return this;
             }
 
-            public Builder withLength(long length)
+            public Builder WithLength(long length)
             {
-                this.length = length;
+                Length = length;
                 return this;
             }
 
@@ -90,45 +71,58 @@ public Builder WithFileName(string fileName)
                 return this;
             }
 
-            public Builder withListener(ProgressListener listener)
+            public Builder WithListener(IProgressListener listener)
             {
-                this.listener = listener;
+                Listener = listener;
                 return this;
             }
 
-            public Builder withVoiceNote(bool voiceNote)
+            public Builder WithVoiceNote(bool voiceNote)
             {
-                this.voiceNote = voiceNote;
+                VoiceNote = voiceNote;
                 return this;
+            }
+
+            public Builder WithWidth(int width)
+            {
+                Width = width;
+                return this;
+            }
+
+            public Builder WithHeight(int height)
+            {
+                Height = height;
+                return this;
             }
 
-            public SignalServiceAttachmentStream build()
+            public SignalServiceAttachmentStream Build()
             {
-                if (inputStream == null)
+                if (InputStream == null)
                 {
                     throw new ArgumentException("Must specify stream!");
                 }
-                if (contentType == null)
+                if (ContentType == null)
                 {
                     throw new ArgumentException("No content type specified!");
                 }
-                if (length == 0)
+                if (Length == 0)
                 {
                     throw new ArgumentException("No length specified!");
                 }
 
-                return new SignalServiceAttachmentStream(inputStream, contentType, (uint)length, FileName, voiceNote, listener);
+                return new SignalServiceAttachmentStream(InputStream, ContentType, (uint)Length, FileName, VoiceNote, null, Width, Height, Listener);
             }
         }
 
-        public interface ProgressListener
+        public interface IProgressListener
         {
             /// <summary>
             /// Called on a progress change event.
             /// </summary>
             /// <param name="total">The total amount of transmit/receive in bytes.</param>
             /// <param name="progress">The amount that has been transmitted/received in bytes thus far</param>
-            void onAttachmentProgress(long total, long progress);
+            void OnAttachmentProgress(long total, long progress);
         }
-    }
+    }
+#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
 }

libsignal-service-dotnet/messages/SignalServiceAttachmentPointer.cs

@@ -1,47 +1,50 @@
 using System.IO;
 
-namespace libsignalservice.messages
-{
-    /// <summary>
-    /// Represents a received SignalServiceAttachment "handle."  This
-    /// is a pointer to the actual attachment content, which needs to be
-    /// retrieved using <see cref="SignalServiceMessageReceiver.RetrieveAttachment(SignalServiceAttachmentPointer, Stream, int, ProgressListener)"/>
+namespace libsignalservice.messages
+{
+    /// <summary>
+    /// Represents a received SignalServiceAttachment "handle."  This
+    /// is a pointer to the actual attachment content, which needs to be
+    /// retrieved using <see cref="SignalServiceMessageReceiver.RetrieveAttachment(SignalServiceAttachmentPointer, Stream, int, IProgressListener)"/>
     /// </summary>
-#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
-    public class SignalServiceAttachmentPointer : SignalServiceAttachment
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+    public class SignalServiceAttachmentPointer : SignalServiceAttachment
     {
-
         public ulong Id { get; }
-        public byte[] Key { get; }
-        public string Relay { get; }
-        public uint? Size { get; }
-        public byte[] Preview { get; }
-        public byte[] Digest { get; }
-        public string FileName { get; }
-        public bool VoiceNote { get; }
-
-        public SignalServiceAttachmentPointer(ulong id, string contentType, byte[] key, string relay, uint? size, byte[] preview, byte[] digest, string fileName, bool voiceNote)
-            : base(contentType)
-        {
-            Id = id;
-            Key = key;
-            Relay = relay;
-            Size = size;
-            Preview = preview;
-            Digest = digest;
-            FileName = fileName;
-            VoiceNote = voiceNote;
-        }
-
-        public override bool isStream()
-        {
-            return false;
-        }
-
-        public override bool isPointer()
-        {
-            return true;
-        }
+        public byte[] Key { get; }
+        public string Relay { get; }
+        public uint? Size { get; }
+        public byte[] Preview { get; }
+        public byte[] Digest { get; }
+        public string FileName { get; }
+        public bool VoiceNote { get; }
+        public int Width { get; }
+        public int Height { get; }
+
+        public SignalServiceAttachmentPointer(ulong id, string contentType, byte[] key, string relay, uint? size, byte[] preview, int width, int height, byte[] digest, string fileName, bool voiceNote)
+            : base(contentType)
+        {
+            Id = id;
+            Key = key;
+            Relay = relay;
+            Size = size;
+            Preview = preview;
+            Digest = digest;
+            FileName = fileName;
+            VoiceNote = voiceNote;
+            Width = width;
+            Height = height;
+        }
+
+        public override bool IsStream()
+        {
+            return false;
+        }
+
+        public override bool IsPointer()
+        {
+            return true;
+        }
     }
-#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
-}
+#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
+}