Implement new CDS changes.

Reflects the libsignal-service-java portion of signalapp/Signal-Android@2791790

- Includes new files that are needed for the change.
- Includes random fixes that I ran into

Author: golf1052

libsignal-service-dotnet-tests/ChunkedInputStreamTest.cs renamed to libsignal-service-dotnet-tests/ChunkedInputStreamTests.cs

@@ -1,65 +1,62 @@
-using libsignalservice.messages.multidevice;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-
-namespace libsignal_service_dotnet_tests
-{
-    [TestClass]
-    public class ChunkedInputStreamTest
-    {
-        [TestMethod]
-        public void TestReadRawVarint32()
-        {
-            MemoryStream ms = new MemoryStream();
-            byte[] input;
-            int i;
-
-            input = new byte[] { 216, 1, 0, 0, 0, 0, 0,};
-            ms.Write(input, 0, input.Length);
-            ms.Position = 0;
-            
-            i = new ChunkedInputStream(ms).ReadRawVarint32();
-            ms.Position = 0;
-            Assert.AreEqual(216, i);
-
-
-            input = new byte[] { 172, 2, 0xff, 0xff, 0, 0, 0, };
-            ms.Write(input, 0, input.Length);
-            ms.Position = 0;
-
-            i = new ChunkedInputStream(ms).ReadRawVarint32();
-            ms.Position = 0;
-            Assert.AreEqual(300, i);
-
-
-            input = new byte[] { 5, 0xff, 0xff, 0xff, 0, 0, 0, };
-            ms.Write(input, 0, input.Length);
-            ms.Position = 0;
-
-            i = new ChunkedInputStream(ms).ReadRawVarint32();
-            ms.Position = 0;
-            Assert.AreEqual(5, i);
-
-
-            input = new byte[] { 199, 232, 67, 0xff, 0, 0, 0, };
-            ms.Write(input, 0, input.Length);
-            ms.Position = 0;
-
-            i = new ChunkedInputStream(ms).ReadRawVarint32();
-            ms.Position = 0;
-            Assert.AreEqual(1111111, i);
-
-
-            input = new byte[] { 128, 1, 0xff, 0xff, 0, 0, 0, };
-            ms.Write(input, 0, input.Length);
-            ms.Position = 0;
-
-            i = new ChunkedInputStream(ms).ReadRawVarint32();
-            ms.Position = 0;
-            Assert.AreEqual(128, i);
-        }
-    }
-}
+using System.IO;
+using libsignalservice.messages.multidevice;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace libsignal_service_dotnet_tests
+{
+    [TestClass]
+    public class ChunkedInputStreamTests
+    {
+        [TestMethod]
+        public void TestReadRawVarint32()
+        {
+            MemoryStream ms = new MemoryStream();
+            byte[] input;
+            int i;
+
+            input = new byte[] { 216, 1, 0, 0, 0, 0, 0,};
+            ms.Write(input, 0, input.Length);
+            ms.Position = 0;
+            
+            i = new ChunkedInputStream(ms).ReadRawVarint32();
+            ms.Position = 0;
+            Assert.AreEqual(216, i);
+
+
+            input = new byte[] { 172, 2, 0xff, 0xff, 0, 0, 0, };
+            ms.Write(input, 0, input.Length);
+            ms.Position = 0;
+
+            i = new ChunkedInputStream(ms).ReadRawVarint32();
+            ms.Position = 0;
+            Assert.AreEqual(300, i);
+
+
+            input = new byte[] { 5, 0xff, 0xff, 0xff, 0, 0, 0, };
+            ms.Write(input, 0, input.Length);
+            ms.Position = 0;
+
+            i = new ChunkedInputStream(ms).ReadRawVarint32();
+            ms.Position = 0;
+            Assert.AreEqual(5, i);
+
+
+            input = new byte[] { 199, 232, 67, 0xff, 0, 0, 0, };
+            ms.Write(input, 0, input.Length);
+            ms.Position = 0;
+
+            i = new ChunkedInputStream(ms).ReadRawVarint32();
+            ms.Position = 0;
+            Assert.AreEqual(1111111, i);
+
+
+            input = new byte[] { 128, 1, 0xff, 0xff, 0, 0, 0, };
+            ms.Write(input, 0, input.Length);
+            ms.Position = 0;
+
+            i = new ChunkedInputStream(ms).ReadRawVarint32();
+            ms.Position = 0;
+            Assert.AreEqual(128, i);
+        }
+    }
+}

libsignal-service-dotnet-tests/ConnectionTest.cs renamed to libsignal-service-dotnet-tests/ConnectionTests.cs

@@ -1,43 +1,40 @@
-using libsignalservice;
-using libsignalservice.configuration;
-using libsignalservice.push.exceptions;
-using libsignalservice.util;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace libsignal_service_dotnet_tests
-{
-    [TestClass]
-    public class ConnectionTest
-    {
-        public static SignalServiceUrl[] ServiceUrls = new SignalServiceUrl[] { new SignalServiceUrl("https://textsecure-service.whispersystems.org") };
-        public static SignalContactDiscoveryUrl[] ContactDiscoveryUrls = new SignalContactDiscoveryUrl[] { new SignalContactDiscoveryUrl("https://api.directory.signal.org") };
-        public static SignalServiceConfiguration ServiceConfiguration = new SignalServiceConfiguration(ServiceUrls, null, ContactDiscoveryUrls);
-        public static string UserAgent = "libsignal-service-dotnet-tests";
-
-        [TestMethod]
-        public async Task TestConnection()
-        {
-            var cancelSource = new CancellationTokenSource();
-            var pushServiceSocket = new SignalServiceAccountManager(ServiceConfiguration, "A", "B", 1, UserAgent);
-            try
-            {
-                var turn = await pushServiceSocket.GetTurnServerInfo(cancelSource.Token);
-            }
-            catch (AuthorizationFailedException) { }
-        }
-
-        [TestMethod]
-        public async Task TestSignalConnections()
-        {
-            using HttpClient httpClient = Util.CreateHttpClient();
-            await httpClient.GetAsync(ServiceUrls[0].Url);
-            await httpClient.GetAsync(ContactDiscoveryUrls[0].Url);
-        }
-    }
-}
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using libsignalservice;
+using libsignalservice.configuration;
+using libsignalservice.push.exceptions;
+using libsignalservice.util;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace libsignal_service_dotnet_tests
+{
+    [TestClass]
+    public class ConnectionTests
+    {
+        public static SignalServiceUrl[] ServiceUrls = new SignalServiceUrl[] { new SignalServiceUrl("https://textsecure-service.whispersystems.org") };
+        public static SignalContactDiscoveryUrl[] ContactDiscoveryUrls = new SignalContactDiscoveryUrl[] { new SignalContactDiscoveryUrl("https://api.directory.signal.org") };
+        public static SignalServiceConfiguration ServiceConfiguration = new SignalServiceConfiguration(ServiceUrls, null, ContactDiscoveryUrls);
+        public static string UserAgent = "libsignal-service-dotnet-tests";
+
+        [TestMethod]
+        public async Task TestConnection()
+        {
+            var cancelSource = new CancellationTokenSource();
+            var pushServiceSocket = new SignalServiceAccountManager(ServiceConfiguration, "A", "B", 1, UserAgent, Util.CreateHttpClient());
+            try
+            {
+                var turn = await pushServiceSocket.GetTurnServerInfo(cancelSource.Token);
+            }
+            catch (AuthorizationFailedException) { }
+        }
+
+        [TestMethod]
+        public async Task TestSignalConnections()
+        {
+            using HttpClient httpClient = Util.CreateHttpClient();
+            await httpClient.GetAsync(ServiceUrls[0].Url);
+            await httpClient.GetAsync(ContactDiscoveryUrls[0].Url);
+        }
+    }
+}