diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle index ff82dd5d7..d9bc43ec3 100644 --- a/TMessagesProj/build.gradle +++ b/TMessagesProj/build.gradle @@ -306,7 +306,6 @@ android { sourceSets.full { dependencies { implementation files('libs/libv2ray.aar') - implementation files('libs/relaybaton-release.aar') implementation files('libs/ss-rust-release.aar') implementation files('libs/ssr-libev-release.aar') } diff --git a/TMessagesProj/libs/relaybaton-release.aar b/TMessagesProj/libs/relaybaton-release.aar deleted file mode 100644 index 3ab042095..000000000 Binary files a/TMessagesProj/libs/relaybaton-release.aar and /dev/null differ diff --git a/TMessagesProj/src/main/AndroidManifest.xml b/TMessagesProj/src/main/AndroidManifest.xml index 0a5cb0416..2d8749ab2 100644 --- a/TMessagesProj/src/main/AndroidManifest.xml +++ b/TMessagesProj/src/main/AndroidManifest.xml @@ -205,7 +205,6 @@ - links = new ArrayList<>(); - gatherLinks(links, text, LinkifyPort.PROXY_PATTERN, new String[]{VMESS_PROTOCOL, VMESS1_PROTOCOL, SS_PROTOCOL, SSR_PROTOCOL, RB_PROTOCOL}, sUrlMatchFilter); + gatherLinks(links, text, LinkifyPort.PROXY_PATTERN, new String[]{VMESS_PROTOCOL, VMESS1_PROTOCOL, SS_PROTOCOL, SSR_PROTOCOL/*, RB_PROTOCOL*/}, sUrlMatchFilter); pruneOverlaps(links); if (links.size() == 0) { return false; diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/SharedConfig.java b/TMessagesProj/src/main/java/org/telegram/messenger/SharedConfig.java index 26e03a2fe..1740b6baa 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/SharedConfig.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/SharedConfig.java @@ -1671,22 +1671,22 @@ public class SharedConfig { if (!subInfo.enable) continue; - if (subInfo.id == 1L) { - - try { - RelayBatonProxy publicProxy = (RelayBatonProxy) parseProxyInfo(RelayBatonLoader.publicServer); - publicProxy.setRemarks(LocaleController.getString("NekoXProxy",R.string.NekoXProxy)); - publicProxy.subId = subInfo.id; - proxyList.add(publicProxy); - if (publicProxy.hashCode() == current) { - currentProxy = publicProxy; - UIUtil.runOnIoDispatcher(publicProxy::start); - } - } catch (InvalidProxyException e) { - e.printStackTrace(); - } - - } +// if (subInfo.id == 1L) { +// +// try { +// RelayBatonProxy publicProxy = (RelayBatonProxy) parseProxyInfo(RelayBatonLoader.publicServer); +// publicProxy.setRemarks(LocaleController.getString("NekoXProxy",R.string.NekoXProxy)); +// publicProxy.subId = subInfo.id; +// proxyList.add(publicProxy); +// if (publicProxy.hashCode() == current) { +// currentProxy = publicProxy; +// UIUtil.runOnIoDispatcher(publicProxy::start); +// } +// } catch (InvalidProxyException e) { +// e.printStackTrace(); +// } +// +// } for (String proxy : subInfo.proxies) { @@ -1828,7 +1828,7 @@ public class SharedConfig { } - } else if (url.startsWith(RB_PROTOCOL)) { + }/* else if (url.startsWith(RB_PROTOCOL)) { try { @@ -1840,7 +1840,7 @@ public class SharedConfig { } - } + } */ if (url.startsWith("tg:proxy") || url.startsWith("tg://proxy") || diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ProxyListActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ProxyListActivity.java index fe32e8fa0..0aa1ff5f9 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ProxyListActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ProxyListActivity.java @@ -663,7 +663,7 @@ public class ProxyListActivity extends BaseFragment implements NotificationCente addItem.addSubItem(menu_add_input_ss, LocaleController.getString("AddProxySS", R.string.AddProxySS)).setOnClickListener((v) -> presentFragment(new ShadowsocksSettingsActivity())); addItem.addSubItem(menu_add_input_ssr, LocaleController.getString("AddProxySSR", R.string.AddProxySSR)).setOnClickListener((v) -> presentFragment(new ShadowsocksRSettingsActivity())); } - addItem.addSubItem(menu_add_input_rb, LocaleController.getString("AddProxyRB", R.string.AddProxyRB)).setOnClickListener((v) -> presentFragment(new RelayBatonSettingsActivity())); + // addItem.addSubItem(menu_add_input_rb, LocaleController.getString("AddProxyRB", R.string.AddProxyRB)).setOnClickListener((v) -> presentFragment(new RelayBatonSettingsActivity())); } diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/ProxyUtil.kt b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/ProxyUtil.kt index 70286e65d..c1ecc590b 100644 --- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/ProxyUtil.kt +++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/ProxyUtil.kt @@ -129,8 +129,8 @@ object ProxyUtil { line.startsWith(VMESS_PROTOCOL) || line.startsWith(VMESS1_PROTOCOL) || line.startsWith(SS_PROTOCOL) || - line.startsWith(SSR_PROTOCOL) || - line.startsWith(RB_PROTOCOL)) { + line.startsWith(SSR_PROTOCOL) /*|| + line.startsWith(RB_PROTOCOL)*/) { runCatching { proxies.add(SharedConfig.parseProxyInfo(line).toUrl()) }