From e5cdb49b1e2903966b9bd6303645058a97a8a74f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E4=BF=8A?= <215613905@qq.com>
Date: Wed, 12 Oct 2022 17:31:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3pk=E5=8A=A0=E5=AF=86=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=8D=E8=83=BD=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/github/tvbox/osc/api/ApiConfig.java   | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/github/tvbox/osc/api/ApiConfig.java b/app/src/main/java/com/github/tvbox/osc/api/ApiConfig.java
index 8e837ca1..eada442b 100644
--- a/app/src/main/java/com/github/tvbox/osc/api/ApiConfig.java
+++ b/app/src/main/java/com/github/tvbox/osc/api/ApiConfig.java
@@ -85,26 +85,21 @@ public class ApiConfig {
     }
 
     public static String FindResult(String json, String configKey) {
+        String content = json;
         try {
-            String content = "";
-            if (AES.isJson(json)) {
-                return json;
-            } else if (!json.startsWith("2423")) {
-                String[] data = json.split("\\*\\*");
-                content = new String(Base64.decode(data[1], Base64.DEFAULT));
-            } else {
-                content = json;
-            }
+            if (AES.isJson(content)) return content;
             if (content.startsWith("2423")) {
                 String data = content.substring(content.indexOf("2324") + 4, content.length() - 26);
                 content = new String(AES.toBytes(content)).toLowerCase();
                 String key = AES.rightPadding(content.substring(content.indexOf("$#") + 2, content.indexOf("#$")), "0", 16);
                 String iv = AES.rightPadding(content.substring(content.length() - 13), "0", 16);
                 json = AES.CBC(data, key, iv);
-            } else if (configKey !=null) {
+            }else if (content.startsWith("9864") && configKey !=null) {
                 json = AES.ECB(content, configKey);
-            } else {
-                json = content;
+            }
+            else{
+                String[] data = json.split("\\*\\*");
+                json = new String(Base64.decode(data[1], Base64.DEFAULT));
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -132,11 +127,16 @@ public class ApiConfig {
         if (apiUrl.contains(pk)) {
             String[] a = apiUrl.split(pk);
             TempKey = a[1];
-            if (apiUrl.startsWith("clan")) configUrl = clanToAddress(a[0]);
-            if (apiUrl.startsWith("http")) configUrl = a[0];
-        } else if (apiUrl.startsWith("clan") && !apiUrl.contains(pk)) {
+            if (apiUrl.startsWith("clan")){
+                configUrl = clanToAddress(a[0]);
+            }else if (apiUrl.startsWith("http")){
+                configUrl = a[0];
+            }else {
+                configUrl = "http://" + a[0];
+            }
+        } else if (apiUrl.startsWith("clan")) {
             configUrl = clanToAddress(apiUrl);
-        } else if (!apiUrl.startsWith("http") && !apiUrl.contains(pk)) {
+        } else if (!apiUrl.startsWith("http")) {
             configUrl = "http://" + configUrl;
         } else {
             configUrl = apiUrl;