Northern_Lights/NekoBoxForAndroid
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/NekoBoxForAndroid.git synced 2025-12-19 22:50:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
arm64v8a 2023-07-08 14:01:56 +09:00
parent fb5702ca29
commit e2ce135d3c
4 changed files with 56 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
app/src/main/java/io/nekohasekai/sagernet/group/RawUpdater.kt
View File

@ -292,8 +292,9 @@ object RawUpdater : GroupUpdater() {
} }
} }
for (opt in proxy) { for (opt in proxy) {
if (opt.value == null) continue
when (opt.key.replace("_", "-")) { when (opt.key.replace("_", "-")) {
"name" -> bean.name = opt.value?.toString() "name" -> bean.name = opt.value.toString()
"server" -> bean.serverAddress = opt.value as String "server" -> bean.serverAddress = opt.value as String
"port" -> bean.serverPort = opt.value.toString().toInt() "port" -> bean.serverPort = opt.value.toString().toInt()
"uuid" -> bean.uuid = opt.value as String "uuid" -> bean.uuid = opt.value as String
@ -325,12 +326,12 @@ object RawUpdater : GroupUpdater() {
opt.value as String opt.value as String
"tls" -> bean.security = "tls" -> bean.security =
if (opt.value?.toString() == "true") "tls" else "" if (opt.value.toString() == "true") "tls" else ""
"skip-cert-verify" -> bean.allowInsecure = "skip-cert-verify" -> bean.allowInsecure =
opt.value?.toString() == "true" opt.value.toString() == "true"
"ws-path" -> bean.path = opt.value?.toString() "ws-path" -> bean.path = opt.value.toString()
"ws-headers" -> for (wsHeader in (opt.value as Map<String, Any>)) { "ws-headers" -> for (wsHeader in (opt.value as Map<String, Any>)) {
when (wsHeader.key.lowercase()) { when (wsHeader.key.lowercase()) {
"host" -> bean.host = wsHeader.value.toString() "host" -> bean.host = wsHeader.value.toString()
@ -359,7 +360,7 @@ object RawUpdater : GroupUpdater() {
} }
} }
"servername" -> bean.host = opt.value?.toString() "servername" -> bean.host = opt.value.toString()
// The format of the VMessBean is wrong, so the `host` `path` has some strange transformations here. // The format of the VMessBean is wrong, so the `host` `path` has some strange transformations here.
"h2-opts", "h2-opt" -> for (h2Opt in (opt.value as Map<String, Any>)) { "h2-opts", "h2-opt" -> for (h2Opt in (opt.value as Map<String, Any>)) {
when (h2Opt.key.lowercase()) { when (h2Opt.key.lowercase()) {
@ -412,20 +413,21 @@ object RawUpdater : GroupUpdater() {
val bean = TrojanBean() val bean = TrojanBean()
bean.security = "tls" bean.security = "tls"
for (opt in proxy) { for (opt in proxy) {
if (opt.value == null) continue
when (opt.key.replace("_", "-")) { when (opt.key.replace("_", "-")) {
"name" -> bean.name = opt.value?.toString() "name" -> bean.name = opt.value.toString()
"server" -> bean.serverAddress = opt.value as String "server" -> bean.serverAddress = opt.value as String
"port" -> bean.serverPort = opt.value.toString().toInt() "port" -> bean.serverPort = opt.value.toString().toInt()
"password" -> bean.password = opt.value?.toString() "password" -> bean.password = opt.value.toString()
"client-fingerprint" -> bean.utlsFingerprint = "client-fingerprint" -> bean.utlsFingerprint =
opt.value as String opt.value as String
"sni" -> bean.sni = opt.value?.toString() "sni" -> bean.sni = opt.value.toString()
"skip-cert-verify" -> bean.allowInsecure = "skip-cert-verify" -> bean.allowInsecure =
opt.value?.toString() == "true" opt.value.toString() == "true"
"network" -> when (opt.value) { "network" -> when (opt.value) {
"ws", "grpc" -> bean.type = opt.value?.toString() "ws", "grpc" -> bean.type = opt.value.toString()
} }
"ws-opts", "ws-opt" -> for (wsOpt in (opt.value as Map<String, Any>)) { "ws-opts", "ws-opt" -> for (wsOpt in (opt.value as Map<String, Any>)) {
@ -456,8 +458,9 @@ object RawUpdater : GroupUpdater() {
"hysteria" -> { "hysteria" -> {
val bean = HysteriaBean() val bean = HysteriaBean()
for (opt in proxy) { for (opt in proxy) {
if (opt.value == null) continue
when (opt.key.replace("_", "-")) { when (opt.key.replace("_", "-")) {
"name" -> bean.name = opt.value?.toString() "name" -> bean.name = opt.value.toString()
"server" -> bean.serverAddress = opt.value as String "server" -> bean.serverAddress = opt.value as String
"port" -> bean.serverPort = opt.value.toString().toInt() "port" -> bean.serverPort = opt.value.toString().toInt()
@ -465,30 +468,30 @@ object RawUpdater : GroupUpdater() {
"auth-str" -> { "auth-str" -> {
bean.authPayloadType = HysteriaBean.TYPE_STRING bean.authPayloadType = HysteriaBean.TYPE_STRING
bean.authPayload = opt.value?.toString() bean.authPayload = opt.value.toString()
} }
"sni" -> bean.sni = opt.value?.toString() "sni" -> bean.sni = opt.value.toString()
"skip-cert-verify" -> bean.allowInsecure = "skip-cert-verify" -> bean.allowInsecure =
opt.value?.toString() == "true" opt.value.toString() == "true"
"up" -> bean.uploadMbps = "up" -> bean.uploadMbps =
opt.value?.toString()?.substringBefore(" ")?.toIntOrNull() opt.value.toString().substringBefore(" ").toIntOrNull()
?: 100 ?: 100
"down" -> bean.downloadMbps = "down" -> bean.downloadMbps =
opt.value?.toString()?.substringBefore(" ")?.toIntOrNull() opt.value.toString().substringBefore(" ").toIntOrNull()
?: 100 ?: 100
"recv-window-conn" -> bean.connectionReceiveWindow = "recv-window-conn" -> bean.connectionReceiveWindow =
opt.value?.toString()?.toIntOrNull() ?: 0 opt.value.toString().toIntOrNull() ?: 0
"recv-window" -> bean.streamReceiveWindow = "recv-window" -> bean.streamReceiveWindow =
opt.value?.toString()?.toIntOrNull() ?: 0 opt.value.toString().toIntOrNull() ?: 0
"disable-mtu-discovery" -> bean.disableMtuDiscovery = "disable-mtu-discovery" -> bean.disableMtuDiscovery =
opt.value?.toString() == "true" || opt.value?.toString() == "1" opt.value.toString() == "true" || opt.value.toString() == "1"
"alpn" -> { "alpn" -> {
val alpn = (opt.value as? (List<String>)) val alpn = (opt.value as? (List<String>))
@ -504,8 +507,9 @@ object RawUpdater : GroupUpdater() {
val bean = TuicBean() val bean = TuicBean()
var ip = "" var ip = ""
for (opt in proxy) { for (opt in proxy) {
if (opt.value == null) continue
when (opt.key.replace("_", "-")) { when (opt.key.replace("_", "-")) {
"name" -> bean.name = opt.value?.toString() "name" -> bean.name = opt.value.toString()
"server" -> bean.serverAddress = opt.value.toString() "server" -> bean.serverAddress = opt.value.toString()
"ip" -> ip = opt.value.toString() "ip" -> ip = opt.value.toString()
"port" -> bean.serverPort = opt.value.toString().toInt() "port" -> bean.serverPort = opt.value.toString().toInt()
@ -520,13 +524,13 @@ object RawUpdater : GroupUpdater() {
"password" -> bean.token = opt.value.toString() "password" -> bean.token = opt.value.toString()
"skip-cert-verify" -> bean.allowInsecure = "skip-cert-verify" -> bean.allowInsecure =
opt.value?.toString() == "true" opt.value.toString() == "true"
"disable-sni" -> bean.disableSNI = "disable-sni" -> bean.disableSNI =
opt.value?.toString() == "true" opt.value.toString() == "true"
"reduce-rtt" -> bean.reduceRTT = "reduce-rtt" -> bean.reduceRTT =
opt.value?.toString() == "true" opt.value.toString() == "true"
"sni" -> bean.sni = opt.value.toString() "sni" -> bean.sni = opt.value.toString()

3
app/src/main/java/io/nekohasekai/sagernet/ui/AppManagerActivity.kt
View File

@ -246,8 +246,9 @@ class AppManagerActivity : ThemedActivity() {
when (item.itemId) { when (item.itemId) {
R.id.action_invert_selections -> { R.id.action_invert_selections -> {
runOnDefaultDispatcher { runOnDefaultDispatcher {
val proxiedUidsOld = proxiedUids.clone()
for (app in apps) { for (app in apps) {
if (proxiedUids.contains(app.uid)) { if (proxiedUidsOld.contains(app.uid)) {
proxiedUids.delete(app.uid) proxiedUids.delete(app.uid)
} else { } else {
proxiedUids[app.uid] = true proxiedUids[app.uid] = true

47
app/src/main/java/io/nekohasekai/sagernet/ui/GroupFragment.kt
View File

@ -29,6 +29,7 @@ import io.nekohasekai.sagernet.widget.UndoSnackbarManager
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import moe.matsuri.nb4a.utils.Util import moe.matsuri.nb4a.utils.Util
import moe.matsuri.nb4a.utils.toBytesString import moe.matsuri.nb4a.utils.toBytesString
import java.lang.NumberFormatException
import java.util.* import java.util.*
class GroupFragment : ToolbarFragment(R.layout.layout_group), class GroupFragment : ToolbarFragment(R.layout.layout_group),
@ -465,27 +466,31 @@ class GroupFragment : ToolbarFragment(R.layout.layout_group),
}.firstOrNull() }.firstOrNull()
} }
var used: Long = 0 try {
get("upload=([0-9]+)")?.apply { var used: Long = 0
used += toLong() get("upload=([0-9]+)")?.apply {
} used += toLong()
get("download=([0-9]+)")?.apply { }
used += toLong() get("download=([0-9]+)")?.apply {
} used += toLong()
val total = get("total=([0-9]+)")?.toLong() ?: 0 }
if (used > 0 || total > 0) { val total = get("total=([0-9]+)")?.toLong() ?: 0
text += getString( if (used > 0 || total > 0) {
R.string.subscription_traffic, text += getString(
used.toBytesString(), R.string.subscription_traffic,
(total - used).toBytesString() used.toBytesString(),
) (total - used).toBytesString()
} )
get("expire=([0-9]+)")?.apply { }
text += "\n" get("expire=([0-9]+)")?.apply {
text += getString( text += "\n"
R.string.subscription_expire, text += getString(
Util.timeStamp2Text(this.toLong() * 1000) R.string.subscription_expire,
) Util.timeStamp2Text(this.toLong() * 1000)
)
}
} catch (_: NumberFormatException) {
// ignore
} }
if (text.isNotEmpty()) { if (text.isNotEmpty()) {

2
app/src/main/java/io/nekohasekai/sagernet/ui/MainActivity.kt
View File

@ -328,7 +328,7 @@ class MainActivity : ThemedActivity(),
R.id.nav_about -> displayFragment(AboutFragment()) R.id.nav_about -> displayFragment(AboutFragment())
R.id.nav_tuiguang -> { R.id.nav_tuiguang -> {
launchCustomTab("https://matsuricom.github.io/") launchCustomTab("https://matsuricom.pages.dev/")
return false return false
} }