From f1b6b1e87146eed36e879e9615d87aa78360d9a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=A4=CE=BF=20=CE=BC=CE=BF=CF=87=CE=B8=CE=B7=CF=81=CF=8C?= =?UTF-8?q?=20=5E=5F=5E?= <69906215+Malus-risus@users.noreply.github.com> Date: Mon, 19 Feb 2024 12:07:13 +0800 Subject: [PATCH 1/8] Update SettingsActivity.kt --- .../app/src/main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt index d38bf86d..8bb9bea2 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt @@ -83,7 +83,7 @@ class SettingsActivity : BaseActivity() { // It must be greater than 15 minutes because WorkManager couldn't run tasks under 15 minutes intervals nval = - if (TextUtils.isEmpty(nval) || (nval.toLong() < 15)) AppConfig.SUBSCRIPTION_DEFAULT_UPDATE_INTERVAL else nval + if (TextUtils.isEmpty(nval) || nval.toLong() < 15) AppConfig.SUBSCRIPTION_DEFAULT_UPDATE_INTERVAL else nval autoUpdateInterval?.summary = nval configureUpdateTask(nval.toLong()) true From 336b673746610e7fdd77d9dfbd0fac6d99930e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=A4=CE=BF=20=CE=BC=CE=BF=CF=87=CE=B8=CE=B7=CF=81=CF=8C?= =?UTF-8?q?=20=5E=5F=5E?= <69906215+Malus-risus@users.noreply.github.com> Date: Mon, 19 Feb 2024 12:38:24 +0800 Subject: [PATCH 2/8] Update AngConfigManager.kt --- .../src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt index fb68aab5..7d408fc6 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt @@ -996,8 +996,8 @@ object AngConfigManager { if (srv.inbounds != null && srv.outbounds != null && srv.routing != null) { val config = ServerConfig.create(EConfigType.CUSTOM) config.remarks = srv.remarks - ?: ("%04d-".format(count + 1) + System.currentTimeMillis() - .toString()) + ?: "%04d-".format(count + 1) + System.currentTimeMillis() + .toString() config.subscriptionId = subid config.fullConfig = srv val key = MmkvManager.encodeServerConfig("", config) From de9bbf842ffd5d9e29bcb4ec58b28efd8ecf3e15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=A4=CE=BF=20=CE=BC=CE=BF=CF=87=CE=B8=CE=B7=CF=81=CF=8C?= =?UTF-8?q?=20=5E=5F=5E?= <69906215+Malus-risus@users.noreply.github.com> Date: Mon, 19 Feb 2024 12:42:56 +0800 Subject: [PATCH 3/8] Update Utils.kt --- V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt index faa2d91c..f2639db7 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt @@ -210,7 +210,7 @@ object Utils { } fun isPureIpAddress(value: String): Boolean { - return (isIpv4Address(value) || isIpv6Address(value)) + return isIpv4Address(value) || isIpv6Address(value) } fun isIpv4Address(value: String): Boolean { From 3955bb16bc024b29f018314ea6e8d435cbf6bfea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=A4=CE=BF=20=CE=BC=CE=BF=CF=87=CE=B8=CE=B7=CF=81=CF=8C?= =?UTF-8?q?=20=5E=5F=5E?= <69906215+Malus-risus@users.noreply.github.com> Date: Mon, 19 Feb 2024 14:29:35 +0800 Subject: [PATCH 4/8] Update _Ext.kt --- V2rayNG/app/src/main/kotlin/com/v2ray/ang/extension/_Ext.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/extension/_Ext.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/extension/_Ext.kt index 91e3e9d8..2c2159aa 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/extension/_Ext.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/extension/_Ext.kt @@ -77,8 +77,8 @@ val URLConnection.responseLength: Long get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) contentLengthLong else contentLength.toLong() val URI.idnHost: String - get() = (host!!).replace("[", "").replace("]", "") + get() = host!!.replace("[", "").replace("]", "") fun String.removeWhiteSpace(): String { return this.replace(" ", "") -} \ No newline at end of file +} From 96d416066e8bea49f7ee3193649ab4d23eff8c09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=A4=CE=BF=20=CE=BC=CE=BF=CF=87=CE=B8=CE=B7=CF=81=CF=8C?= =?UTF-8?q?=20=5E=5F=5E?= <69906215+Malus-risus@users.noreply.github.com> Date: Mon, 19 Feb 2024 14:31:47 +0800 Subject: [PATCH 5/8] Update AppManagerUtil.kt --- .../app/src/main/kotlin/com/v2ray/ang/util/AppManagerUtil.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AppManagerUtil.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AppManagerUtil.kt index b95b408b..03e38e93 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AppManagerUtil.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AppManagerUtil.kt @@ -22,7 +22,7 @@ object AppManagerUtil { val appName = applicationInfo.loadLabel(packageManager).toString() val appIcon = applicationInfo.loadIcon(packageManager) - val isSystemApp = (applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM) > 0 + val isSystemApp = applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM > 0 val appInfo = AppInfo(appName, pkg.packageName, appIcon, isSystemApp, 0) apps.add(appInfo) From 748980aa1a9375c7966ca74247fbdcc44e34e0ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=A4=CE=BF=20=CE=BC=CE=BF=CF=87=CE=B8=CE=B7=CF=81=CF=8C?= =?UTF-8?q?=20=5E=5F=5E?= <69906215+Malus-risus@users.noreply.github.com> Date: Mon, 19 Feb 2024 14:33:12 +0800 Subject: [PATCH 6/8] Update PerAppProxyActivity.kt --- .../app/src/main/kotlin/com/v2ray/ang/ui/PerAppProxyActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/PerAppProxyActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/PerAppProxyActivity.kt index 4b17e638..155f1316 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/PerAppProxyActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/PerAppProxyActivity.kt @@ -50,7 +50,7 @@ class PerAppProxyActivity : BaseActivity() { .map { if (blacklist != null) { it.forEach { one -> - if ((blacklist.contains(one.packageName))) { + if (blacklist.contains(one.packageName)) { one.isSelected = 1 } else { one.isSelected = 0 From 7db2ddd1f7aa9da1ac5c9eea13c355d962f9f433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=A4=CE=BF=20=CE=BC=CE=BF=CF=87=CE=B8=CE=B7=CF=81=CF=8C?= =?UTF-8?q?=20=5E=5F=5E?= <69906215+Malus-risus@users.noreply.github.com> Date: Mon, 19 Feb 2024 14:34:50 +0800 Subject: [PATCH 7/8] Update V2RayServiceManager.kt --- .../main/kotlin/com/v2ray/ang/service/V2RayServiceManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayServiceManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayServiceManager.kt index 08cab75c..5a00685c 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayServiceManager.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayServiceManager.kt @@ -368,7 +368,7 @@ object V2RayServiceManager { } val directUplink = v2rayPoint.queryStats(TAG_DIRECT, "uplink") val directDownlink = v2rayPoint.queryStats(TAG_DIRECT, "downlink") - val zeroSpeed = (proxyTotal == 0L && directUplink == 0L && directDownlink == 0L) + val zeroSpeed = proxyTotal == 0L && directUplink == 0L && directDownlink == 0L if (!zeroSpeed || !lastZeroSpeed) { if (proxyTotal == 0L) { appendSpeedString(text, outboundTags?.firstOrNull(), 0.0, 0.0) From a893b877306f80eae8c02bdae8126d5b72d1cb10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=A4=CE=BF=20=CE=BC=CE=BF=CF=87=CE=B8=CE=B7=CF=81=CF=8C?= =?UTF-8?q?=20=5E=5F=5E?= <69906215+Malus-risus@users.noreply.github.com> Date: Mon, 19 Feb 2024 14:36:28 +0800 Subject: [PATCH 8/8] Update MainRecyclerAdapter.kt --- .../app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt index 49c70f01..1a990dad 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt @@ -66,7 +66,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter