lynx
/
NekoX
mirror of https://github.com/NekoX-Dev/NekoX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert relaybaton support

This commit is contained in:
世界 2020-06-05 11:11:50 +08:00
parent b09b03dd4b
commit 4e01aa74b5
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
8 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TMessagesProj/build.gradle
View File

@ -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')
}

BIN
TMessagesProj/libs/relaybaton-release.aar
View File

Binary file not shown.

1
TMessagesProj/src/main/AndroidManifest.xml
View File

@ -205,7 +205,6 @@
<data android:scheme="vmess1" />
<data android:scheme="ss" />
<data android:scheme="ssr" />
<data android:scheme="rb" />
</intent-filter>
<intent-filter
android:icon="@mipmap/ic_launcher"

BIN
TMessagesProj/src/main/assets/GeoLite2-Country.mmdb
View File

Binary file not shown.

2
TMessagesProj/src/main/java/org/telegram/messenger/AndroidUtilities.java
View File

@ -306,7 +306,7 @@ public class AndroidUtilities {
}
}
final ArrayList<LinkSpec> 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;

36
TMessagesProj/src/main/java/org/telegram/messenger/SharedConfig.java
View File

@ -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") ||

2
TMessagesProj/src/main/java/org/telegram/ui/ProxyListActivity.java
View File

@ -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()));
}

4
TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/ProxyUtil.kt
View File

@ -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()) }