Fix json parsing

Trolldemorted · Trolldemorted · commit 0d7053b86d8f · 2018-05-17T04:13:11.000+02:00
diff --git a/libsignal-service-dotnet/profiles/SignalServiceProfile.cs b/libsignal-service-dotnet/profiles/SignalServiceProfile.cs
@@ -9,11 +9,13 @@ namespace libsignalservice.profiles
     public class SignalServiceProfile
     {
         [JsonProperty("identityKey")]
-        public string IdentityKey { get; set; }
+        public string IdentityKey { get; private set; }
         [JsonProperty("name")]
-        public string Name { get; set; }
+        public string Name { get; private set; }
         [JsonProperty("avatar")]
-        public string Avatar { get; set; }
+        public string Avatar { get; private set; }
+
+        public SignalServiceProfile() { }
     }
 #pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
 }
diff --git a/libsignal-service-dotnet/push/ContactTokenDetails.cs b/libsignal-service-dotnet/push/ContactTokenDetails.cs
@@ -8,19 +8,21 @@ namespace libsignalservice.push
     public class ContactTokenDetails
     {
         [JsonProperty("token")]
-        public string Token { get; set; }
+        public string Token { get; private set; }
 
         [JsonProperty("relay")]
-        public string Relay { get; set; }
+        public string Relay { get; private set; }
 
         [JsonProperty("number")]
         public string Number { get; set; }
 
         [JsonProperty("voice")]
-        public bool Voice { get; set; }
+        public bool Voice { get; private set; }
 
         [JsonProperty("video")]
-        public bool Video { get; set; }
+        public bool Video { get; private set; }
+
+        public ContactTokenDetails() { }
     }
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 }
diff --git a/libsignal-service-dotnet/push/ContactTokenDetailsList.cs b/libsignal-service-dotnet/push/ContactTokenDetailsList.cs
@@ -7,6 +7,8 @@ namespace libsignalservice.push
     internal class ContactTokenDetailsList
     {
         [JsonProperty("contacts")]
-        public List<ContactTokenDetails> Contacts { get; set; }
+        public List<ContactTokenDetails> Contacts { get; private set; }
+
+        public ContactTokenDetailsList() { }
     }
 }
diff --git a/libsignal-service-dotnet/push/DeviceCode.cs b/libsignal-service-dotnet/push/DeviceCode.cs
@@ -6,6 +6,8 @@ namespace libsignalservice.push
     internal class DeviceCode
     {
         [JsonProperty("verificationCode")]
-        public String VerificationCode { get; set; }
+        public String VerificationCode { get; private set; }
+
+        public DeviceCode() { }
     }
 }
diff --git a/libsignal-service-dotnet/push/DeviceId.cs b/libsignal-service-dotnet/push/DeviceId.cs
@@ -5,6 +5,8 @@ namespace libsignal.push
     internal class DeviceId
     {
         [JsonProperty("deviceId")]
-        public int NewDeviceId { get; set; }
+        public int NewDeviceId { get; private set; }
+
+        public DeviceId() { }
     }
 }
diff --git a/libsignal-service-dotnet/push/DeviceInfoList.cs b/libsignal-service-dotnet/push/DeviceInfoList.cs
@@ -7,6 +7,7 @@ namespace libsignalservice.push
     internal class DeviceInfoList
     {
         [JsonProperty("devices")]
-        public List<DeviceInfo> Devices { get; set; }
+        public List<DeviceInfo> Devices { get; private set; }
+        public DeviceInfoList() { }
     }
 }
diff --git a/libsignal-service-dotnet/push/DeviceLimit.cs b/libsignal-service-dotnet/push/DeviceLimit.cs
@@ -6,10 +6,12 @@ namespace libsignalservice.push
     public class DeviceLimit
     {
         [JsonProperty("current")]
-        public int Current { get; set; }
+        public int Current { get; private set; }
 
         [JsonProperty("max")]
-        public int Max { get; set; }
+        public int Max { get; private set; }
+
+        public DeviceLimit() { }
     }
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 }
diff --git a/libsignal-service-dotnet/push/MismatchedDevices.cs b/libsignal-service-dotnet/push/MismatchedDevices.cs
@@ -8,10 +8,12 @@ namespace libsignalservice.push
     public class MismatchedDevices
     {
         [JsonProperty("missingDevices")]
-        public List<int> MissingDevices { get; set; }
+        public List<int> MissingDevices { get; private set; }
 
         [JsonProperty("extraDevices")]
-        public List<int> ExtraDevices { get; set; }
+        public List<int> ExtraDevices { get; private set; }
+
+        public MismatchedDevices() { }
     }
 #pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
 }
diff --git a/libsignal-service-dotnet/push/PreKeyResponse.cs b/libsignal-service-dotnet/push/PreKeyResponse.cs
@@ -11,11 +11,13 @@ namespace libsignalservice.push
     internal class PreKeyResponse
     {
         [JsonProperty("devices", Order = 1)]
-        public List<PreKeyResponseItem> Devices { get; set; }
+        public List<PreKeyResponseItem> Devices { get; private set; }
 
         [JsonProperty("identityKey", Order = 2)]
         [JsonConverter(typeof(IdentityKeySerializer))]
-        public IdentityKey IdentityKey { get; set; }
+        public IdentityKey IdentityKey { get; private set; }
+
+        public PreKeyResponse() { }
     }
 
     internal class IdentityKeySerializer : JsonConverter
diff --git a/libsignal-service-dotnet/push/PreKeyStatus.cs b/libsignal-service-dotnet/push/PreKeyStatus.cs
@@ -5,6 +5,8 @@ namespace libsignalservice.push
     internal class PreKeyStatus
     {
         [JsonProperty("count")]
-        public int Count { get; set; }
+        public int Count { get; private set; }
+
+        public PreKeyStatus() { }
     }
 }
diff --git a/libsignal-service-dotnet/push/ProfileAvatarUploadAttributes.cs b/libsignal-service-dotnet/push/ProfileAvatarUploadAttributes.cs
@@ -6,13 +6,15 @@ namespace libsignalservice.push
 {
     internal class ProfileAvatarUploadAttributes
     {
-        public string Url { get; set; }
-        public string Key { get; set; }
-        public string Credential { get; set; }
-        public string Acl { get; set; }
-        public string Algorithm { get; set; }
-        public string Date { get; set; }
-        public string Policy { get; set; }
-        public string Signature { get; set; }
+        public string Url { get; private set; }
+        public string Key { get; private set; }
+        public string Credential { get; private set; }
+        public string Acl { get; private set; }
+        public string Algorithm { get; private set; }
+        public string Date { get; private set; }
+        public string Policy { get; private set; }
+        public string Signature { get; private set; }
+
+        public ProfileAvatarUploadAttributes() { }
     }
 }
diff --git a/libsignal-service-dotnet/push/PushServiceSocket.cs b/libsignal-service-dotnet/push/PushServiceSocket.cs
@@ -833,9 +833,11 @@ public RegistrationLock(string pin)
     internal class RegistrationLockFailure
     {
         [JsonProperty("length")]
-        public int Length { get; }
+        public int Length { get; private set; }
         [JsonProperty("timeRemaining")]
-        public long TimeRemaining { get; }
+        public long TimeRemaining { get; private set; }
+
+        public RegistrationLockFailure() { }
     }
 
     internal class AttachmentDescriptor
@@ -845,5 +847,7 @@ internal class AttachmentDescriptor
 
         [JsonProperty("location")]
         public string Location { get; set; }
+
+        public AttachmentDescriptor() { }
     }
 }
diff --git a/libsignal-service-dotnet/push/SendMessageResponse.cs b/libsignal-service-dotnet/push/SendMessageResponse.cs
@@ -6,7 +6,9 @@ namespace libsignalservice.push
     public class SendMessageResponse
     {
         [JsonProperty("needsSync")]
-        public bool NeedsSync { get; set; }
+        public bool NeedsSync { get; private set; }
+
+        public SendMessageResponse() { }
     }
 #pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
 }
diff --git a/libsignal-service-dotnet/push/SignalServiceEnvelopeEntityList.cs b/libsignal-service-dotnet/push/SignalServiceEnvelopeEntityList.cs
@@ -6,6 +6,8 @@ namespace libsignalservice.push
     internal class SignalServiceEnvelopeEntityList
     {
         [JsonProperty("messages")]
-        public List<SignalServiceEnvelopeEntity> Messages { get; set; }
+        public List<SignalServiceEnvelopeEntity> Messages { get; private set; }
+
+        public SignalServiceEnvelopeEntityList() { }
     }
 }
diff --git a/libsignal-service-dotnet/push/SignedPreKeyEntity.cs b/libsignal-service-dotnet/push/SignedPreKeyEntity.cs
@@ -12,7 +12,7 @@ namespace libsignalservice.push
     [JsonConverter(typeof(SignedPreKeySerializer))]
     public class SignedPreKeyEntity : PreKeyEntity
     {
-        public byte[] Signature { get; set; }
+        public byte[] Signature { get; private set; }
 
         public SignedPreKeyEntity(uint keyId, ECPublicKey publicKey, byte[] signature)
             : base(keyId, publicKey)
diff --git a/libsignal-service-dotnet/push/StaleDevices.cs b/libsignal-service-dotnet/push/StaleDevices.cs
@@ -7,7 +7,9 @@ namespace libsignalservice.push
     public class StaleDevices
     {
         [JsonProperty("staleDevices")]
-        public List<int> Devices { get; set; }
+        public List<int> Devices { get; private set; }
+
+        public StaleDevices() { }
     }
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 }

Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,13 @@ namespace libsignalservice.profiles`
`9`	`9`	`public class SignalServiceProfile`
`10`	`10`	`{`
`11`	`11`	`[JsonProperty("identityKey")]`
`12`		`- public string IdentityKey { get; set; }`
	`12`	`+ public string IdentityKey { get; private set; }`
`13`	`13`	`[JsonProperty("name")]`
`14`		`- public string Name { get; set; }`
	`14`	`+ public string Name { get; private set; }`
`15`	`15`	`[JsonProperty("avatar")]`
`16`		`- public string Avatar { get; set; }`
	`16`	`+ public string Avatar { get; private set; }`
	`17`	`+`
	`18`	`+ public SignalServiceProfile() { }`
`17`	`19`	`}`
`18`	`20`	`#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member`
`19`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ namespace libsignalservice.push`
`7`	`7`	`internal class ContactTokenDetailsList`
`8`	`8`	`{`
`9`	`9`	`[JsonProperty("contacts")]`
`10`		`- public List<ContactTokenDetails> Contacts { get; set; }`
	`10`	`+ public List<ContactTokenDetails> Contacts { get; private set; }`
	`11`	`+`
	`12`	`+ public ContactTokenDetailsList() { }`
`11`	`13`	`}`
`12`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ namespace libsignalservice.push`
`6`	`6`	`internal class DeviceCode`
`7`	`7`	`{`
`8`	`8`	`[JsonProperty("verificationCode")]`
`9`		`- public String VerificationCode { get; set; }`
	`9`	`+ public String VerificationCode { get; private set; }`
	`10`	`+`
	`11`	`+ public DeviceCode() { }`
`10`	`12`	`}`
`11`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@ namespace libsignal.push`
`5`	`5`	`internal class DeviceId`
`6`	`6`	`{`
`7`	`7`	`[JsonProperty("deviceId")]`
`8`		`- public int NewDeviceId { get; set; }`
	`8`	`+ public int NewDeviceId { get; private set; }`
	`9`	`+`
	`10`	`+ public DeviceId() { }`
`9`	`11`	`}`
`10`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ namespace libsignalservice.push`
`7`	`7`	`internal class DeviceInfoList`
`8`	`8`	`{`
`9`	`9`	`[JsonProperty("devices")]`
`10`		`- public List<DeviceInfo> Devices { get; set; }`
	`10`	`+ public List<DeviceInfo> Devices { get; private set; }`
	`11`	`+ public DeviceInfoList() { }`
`11`	`12`	`}`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,12 @@ namespace libsignalservice.push`
`6`	`6`	`public class DeviceLimit`
`7`	`7`	`{`
`8`	`8`	`[JsonProperty("current")]`
`9`		`- public int Current { get; set; }`
	`9`	`+ public int Current { get; private set; }`
`10`	`10`
`11`	`11`	`[JsonProperty("max")]`
`12`		`- public int Max { get; set; }`
	`12`	`+ public int Max { get; private set; }`
	`13`	`+`
	`14`	`+ public DeviceLimit() { }`
`13`	`15`	`}`
`14`	`16`	`#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member`
`15`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,12 @@ namespace libsignalservice.push`
`8`	`8`	`public class MismatchedDevices`
`9`	`9`	`{`
`10`	`10`	`[JsonProperty("missingDevices")]`
`11`		`- public List<int> MissingDevices { get; set; }`
	`11`	`+ public List<int> MissingDevices { get; private set; }`
`12`	`12`
`13`	`13`	`[JsonProperty("extraDevices")]`
`14`		`- public List<int> ExtraDevices { get; set; }`
	`14`	`+ public List<int> ExtraDevices { get; private set; }`
	`15`	`+`
	`16`	`+ public MismatchedDevices() { }`
`15`	`17`	`}`
`16`	`18`	`#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member`
`17`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,13 @@ namespace libsignalservice.push`
`11`	`11`	`internal class PreKeyResponse`
`12`	`12`	`{`
`13`	`13`	`[JsonProperty("devices", Order = 1)]`
`14`		`- public List<PreKeyResponseItem> Devices { get; set; }`
	`14`	`+ public List<PreKeyResponseItem> Devices { get; private set; }`
`15`	`15`
`16`	`16`	`[JsonProperty("identityKey", Order = 2)]`
`17`	`17`	`[JsonConverter(typeof(IdentityKeySerializer))]`
`18`		`- public IdentityKey IdentityKey { get; set; }`
	`18`	`+ public IdentityKey IdentityKey { get; private set; }`
	`19`	`+`
	`20`	`+ public PreKeyResponse() { }`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`internal class IdentityKeySerializer : JsonConverter`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@ namespace libsignalservice.push`
`5`	`5`	`internal class PreKeyStatus`
`6`	`6`	`{`
`7`	`7`	`[JsonProperty("count")]`
`8`		`- public int Count { get; set; }`
	`8`	`+ public int Count { get; private set; }`
	`9`	`+`
	`10`	`+ public PreKeyStatus() { }`
`9`	`11`	`}`
`10`	`12`	`}`