C#-flavor all the things, remove ~400 warnings

Author: Trolldemorted

libsignal-service-dotnet/AsyncHelper.cs

@@ -1,39 +1,17 @@
-/**
- * Copyright (C) 2015 smndtrl
- *
- * 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.Text;
 
 namespace libsignalservice.util
-{
-    public class Base64
+{
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+    public class Base64
     {
-        /*public static byte[] encodeBytes(byte[] input)
-        {
-            char[] chars = System.Text.Encoding.UTF8.GetString(input, 0, input.Length).ToCharArray();
-            return Convert.ToBase64String(input);
-        }*/
-
         public static string EncodeBytes(byte[] input)
         {
             return Convert.ToBase64String(input);
         }
 
-        public static string encodeBytesWithoutPadding(byte[] input)
+        public static string EncodeBytesWithoutPadding(byte[] input)
         {
             String encoded = null;
 
@@ -44,32 +22,27 @@ public static string encodeBytesWithoutPadding(byte[] input)
             else return encoded;
         }
 
-        /*public static byte[] encodeWithoutPadding(byte[] input)
-        {
-            char[] chars = System.Text.Encoding.UTF8.GetString(input, 0, input.Length).ToCharArray();
-            return Convert.ToBase64CharArray(chars, 0, chars.Length);
-        }*/
-
-        public static byte[] encode(byte[] input)
+        public static byte[] Encode(byte[] input)
         {
             char[] chars = System.Text.Encoding.UTF8.GetString(input, 0, input.Length).ToCharArray();
             return Encoding.UTF8.GetBytes(Convert.ToBase64String(input));
         }
 
-        public static byte[] decode(string input)
+        public static byte[] Decode(string input)
         {
             return Convert.FromBase64String(input);
         }
 
-        public static byte[] decodeWithoutPadding(string input)
+        public static byte[] DecodeWithoutPadding(string input)
         {
             int padding = input.Length % 4;
 
             if (padding == 1) input = input + "=";
             else if (padding == 2) input = input + "==";
             else if (padding == 3) input = input + "=";
 
-            return decode(input);
+            return Decode(input);
         }
-    }
+    }
+#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
 }

libsignal-service-dotnet/Base64.cs

@@ -4,10 +4,12 @@
 using System.Text;
 
 namespace libsignalservice
-{
+{
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
     public class LibsignalLogging
     {
         public static ILoggerFactory LoggerFactory { get; } = new LoggerFactory();
         public static ILogger CreateLogger<T>() => LoggerFactory.CreateLogger<T>();
-    }
+    }
+#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
 }

libsignal-service-dotnet/LibsignalLogging.cs

@@ -62,6 +62,10 @@ public SignalServiceAccountManager(SignalServiceConfiguration configuration, Can
             PushServiceSocket = new PushServiceSocket(configuration, new StaticCredentialsProvider(null, null, null, (int)SignalServiceAddress.DEFAULT_DEVICE_ID), userAgent);
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="pin"></param>
         public void SetPin(string pin)
         {
             if (pin != null)
@@ -118,6 +122,7 @@ public void RequestVoiceVerificationCode()// throws IOException
         /// same install, but probabilistically differ across registrations
         /// for separate installs.</param>
         /// <param name="fetchesMessages">True if the client does not support GCM</param>
+        /// <param name="pin"></param>
         /// <returns></returns>
         public void VerifyAccountWithCode(string verificationCode, string signalingKey,
                                    uint signalProtocolRegistrationId, bool fetchesMessages, string pin)
@@ -135,6 +140,7 @@ public void VerifyAccountWithCode(string verificationCode, string signalingKey,
         /// install, but probabilistically differ across registrations for
         /// separate installs.</param>
         /// <param name="fetchesMessages">True if the client does not support GCM</param>
+        /// <param name="pin"></param>
         /// <returns></returns>
         public void SetAccountAttributes(string signalingKey, uint signalProtocolRegistrationId, bool fetchesMessages, string pin)
         {
@@ -355,7 +361,7 @@ public TurnServerInfo GetTurnServerInfo()
         public void SetProfileName(byte[] key, string name)
         {
             if (name == null) name = "";
-            string ciphertextName = Base64.encodeBytesWithoutPadding(new ProfileCipher(key).EncryptName(Encoding.Unicode.GetBytes(name), ProfileCipher.NAME_PADDED_LENGTH));
+            string ciphertextName = Base64.EncodeBytesWithoutPadding(new ProfileCipher(key).EncryptName(Encoding.Unicode.GetBytes(name), ProfileCipher.NAME_PADDED_LENGTH));
             PushServiceSocket.SetProfileName(ciphertextName);
         }
 
@@ -395,8 +401,8 @@ private string CreateDirectoryServerToken(string e164number, bool urlSafe)
         {
             try
             {
-                byte[] token = Util.trim(Hash.sha1(Encoding.UTF8.GetBytes(e164number)), 10);
-                string encoded = Base64.encodeBytesWithoutPadding(token);
+                byte[] token = Util.Trim(Hash.Sha1(Encoding.UTF8.GetBytes(e164number)), 10);
+                string encoded = Base64.EncodeBytesWithoutPadding(token);
 
                 if (urlSafe) return encoded.Replace('+', '-').Replace('/', '_');
                 else return encoded;

libsignal-service-dotnet/SignalServiceAccountManager.cs

@@ -46,7 +46,7 @@ public void ReadBlocking(IMessagePipeCallback callback)
 
             if (IsSignalServiceEnvelope(request))
             {
-                SignalServiceMessagePipeMessage message = new SignalServiceEnvelope(request.Body.ToByteArray(), CredentialsProvider.GetSignalingKey());
+                SignalServiceMessagePipeMessage message = new SignalServiceEnvelope(request.Body.ToByteArray(), CredentialsProvider.SignalingKey);
                 WebSocketResponseMessage response = CreateWebSocketResponse(request);
                 try
                 {
@@ -83,10 +83,10 @@ public SendMessageResponse Send(OutgoingPushMessageList list)
             Logger.LogTrace("Send()");
             WebSocketRequestMessage requestmessage = new WebSocketRequestMessage()
             {
-                Id = BitConverter.ToUInt64(Util.getSecretBytes(sizeof(long)), 0),
+                Id = BitConverter.ToUInt64(Util.GetSecretBytes(sizeof(long)), 0),
                 Verb = "PUT",
-                Path = $"/v1/messages/{list.getDestination()}",
-                Body = ByteString.CopyFrom(Encoding.UTF8.GetBytes(JsonUtil.toJson(list)))
+                Path = $"/v1/messages/{list.Destination}",
+                Body = ByteString.CopyFrom(Encoding.UTF8.GetBytes(JsonUtil.ToJson(list)))
             };
             requestmessage.Headers.Add("content-type:application/json");
             Logger.LogDebug("Sending message {0}", requestmessage.Id);
@@ -119,7 +119,7 @@ public SignalServiceProfile GetProfile(SignalServiceAddress address)
             Logger.LogTrace("GetProfile()");
             WebSocketRequestMessage requestMessage = new WebSocketRequestMessage()
             {
-                Id = BitConverter.ToUInt64(Util.getSecretBytes(sizeof(long)), 0),
+                Id = BitConverter.ToUInt64(Util.GetSecretBytes(sizeof(long)), 0),
                 Verb = "GET",
                 Path = $"/v1/profile/{address.E164number}"
             };

libsignal-service-dotnet/SignalServiceMessagePipe.cs

@@ -14,9 +14,11 @@
 using System.Security.Cryptography;
 using System.Threading;
 using static libsignalservice.messages.SignalServiceAttachment;
+using static libsignalservice.SignalServiceMessagePipe;
 
 namespace libsignalservice
 {
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
     /// <summary>
     /// The primary interface for receiving Signal Service messages.
     /// </summary>
@@ -111,29 +113,25 @@ public SignalServiceMessagePipe CreateMessagePipe()
             return new SignalServiceMessagePipe(Token, webSocket, CredentialsProvider);
         }
 
-        public List<SignalServiceEnvelope> RetrieveMessages(MessageReceivedCallback callback)
+        public List<SignalServiceEnvelope> RetrieveMessages(IMessagePipeCallback callback)
         {
             List<SignalServiceEnvelope> results = new List<SignalServiceEnvelope>();
             List<SignalServiceEnvelopeEntity> entities = Socket.GetMessages();
 
             foreach (SignalServiceEnvelopeEntity entity in entities)
             {
-                SignalServiceEnvelope envelope = new SignalServiceEnvelope((int)entity.getType(), entity.getSource(),
-                                                                      (int)entity.getSourceDevice(), entity.getRelay(),
-                                                                      (int)entity.getTimestamp(), entity.getMessage(),
-                                                                      entity.getContent());
+                SignalServiceEnvelope envelope = new SignalServiceEnvelope((int)entity.Type, entity.Source,
+                                                                      (int)entity.SourceDevice, entity.Relay,
+                                                                      (int)entity.Timestamp, entity.Message,
+                                                                      entity.Content);
 
-                callback.onMessage(envelope);
+                callback.OnMessage(envelope);
                 results.Add(envelope);
 
-                Socket.AcknowledgeMessage(entity.getSource(), entity.getTimestamp());
+                Socket.AcknowledgeMessage(entity.Source, entity.Timestamp);
             }
             return results;
         }
-
-        public interface MessageReceivedCallback
-        {
-            void onMessage(SignalServiceEnvelope envelope);
-        }
     }
+#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
 }

libsignal-service-dotnet/SignalServiceMessageReceiver.cs

@@ -213,7 +213,7 @@ private void SendMessage(VerifiedMessage message)
         {
             byte[] nullMessageBody = new DataMessage()
             {
-                Body = Base64.EncodeBytes(Util.getRandomLengthBytes(140))
+                Body = Base64.EncodeBytes(Util.GetRandomLengthBytes(140))
             }.ToByteArray();
 
             NullMessage nullMessage = new NullMessage()
@@ -446,8 +446,8 @@ private byte[] CreateMultiDeviceReadContent(List<ReadMessage> readMessages)
             {
                 syncMessage.Read.Add(new SyncMessage.Types.Read
                 {
-                    Timestamp = (ulong)readMessage.getTimestamp(),
-                    Sender = readMessage.getSender()
+                    Timestamp = (ulong)readMessage.Timestamp,
+                    Sender = readMessage.Sender
                 });
             }
             content.SyncMessage = syncMessage;
@@ -460,7 +460,7 @@ private byte[] CreateMultiDeviceBlockedContent(BlockedListMessage blocked)
             SyncMessage syncMessage = new SyncMessage { };
             Blocked blockedMessage = new Blocked { };
 
-            blockedMessage.Numbers.AddRange(blocked.getNumbers());
+            blockedMessage.Numbers.AddRange(blocked.Numbers);
             syncMessage.Blocked = blockedMessage;
             content.SyncMessage = syncMessage;
             return content.ToByteArray();
@@ -516,7 +516,7 @@ private byte[] CreateMultiDeviceVerifiedContent(VerifiedMessage verifiedMessage,
         private SyncMessage CreateSyncMessage()
         {
             SyncMessage syncMessage = new SyncMessage { };
-            syncMessage.Padding = ByteString.CopyFrom(Util.getRandomLengthBytes(512));
+            syncMessage.Padding = ByteString.CopyFrom(Util.GetRandomLengthBytes(512));
             return syncMessage;
         }
 
@@ -603,17 +603,11 @@ private SendMessageResponse SendMessage(SignalServiceAddress recipient, long tim
                 }
                 catch (MismatchedDevicesException mde)
                 {
-                    Debug.WriteLine("MismatchedDevicesException");
-                    Debug.WriteLine(mde.Message);
-                    Debug.WriteLine(mde.StackTrace);
                     HandleMismatchedDevices(socket, recipient, mde.MismatchedDevices);
                 }
                 catch (StaleDevicesException ste)
                 {
-                    Debug.WriteLine("MismatchedDevicesException");
-                    Debug.WriteLine(ste.Message);
-                    Debug.WriteLine(ste.StackTrace);
-                    HandleStaleDevices(recipient, ste.getStaleDevices());
+                    HandleStaleDevices(recipient, ste.StaleDevices);
                 }
             }
             Debug.WriteLine("Failed to resolve conflicts after 3 attempts!");
@@ -648,7 +642,7 @@ private IList<AttachmentPointer> CreateAttachmentPointers(List<SignalServiceAtta
 
         private AttachmentPointer CreateAttachmentPointer(SignalServiceAttachmentStream attachment)
         {
-            byte[] attachmentKey = Util.getSecretBytes(64);
+            byte[] attachmentKey = Util.GetSecretBytes(64);
             long paddedLength = PaddingInputStream.GetPaddedSize(attachment.Length);
             long ciphertextLength = AttachmentCipherInputStream.GetCiphertextLength(paddedLength);
             PushAttachmentData attachmentData = new PushAttachmentData(attachment.getContentType(),
@@ -749,14 +743,14 @@ private OutgoingPushMessageList GetEncryptedMessages(PushServiceSocket socket,
             List<OutgoingPushMessage> messages = new List<OutgoingPushMessage>();
 
             bool myself = recipient.Equals(localAddress);
-            if (!myself || CredentialsProvider.GetDeviceId() != SignalServiceAddress.DEFAULT_DEVICE_ID)
+            if (!myself || CredentialsProvider.DeviceId != SignalServiceAddress.DEFAULT_DEVICE_ID)
             {
                 messages.Add(GetEncryptedMessage(socket, recipient, SignalServiceAddress.DEFAULT_DEVICE_ID, plaintext, silent));
             }
 
             foreach (uint deviceId in store.GetSubDeviceSessions(recipient.E164number))
             {
-                if (!myself || deviceId != CredentialsProvider.GetDeviceId())
+                if (!myself || deviceId != CredentialsProvider.DeviceId)
                 {
                     if (store.ContainsSession(new SignalProtocolAddress(recipient.E164number, deviceId)))
                     {
@@ -781,7 +775,7 @@ private OutgoingPushMessage GetEncryptedMessage(PushServiceSocket socket, Signal
 
                     foreach (PreKeyBundle preKey in preKeys)
                     {
-                        if (CredentialsProvider.GetUser().Equals(recipient.E164number) && CredentialsProvider.GetDeviceId() == preKey.getDeviceId())
+                        if (CredentialsProvider.User.Equals(recipient.E164number) && CredentialsProvider.DeviceId == preKey.getDeviceId())
                         {
                             continue;
                         }

libsignal-service-dotnet/SignalServiceMessageSender.cs

@@ -4,10 +4,12 @@
 
 namespace libsignalservice.configuration
 {
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
     public class SignalCdnUrl : SignalUrl
     {
         public SignalCdnUrl(string url) : base(url) { }
 
         public SignalCdnUrl(string url, string hostHeader) : base(url, hostHeader) { }
     }
+#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
 }