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

refactor: Singbox's type name

Browse Source
This commit is contained in:
purofle 2023-11-01 23:13:32 +08:00
parent 612d1643d1
commit 3eb688d1e0
No known key found for this signature in database
GPG Key ID: 57DEC1478152D973
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/io/nekohasekai/sagernet/fmt/v2ray/StandardV2RayBean.java
View File

@ -71,6 +71,8 @@ public abstract class StandardV2RayBean extends AbstractBean {
if (JavaUtil.isNullOrBlank(type)) type = "tcp"; if (JavaUtil.isNullOrBlank(type)) type = "tcp";
else if ("h2".equals(type)) type = "http"; else if ("h2".equals(type)) type = "http";
type = type.toLowerCase();
if (JavaUtil.isNullOrBlank(host)) host = ""; if (JavaUtil.isNullOrBlank(host)) host = "";
if (JavaUtil.isNullOrBlank(path)) path = ""; if (JavaUtil.isNullOrBlank(path)) path = "";
@ -133,7 +135,7 @@ public abstract class StandardV2RayBean extends AbstractBean {
case "grpc": { case "grpc": {
output.writeString(path); output.writeString(path);
} }
case "httpUpgrade": { case "httpupgrade": {
output.writeString(host); output.writeString(host);
output.writeString(path); output.writeString(path);
@ -185,7 +187,7 @@ public abstract class StandardV2RayBean extends AbstractBean {
case "grpc": { case "grpc": {
path = input.readString(); path = input.readString();
} }
case "httpUpgrade": { case "httpupgrade": {
host = input.readString(); host = input.readString();
path = input.readString(); path = input.readString();
} }

10
app/src/main/java/io/nekohasekai/sagernet/fmt/v2ray/V2RayFmt.kt
View File

@ -117,7 +117,7 @@ fun parseV2Ray(link: String): StandardV2RayBean {
} }
} }
"httpUpgrade" -> { "httpupgrade" -> {
url.queryParameter("path")?.let { url.queryParameter("path")?.let {
bean.path = it bean.path = it
} }
@ -225,7 +225,7 @@ fun StandardV2RayBean.parseDuckSoft(url: HttpUrl) {
} }
} }
"httpUpgrade" -> { "httpupgrade" -> {
url.queryParameter("host")?.let { url.queryParameter("host")?.let {
host = it host = it
} }
@ -454,7 +454,7 @@ fun StandardV2RayBean.toUriVMessVLESSTrojan(isTrojan: Boolean): String {
when (type) { when (type) {
"tcp" -> {} "tcp" -> {}
"ws", "http", "httpUpgrade" -> { "ws", "http", "httpupgrade" -> {
if (host.isNotBlank()) { if (host.isNotBlank()) {
builder.addQueryParameter("host", host) builder.addQueryParameter("host", host)
} }
@ -583,9 +583,9 @@ fun buildSingBoxOutboundStreamSettings(bean: StandardV2RayBean): V2RayTransportO
} }
} }
"httpUpgrade" -> { "httpupgrade" -> {
return V2RayTransportOptions_HTTPUpgradeOptions().apply { return V2RayTransportOptions_HTTPUpgradeOptions().apply {
type = "httpUpgrade" type = "httpupgrade"
host = bean.host host = bean.host
path = bean.path path = bean.path
} }

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

@ -143,7 +143,7 @@ abstract class StandardV2RaySettingsActivity : ProfileSettingsActivity<StandardV
} }
} }
fun updateView(network: String) { private fun updateView(network: String) {
host.preference.isVisible = false host.preference.isVisible = false
path.preference.isVisible = false path.preference.isVisible = false
wsCategory.isVisible = false wsCategory.isVisible = false
@ -153,6 +153,7 @@ abstract class StandardV2RaySettingsActivity : ProfileSettingsActivity<StandardV
host.preference.setTitle(R.string.http_host) host.preference.setTitle(R.string.http_host)
path.preference.setTitle(R.string.http_path) path.preference.setTitle(R.string.http_path)
} }
"http" -> { "http" -> {
host.preference.setTitle(R.string.http_host) host.preference.setTitle(R.string.http_host)
path.preference.setTitle(R.string.http_path) path.preference.setTitle(R.string.http_path)