From 31d4cee853e11ab8add4bd6e942d3fec63350665 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Tue, 11 Oct 2022 21:53:11 +0800
Subject: [PATCH] Fix bug

---
 app/src/main/java/com/fongmi/android/tv/api/Decoder.java  | 8 +++-----
 .../main/java/com/fongmi/android/tv/utils/FileUtil.java   | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/fongmi/android/tv/api/Decoder.java b/app/src/main/java/com/fongmi/android/tv/api/Decoder.java
index f730d5e40..e4bfe2a68 100644
--- a/app/src/main/java/com/fongmi/android/tv/api/Decoder.java
+++ b/app/src/main/java/com/fongmi/android/tv/api/Decoder.java
@@ -5,6 +5,7 @@ import android.util.Base64;
 import com.fongmi.android.tv.net.OKHttp;
 import com.fongmi.android.tv.utils.FileUtil;
 import com.fongmi.android.tv.utils.Json;
+import com.google.common.io.BaseEncoding;
 
 import java.nio.charset.StandardCharsets;
 
@@ -63,10 +64,7 @@ public class Decoder {
         return (key + "0000000000000000".substring(key.length())).getBytes(StandardCharsets.UTF_8);
     }
 
-    private static byte[] decodeHex(String s) {
-        int len = s.length() / 2;
-        byte[] data = new byte[len];
-        for (int i = 0; i < len; i++) data[i] = Integer.valueOf(s.substring(i * 2, i * 2 + 2), 16).byteValue();
-        return data;
+    public static byte[] decodeHex(String hexString) {
+        return BaseEncoding.base16().decode(hexString.toUpperCase());
     }
 }
diff --git a/app/src/main/java/com/fongmi/android/tv/utils/FileUtil.java b/app/src/main/java/com/fongmi/android/tv/utils/FileUtil.java
index 22050b87b..b5e59eea6 100644
--- a/app/src/main/java/com/fongmi/android/tv/utils/FileUtil.java
+++ b/app/src/main/java/com/fongmi/android/tv/utils/FileUtil.java
@@ -70,7 +70,7 @@ public class FileUtil {
             BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(getLocal(path))));
             StringBuilder sb = new StringBuilder();
             String text;
-            while ((text = br.readLine()) != null) sb.append(text).append("\n");
+            while ((text = br.readLine()) != null) sb.append(text);
             br.close();
             return sb.toString();
         } catch (Exception e) {