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

! 喵 (更新

This commit is contained in:
世界 2020-04-02 13:41:17 +08:00
parent 940554cf15
commit 0a40561006
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TMessagesProj/build.gradle
View File

@ -17,7 +17,7 @@ dependencies {
implementation 'androidx.exifinterface:exifinterface:1.1.0'
implementation "androidx.interpolator:interpolator:1.0.0"
compileOnly 'org.checkerframework:checker-qual:3.2.0'
compileOnly 'org.checkerframework:checker-qual:3.3.0'
compileOnly 'org.checkerframework:checker-compat-qual:2.5.5'
implementation 'com.googlecode.mp4parser:isoparser:1.1.22'
implementation 'com.google.code.gson:gson:2.8.6'
@ -231,8 +231,8 @@ android {
minSdkVersion 16
targetSdkVersion 29
versionName "6.0.1.3"
versionCode = 7
versionName "6.0.1.5"
versionCode = 9
vectorDrawables.generatedDensities = ['mdpi', 'hdpi', 'xhdpi', 'xxhdpi']

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

@ -156,8 +156,8 @@ public class SharedConfig {
return (int) (info.ping - ping);
}
public boolean isInternal = false;
public String descripton;
public boolean isInternal;
public boolean isPublic;
public ProxyInfo() {
address = "";
@ -191,11 +191,11 @@ public class SharedConfig {
if (StrUtil.isBlank(remarks)) {
return "[MTProto] " + address + ":" + port;
return (isPublic ? LocaleController.getString("PublicPrefix",R.string.PublicPrefix) : "[MTProto] ") + address + ":" + port;
} else {
return "[MTProto] " + remarks;
return (isPublic ? LocaleController.getString("PublicPrefix",R.string.PublicPrefix) : "[MTProto] ") + remarks;
}
@ -439,11 +439,11 @@ public class SharedConfig {
if (StrUtil.isBlank(getRemarks())) {
return "[Vmess] " + bean.getAddress() + ":" + bean.getPort();
return (isPublic ? LocaleController.getString("PublicPrefix",R.string.PublicPrefix) : "[Vmess] ") + bean.getAddress() + ":" + bean.getPort();
} else {
return "[Vmess] " + getRemarks();
return (isPublic ? LocaleController.getString("PublicPrefix",R.string.PublicPrefix) : "[Vmess] ") + getRemarks();
}
@ -541,11 +541,11 @@ public class SharedConfig {
if (StrUtil.isBlank(getRemarks())) {
return "[SS] " + bean.getHost() + ":" + bean.getRemotePort();
return (isPublic ? LocaleController.getString("PublicPrefix",R.string.PublicPrefix) : "[SS] ") + bean.getHost() + ":" + bean.getRemotePort();
} else {
return "[SS] " + getRemarks();
return (isPublic ? LocaleController.getString("PublicPrefix",R.string.PublicPrefix) : "[SS] ") + getRemarks();
}
@ -646,11 +646,11 @@ public class SharedConfig {
if (StrUtil.isBlank(getRemarks())) {
return "[SSR] " + bean.getHost() + ":" + bean.getRemotePort();
return (isPublic ? LocaleController.getString("PublicPrefix",R.string.PublicPrefix) : "[SSR] ") + bean.getHost() + ":" + bean.getRemotePort();
} else {
return "[SSR] " + getRemarks();
return (isPublic ? LocaleController.getString("PublicPrefix",R.string.PublicPrefix) : "[SSR] ") + getRemarks();
}
@ -1457,6 +1457,7 @@ public class SharedConfig {
}
info.isInternal = true;
info.isPublic = true;
proxyList.add(info);

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

@ -153,7 +153,7 @@ public class ProxyListActivity extends BaseFragment implements NotificationCente
@SuppressLint("SetTextI18n")
public void setProxy(SharedConfig.ProxyInfo proxyInfo) {
if (proxyInfo.isInternal) {
if (proxyInfo.isInternal && !proxyInfo.isPublic) {
textView.setText(LocaleController.formatString("NekoXProxy", R.string.NekoXProxy));
} else {
textView.setText(proxyInfo.getTitle());
@ -1008,9 +1008,7 @@ public class ProxyListActivity extends BaseFragment implements NotificationCente
proxyInfo.availableCheckTime = SystemClock.elapsedRealtime();
if (time == -1) {
if (repeat > 0) {
UIUtil.runOnIoDispatcher(() -> {
checkSingleProxy(proxyInfo, repeat - 1);
});
checkSingleProxy(proxyInfo, repeat - 1);
} else {
proxyInfo.checking = false;
proxyInfo.available = false;