From 90ff5c93769d8e4a7875d6e4e68f15bbcef0b809 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Thu, 1 Jun 2023 14:00:22 +0800
Subject: [PATCH] Clean code

---
 app/src/main/java/com/github/catvod/ali/API.java     | 2 +-
 app/src/main/java/com/github/catvod/utils/Utils.java | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/github/catvod/ali/API.java b/app/src/main/java/com/github/catvod/ali/API.java
index dda67f14..c7b59925 100644
--- a/app/src/main/java/com/github/catvod/ali/API.java
+++ b/app/src/main/java/com/github/catvod/ali/API.java
@@ -460,7 +460,7 @@ public class API {
     public Object[] proxySub(Map<String, String> params) throws Exception {
         String fileId = params.get("file_id");
         Response res = OkHttp.newCall(getDownloadUrl(fileId), getHeaderAuth());
-        byte[] body = Utils.getUTF8(res.body().bytes());
+        byte[] body = Utils.toUtf8(res.body().bytes());
         Object[] result = new Object[3];
         result[0] = 200;
         result[1] = "application/octet-stream";
diff --git a/app/src/main/java/com/github/catvod/utils/Utils.java b/app/src/main/java/com/github/catvod/utils/Utils.java
index 4bc10627..9089c8c0 100644
--- a/app/src/main/java/com/github/catvod/utils/Utils.java
+++ b/app/src/main/java/com/github/catvod/utils/Utils.java
@@ -56,12 +56,8 @@ public class Utils {
         return Arrays.equals(bytes, newBytes);
     }
 
-    public static byte[] getUTF8(byte[] bytes) throws Exception {
-        if (isGBK(bytes)) {
-            return new String(bytes, Charset.forName("GBK")).getBytes("UTF-8");
-        } else {
-            return bytes;
-        }
+    public static byte[] toUtf8(byte[] bytes) throws Exception {
+        return isGBK(bytes) ? new String(bytes, Charset.forName("GBK")).getBytes("UTF-8") : bytes;
     }
 
     public static boolean isSub(String ext) {