diff --git a/app/src/main/java/io/nekohasekai/sagernet/fmt/hysteria/HysteriaFmt.kt b/app/src/main/java/io/nekohasekai/sagernet/fmt/hysteria/HysteriaFmt.kt index a6f0e10..d3c8ef6 100644 --- a/app/src/main/java/io/nekohasekai/sagernet/fmt/hysteria/HysteriaFmt.kt +++ b/app/src/main/java/io/nekohasekai/sagernet/fmt/hysteria/HysteriaFmt.kt @@ -284,7 +284,7 @@ fun buildSingBoxOutboundHysteriaBean(bean: HysteriaBean): MutableMap mutableMapOf("error_version" to bean.protocolVersion) } } + +fun hopPortsToSingboxList(s: String): List { + return s.split(",").mapNotNull { + val pRange = it.replace("-", ":") + if (pRange.split(":").size == 2) { + pRange + } else { + null + } + } +} diff --git a/app/src/main/java/moe/matsuri/nb4a/SingBoxOptions.java b/app/src/main/java/moe/matsuri/nb4a/SingBoxOptions.java index 425cf42..8e7e137 100644 --- a/app/src/main/java/moe/matsuri/nb4a/SingBoxOptions.java +++ b/app/src/main/java/moe/matsuri/nb4a/SingBoxOptions.java @@ -449,7 +449,7 @@ public class SingBoxOptions { public OutboundTLSOptions tls; - public String server_ports; + public List server_ports; public String hop_interval; @@ -575,7 +575,7 @@ public class SingBoxOptions { public OutboundTLSOptions tls; - public String server_ports; + public List server_ports; public String hop_interval; @@ -3902,7 +3902,7 @@ public class SingBoxOptions { public OutboundTLSOptions tls; - public String server_ports; + public List server_ports; public String hop_interval; @@ -4276,7 +4276,7 @@ public class SingBoxOptions { public OutboundTLSOptions tls; - public String server_ports; + public List server_ports; public String hop_interval;