Refactoring of obsolete functions

Author: codebude

QRCoder/PayloadGenerator.cs

@@ -634,12 +634,12 @@ public BitcoinLikeCryptoCurrencyAddress(BitcoinLikeCryptoCurrencyType currencyTy
 
                 if (!string.IsNullOrEmpty(label))
                 {
-                    this.label = Uri.EscapeUriString(label);
+                    this.label = Uri.EscapeDataString(label);
                 }
 
                 if (!string.IsNullOrEmpty(message))
                 {
-                    this.message = Uri.EscapeUriString(message);
+                    this.message = Uri.EscapeDataString(message);
                 }
 
                 this.amount = amount;
@@ -2012,41 +2012,34 @@ private void ProcessCommonFields(StringBuilder sb)
                 }
                 string strippedSecret = Secret.Replace(" ", "");
                 string escapedIssuer = null;
-                string escapedLabel = null;
+                string label = null;
 
                 if (!String40Methods.IsNullOrWhiteSpace(Issuer))
                 {
                     if (Issuer.Contains(":"))
                     {
                         throw new Exception("Issuer must not have a ':'");
                     }
-                    escapedIssuer = Uri.EscapeUriString(Issuer);
+                    escapedIssuer = Uri.EscapeDataString(Issuer);
                 }
 
-                if (!String40Methods.IsNullOrWhiteSpace(Label))
+                if (!String40Methods.IsNullOrWhiteSpace(Label) && Label.Contains(":"))
                 {
-                    if (Label.Contains(":"))
-                    {
-                        throw new Exception("Label must not have a ':'");
-                    }
-                    escapedLabel = Uri.EscapeUriString(Label);
+                    throw new Exception("Label must not have a ':'");
                 }
 
-                if (escapedLabel != null)
+                if (Label != null && Issuer != null)
                 {
-                    if (escapedIssuer != null)
-                    {
-                        escapedLabel = escapedIssuer + ":" + escapedLabel;
-                    }
+                    label = Issuer + ":" + Label;                    
                 }
-                else if (escapedIssuer != null)
+                else if (Issuer != null)
                 {
-                    escapedLabel = escapedIssuer;
+                    label = Issuer;
                 }
 
-                if (escapedLabel != null)
+                if (label != null)
                 {
-                    sb.Append(escapedLabel);
+                    sb.Append(label);
                 }
 
                 sb.Append("?secret=" + strippedSecret);

QRCoderTests/Helpers/HelperFunctions.cs

@@ -50,10 +50,12 @@ public static Bitmap BitmapSourceToBitmap(DrawingImage xamlImg)
         public static string GetAssemblyPath()
         {
             return
-#if NET5_0
-                AppDomain.CurrentDomain.BaseDirectory;
+#if NET5_0 || NET6_0
+            AppDomain.CurrentDomain.BaseDirectory;
+#elif NET35 || NET452
+            Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().CodeBase).Replace("file:\\", "");
 #else
-                Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().CodeBase).Replace("file:\\", "");
+            Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location).Replace("file:\\", "");
 #endif
         }
 #endif
@@ -76,7 +78,7 @@ public static string BitmapToHash(Bitmap bmp)
         public static string ByteArrayToHash(byte[] data)
         {
 #if !NETCOREAPP1_1
-            var md5 = new MD5CryptoServiceProvider();
+            var md5 = MD5.Create();
             var hash = md5.ComputeHash(data);
 #else
             var hash = new SshNet.Security.Cryptography.MD5().ComputeHash(data);