fix build

dic1911 · Nov 22, 2023 · 3e224ae · 3e224ae
1 parent 5450b62
commit 3e224ae
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 256 deletions.
diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/proxy/ShadowsocksSettingsActivity.java b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/proxy/ShadowsocksSettingsActivity.java
@@ -29,8 +29,6 @@
 import android.widget.ScrollView;
 import android.widget.TextView;
 
-import androidx.annotation.RequiresApi;
-
 import com.github.shadowsocks.plugin.PluginConfiguration;
 import com.github.shadowsocks.plugin.PluginContract;
 import com.github.shadowsocks.plugin.PluginList;
@@ -58,7 +56,6 @@
 import kotlin.Unit;
 import tw.nekomimi.nekogram.proxynext.ShadowsocksBean;
 import tw.nekomimi.nekogram.proxynext.SingProxyManager;
-import tw.nekomimi.nekogram.proxynext.VMessBean;
 import tw.nekomimi.nekogram.ui.BottomBuilder;
 import tw.nekomimi.nekogram.ui.PopupBuilder;
 import tw.nekomimi.nekogram.utils.AlertUtil;

diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/proxynext/ProxyConfig.kt b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/proxynext/ProxyConfig.kt
@@ -14,14 +14,8 @@ object ProxyConfig {
     @JvmStatic
     fun parseSingBoxConfig(url: String): SingProxyBean? {
         try {
-            if (url.startsWith(VMESS_PROTOCOL) || url.startsWith(VMESS1_PROTOCOL)) {
-                return VMessBean().parseFromLink(url)
-            } else if (url.startsWith(SS_PROTOCOL)) {
+            if (url.startsWith(SS_PROTOCOL)) {
                 return ShadowsocksBean().parseFromLink(url)
-            } else if (url.startsWith(SSR_PROTOCOL)) {
-                return ShadowsocksRBean().parseFromLink(url)
-            } else if (url.startsWith(TROJAN_PROTOCOL)) {
-                return TrojanBean().parseFromLink(url)
             }
             return null
         } catch (ex: Exception) {
@@ -38,9 +32,6 @@ object ProxyConfig {
         try {
             val boxConfig = when (outbound.opt("type")) {
                 "shadowsocks" -> ShadowsocksBean().parseFromStorage(outbound)
-                "shadowsocksr" -> ShadowsocksRBean().parseFromStorage(outbound)
-                "vmess" -> VMessBean().parseFromStorage(outbound)
-                "trojan" -> TrojanBean().parseFromStorage(outbound)
                 else -> null
             }
             return boxConfig

diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/proxynext/ShadowsocksBean.kt b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/proxynext/ShadowsocksBean.kt
@@ -114,6 +114,10 @@ data class ShadowsocksBean(
         TODO("Not yet implemented")
     }
 
+    override fun generateSingConfig(): JSONObject {
+        TODO("Not yet implemented")
+    }
+
     override fun generateLink(): String {
         TODO("Not yet implemented")
     }

diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/proxynext/ShadowsocksRBean.kt b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/proxynext/ShadowsocksRBean.kt
diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/proxynext/TrojanBean.kt b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/proxynext/TrojanBean.kt
diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/proxynext/VMessBean.kt b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/proxynext/VMessBean.kt
diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/ProxyUtil.kt b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/ProxyUtil.kt
@@ -97,6 +97,9 @@ object ProxyUtil {
                                             proxy["name"] as String
                                     ).toString())
                         }
+                        else -> {
+                            // ignored
+                        }
                     }
                 }
             }