Merge pull request #651 from jellyfin/release-10.1.0

Release 10.1.0

1 files changed, 7 insertions, 10 deletions

diff --git a/OpenSubtitlesHandler/Utilities.cs b/OpenSubtitlesHandler/Utilities.cs
index f8cfa5c4f..429e28a8f 100644
--- a/OpenSubtitlesHandler/Utilities.cs
+++ b/OpenSubtitlesHandler/Utilities.cs
@@ -18,13 +18,12 @@
  */
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.IO;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Model.Cryptography;
-using MediaBrowser.Model.Text;
 
 namespace OpenSubtitlesHandler
 {
@@ -35,8 +34,6 @@ namespace OpenSubtitlesHandler
     {
         public static ICryptoProvider CryptographyProvider { get; set; }
         public static IHttpClient HttpClient { get; set; }
-        public static ITextEncoding EncodingHelper { get; set; }
-
         private static string XML_RPC_SERVER = "https://api.opensubtitles.org/xml-rpc";
         //private static string XML_RPC_SERVER = "https://92.240.234.122/xml-rpc";
         private static string HostHeader = "api.opensubtitles.org:443";
@@ -47,7 +44,7 @@ namespace OpenSubtitlesHandler
         /// <returns>The hash as Hexadecimal string</returns>
         public static string ComputeHash(Stream stream)
         {
-			byte[] hash = MovieHasher.ComputeMovieHash(stream);
+            byte[] hash = MovieHasher.ComputeMovieHash(stream);
             return MovieHasher.ToHexadecimal(hash);
         }
         /// <summary>
@@ -57,9 +54,9 @@ namespace OpenSubtitlesHandler
         /// <returns>Bytes array of decompressed data</returns>
         public static byte[] Decompress(Stream dataToDecompress)
         {
-            using (MemoryStream target = new MemoryStream())
+            using (var target = new MemoryStream())
             {
-                using (System.IO.Compression.GZipStream decompressionStream = new System.IO.Compression.GZipStream(dataToDecompress, System.IO.Compression.CompressionMode.Decompress))
+                using (var decompressionStream = new System.IO.Compression.GZipStream(dataToDecompress, System.IO.Compression.CompressionMode.Decompress))
                 {
                     decompressionStream.CopyTo(target);
                 }
@@ -117,7 +114,7 @@ namespace OpenSubtitlesHandler
             using (responseStream)
             {
                 // Handle response, should be XML text.
-                List<byte> data = new List<byte>();
+                var data = new List<byte>();
                 while (true)
                 {
                     int r = responseStream.ReadByte();
@@ -126,13 +123,13 @@ namespace OpenSubtitlesHandler
                     data.Add((byte)r);
                 }
                 var bytes = data.ToArray();
-                return EncodingHelper.GetASCIIEncoding().GetString(bytes, 0, bytes.Length);
+                return Encoding.ASCII.GetString(bytes, 0, bytes.Length);
             }
         }
 
         public static byte[] GetASCIIBytes(string text)
         {
-            return EncodingHelper.GetASCIIEncoding().GetBytes(text);
+            return Encoding.ASCII.GetBytes(text);
         }
 
         /// <summary>