From 17261023912acee50d4a371f75af24d6df8332c2 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 1 Jun 2023 13:35:35 +0800 Subject: [PATCH 1/5] Update rules --- app/build.gradle | 1 + app/proguard-rules.pro | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 11978824..3e0ec2b3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,6 +12,7 @@ android { targetSdk 28 ndk { abiFilters "armeabi-v7a" } buildConfigField("String", "CLIENT_ID", "\"${clientId}\"") + multiDexEnabled true } buildTypes { diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 3fe02692..8c1e88d5 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -33,8 +33,10 @@ -keep class com.thegrizzlylabs.sardineandroid.** { *; } # Smbj +-keep class org.bouncycastle.** { *; } -keep class com.hierynomus.** { *; } --keep class net.engio.mbassy.** { *; } +-keep class net.engio.** { *; } +-keep class org.slf4j.** { *; } # Zxing -keep class com.google.zxing.** { *; } From 39eefc5e8a0eebb989e6c05f1db538b5c10aa580 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 1 Jun 2023 13:44:23 +0800 Subject: [PATCH 2/5] Update proguard-rules.pro --- app/proguard-rules.pro | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 8c1e88d5..6e20f4da 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -35,8 +35,6 @@ # Smbj -keep class org.bouncycastle.** { *; } -keep class com.hierynomus.** { *; } --keep class net.engio.** { *; } --keep class org.slf4j.** { *; } # Zxing -keep class com.google.zxing.** { *; } From 13a7db92a95f2b695f6da12e112111ebd39bff54 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 1 Jun 2023 13:51:48 +0800 Subject: [PATCH 3/5] Update proguard-rules.pro --- app/proguard-rules.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 6e20f4da..3fe02692 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -33,8 +33,8 @@ -keep class com.thegrizzlylabs.sardineandroid.** { *; } # Smbj --keep class org.bouncycastle.** { *; } -keep class com.hierynomus.** { *; } +-keep class net.engio.mbassy.** { *; } # Zxing -keep class com.google.zxing.** { *; } From bf5f52b30f7abf2731d89e5a96409beba7f36a33 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 1 Jun 2023 14:00:22 +0800 Subject: [PATCH 4/5] 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 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) { From f4a7dd8ba1b156fcf430c4ebb0521c8088631459 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 1 Jun 2023 14:00:44 +0800 Subject: [PATCH 5/5] Clean code --- app/src/main/java/com/github/catvod/utils/Utils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 9089c8c0..7ab81bc2 100644 --- a/app/src/main/java/com/github/catvod/utils/Utils.java +++ b/app/src/main/java/com/github/catvod/utils/Utils.java @@ -49,7 +49,7 @@ public class Utils { return hasCamera && hasPhone && hasBT; } - public static boolean isGBK(byte[] bytes) { + public static boolean isGbk(byte[] bytes) { Charset charset = Charset.forName("GBK"); String str = new String(bytes, charset); byte[] newBytes = str.getBytes(charset); @@ -57,7 +57,7 @@ public class Utils { } public static byte[] toUtf8(byte[] bytes) throws Exception { - return isGBK(bytes) ? new String(bytes, Charset.forName("GBK")).getBytes("UTF-8") : bytes; + return isGbk(bytes) ? new String(bytes, Charset.forName("GBK")).getBytes("UTF-8") : bytes; } public static boolean isSub(String ext) {