From 97d1ce5a5857aa4384efa3b9738c2685bc22a6d9 Mon Sep 17 00:00:00 2001 From: Shane32 Date: Fri, 26 Apr 2024 00:47:15 -0400 Subject: [PATCH] Updates based on code review --- QRCoder/PayloadGenerator.cs | 8 ++++---- QRCoder/QRCodeGenerator.cs | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/QRCoder/PayloadGenerator.cs b/QRCoder/PayloadGenerator.cs index c8483694..39bae5f0 100644 --- a/QRCoder/PayloadGenerator.cs +++ b/QRCoder/PayloadGenerator.cs @@ -2516,8 +2516,8 @@ public override string ToString() var cp = characterSet.ToString().Replace("_", "-"); var bytes = ToBytes(); -#if NETCOREAPP - System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance); +#if !NETFRAMEWORK + Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); #endif return Encoding.GetEncoding(cp).GetString(bytes, 0, bytes.Length); } @@ -2532,7 +2532,7 @@ public byte[] ToBytes() { //Setup byte encoder //Encode return string as byte[] with correct CharacterSet -#if !NETFRAMEWORK // -- why different ifdef than line 2519? -- +#if !NETFRAMEWORK Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); #endif var cp = this.characterSet.ToString().Replace("_", "-"); @@ -3111,7 +3111,7 @@ private static string ConvertStringToEncoding(string message, string encoding) Encoding utf8 = Encoding.UTF8; byte[] utfBytes = utf8.GetBytes(message); byte[] isoBytes = Encoding.Convert(utf8, iso, utfBytes); - return iso.GetString(isoBytes, 0, isoBytes.Length); + return iso.GetString(isoBytes); } private static string EscapeInput(string inp, bool simple = false) diff --git a/QRCoder/QRCodeGenerator.cs b/QRCoder/QRCodeGenerator.cs index bfff8c0c..85c24b17 100644 --- a/QRCoder/QRCodeGenerator.cs +++ b/QRCoder/QRCodeGenerator.cs @@ -1026,8 +1026,7 @@ private static bool IsUtf8(EncodingMode encoding, string plainText, bool forceUt private static bool IsValidISO(string input) { var bytes = Encoding.GetEncoding("ISO-8859-1").GetBytes(input); - //var result = Encoding.GetEncoding("ISO-8859-1").GetString(bytes); - var result = Encoding.GetEncoding("ISO-8859-1").GetString(bytes,0,bytes.Length); + var result = Encoding.GetEncoding("ISO-8859-1").GetString(bytes); return String.Equals(input, result); }