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

Fix trojan support

This commit is contained in:
世界 2020-10-22 02:38:41 +00:00
parent dad76e025d
commit c5146e0b66
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
TMessagesProj/src/main/java/tw/nekomimi/nekogram/VmessLoader.kt
View File

@ -142,6 +142,15 @@ class VmessLoader {
vmess.address = link.host
vmess.port = link.port
vmess.id = link.username
if (link.password.isNotBlank()) {
// https://github.com/trojan-gfw/igniter/issues/318
vmess.id += ":" + link.password
}
vmess.remarks = link.fragment ?: ""
return vmess

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

@ -118,7 +118,8 @@ object ProxyUtil {
line.startsWith(VMESS_PROTOCOL) ||
line.startsWith(VMESS1_PROTOCOL) ||
line.startsWith(SS_PROTOCOL) ||
line.startsWith(SSR_PROTOCOL) /*||
line.startsWith(SSR_PROTOCOL) ||
line.startsWith(TROJAN_PROTOCOL) /*||
line.startsWith(RB_PROTOCOL)*/) {
runCatching { proxies.add(SharedConfig.parseProxyInfo(line)) }.onFailure {
@ -150,8 +151,9 @@ 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(TROJAN_PROTOCOL) /*||
line.startsWith(RB_PROTOCOL)*/) {
runCatching { proxies.add(SharedConfig.parseProxyInfo(line)) }.onFailure {