Implement DeviceContactsInputStream

Author: Trolldemorted

libsignal-service-dotnet/messages/multidevice/DeviceContact.cs

@@ -10,9 +10,9 @@ public class DeviceContact
         public VerifiedMessage Verified { get; }
         public byte[] ProfileKey { get; }
         public bool Blocked { get; }
-        public int? ExpirationTimer { get; }
+        public uint? ExpirationTimer { get; }
 
-        public DeviceContact(string number, string name, SignalServiceAttachmentStream avatar, string color, VerifiedMessage verified, byte[] profileKey, bool blocked, int? expirationTimer)
+        public DeviceContact(string number, string name, SignalServiceAttachmentStream avatar, string color, VerifiedMessage verified, byte[] profileKey, bool blocked, uint? expirationTimer)
         {
             Number = number;
             Name = name;

libsignal-service-dotnet/messages/multidevice/DeviceContactsInputStream.cs

@@ -1,38 +1,80 @@
+using libsignal;
+using libsignalservice.push;
+using libsignalservice.util;
 using System;
 using System.IO;
+using static libsignalservice.messages.multidevice.VerifiedMessage;
 
 namespace libsignalservice.messages.multidevice
 {
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
     public class DeviceContactsInputStream : ChunkedInputStream
     {
-        public DeviceContactsInputStream(Stream input)
-        : base(input)
-        {
-        }
+        public DeviceContactsInputStream(Stream input) : base(input) { }
 
-        public DeviceContact read()// throws IOException
+        public DeviceContact Read()// throws IOException
         {
-            /*long detailsLength = readRawVarint32();
+            int detailsLength = ReadRawVarint32();
+            if (detailsLength == -1)
+            {
+                return null;
+            }
             byte[] detailsSerialized = new byte[(int)detailsLength];
-            Util.readFully(input, detailsSerialized);
+            Util.ReadFully(InputStream, detailsSerialized);
 
-            SignalServiceProtos.ContactDetails details = SignalServiceProtos.ContactDetails.ParseFrom(detailsSerialized);
-            String number = details.Number;
-            May<String> name = details.Name == null ? May<string>.NoValue : new May<string>(details.Name);
-            May<TextSecureAttachmentStream> avatar = May<TextSecureAttachmentStream>.NoValue;
+            var details = ContactDetails.Parser.ParseFrom(detailsSerialized);
+            string number = details.Number;
+            string name = details.Name;
+            SignalServiceAttachmentStream avatar = null;
+            string color = details.ColorOneofCase == ContactDetails.ColorOneofOneofCase.Color ? details.Color : null;
+            VerifiedMessage verified = null;
+            byte[] profileKey = null;
+            bool blocked = false;
+            uint? expireTimer = null;
 
-            if (details.HasAvatar)
+            if (details.AvatarOneofCase == ContactDetails.AvatarOneofOneofCase.Avatar)
             {
                 long avatarLength = details.Avatar.Length;
-                IInputStream avatarStream = new LimitedInputStream(input, avatarLength);
+                Stream avatarStream = new LimitedInputStream(InputStream, avatarLength);
                 String avatarContentType = details.Avatar.ContentType;
+                avatar = new SignalServiceAttachmentStream(avatarStream, avatarContentType, avatarLength, null, false, null);
+            }
+
+            if (details.VerifiedOneofCase == ContactDetails.VerifiedOneofOneofCase.Verified)
+            {
+                string destination = details.Verified.Destination;
+                IdentityKey identityKey = new IdentityKey(details.Verified.IdentityKey.ToByteArray(), 0);
 
-                avatar = new May<TextSecureAttachmentStream>(new TextSecureAttachmentStream(avatarStream, avatarContentType, avatarLength));
+                VerifiedState state;
+                switch (details.Verified.State)
+                {
+                    case Verified.Types.State.Verified:
+                        state = VerifiedState.Verified;
+                        break;
+                    case Verified.Types.State.Unverified:
+                        state = VerifiedState.Unverified;
+                        break;
+                    case Verified.Types.State.Default:
+                        state = VerifiedState.Default;
+                        break;
+                    default:
+                        throw new InvalidMessageException("Unknown state: " + details.Verified.State);
+                }
+
+                verified = new VerifiedMessage(destination, identityKey, state, Util.CurrentTimeMillis());
+            }
+
+            if (details.ProfileKeyOneofCase == ContactDetails.ProfileKeyOneofOneofCase.ProfileKey)
+            {
+                profileKey = details.ProfileKey.ToByteArray();
+            }
+
+            if (details.ExpireTimerOneofCase == ContactDetails.ExpireTimerOneofOneofCase.ExpireTimer && details.ExpireTimer > 0)
+            {
+                expireTimer = details.ExpireTimer;
             }
 
-            return new DeviceContact(number, name, avatar);*/
-            throw new NotImplementedException();
+            return new DeviceContact(number, name, avatar, color, verified, profileKey, blocked, expireTimer);
         }
     }
 #pragma warning restore CS1591 // Missing XML comment for publicly visible type or member