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

ws early data

Browse Source
This commit is contained in:
arm64v8a 2023-03-16 16:56:15 +09:00
parent 6695aff0ed
commit 7354a1f9ad
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/io/nekohasekai/sagernet/bg/proto/TrafficUpdater.kt
View File

@ -62,8 +62,8 @@ class TrafficUpdater(
} else { } else {
item.rx += diff.rx item.rx += diff.rx
item.tx += diff.tx item.tx += diff.tx
item.rxRate += diff.rxRate item.rxRate = diff.rxRate
item.txRate += diff.txRate item.txRate = diff.txRate
} }
} }
} }

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

@ -34,6 +34,8 @@ abstract class StandardV2RaySettingsActivity : ProfileSettingsActivity<StandardV
private val host = pbm.add(PreferenceBinding(Type.Text, "host")) private val host = pbm.add(PreferenceBinding(Type.Text, "host"))
private val path = pbm.add(PreferenceBinding(Type.Text, "path")) private val path = pbm.add(PreferenceBinding(Type.Text, "path"))
private val packetEncoding = pbm.add(PreferenceBinding(Type.TextToInt, "packetEncoding")) private val packetEncoding = pbm.add(PreferenceBinding(Type.TextToInt, "packetEncoding"))
private val wsMaxEarlyData = pbm.add(PreferenceBinding(Type.TextToInt, "wsMaxEarlyData"))
private val earlyDataHeaderName = pbm.add(PreferenceBinding(Type.Text, "earlyDataHeaderName"))
private val security = pbm.add(PreferenceBinding(Type.Text, "security")) private val security = pbm.add(PreferenceBinding(Type.Text, "security"))
private val sni = pbm.add(PreferenceBinding(Type.Text, "sni")) private val sni = pbm.add(PreferenceBinding(Type.Text, "sni"))
private val alpn = pbm.add(PreferenceBinding(Type.Text, "alpn")) private val alpn = pbm.add(PreferenceBinding(Type.Text, "alpn"))
@ -62,6 +64,7 @@ abstract class StandardV2RaySettingsActivity : ProfileSettingsActivity<StandardV
} }
lateinit var securityCategory: PreferenceCategory lateinit var securityCategory: PreferenceCategory
lateinit var wsCategory: PreferenceCategory
override fun PreferenceFragmentCompat.createPreferences( override fun PreferenceFragmentCompat.createPreferences(
savedInstanceState: Bundle?, savedInstanceState: Bundle?,
@ -70,6 +73,7 @@ abstract class StandardV2RaySettingsActivity : ProfileSettingsActivity<StandardV
addPreferencesFromResource(R.xml.standard_v2ray_preferences) addPreferencesFromResource(R.xml.standard_v2ray_preferences)
pbm.setPreferenceFragment(this) pbm.setPreferenceFragment(this)
securityCategory = findPreference(Key.SERVER_SECURITY_CATEGORY)!! securityCategory = findPreference(Key.SERVER_SECURITY_CATEGORY)!!
wsCategory = findPreference(Key.SERVER_WS_CATEGORY)!!
serverPort.preference.apply { serverPort.preference.apply {
this as EditTextPreference this as EditTextPreference
@ -133,6 +137,7 @@ abstract class StandardV2RaySettingsActivity : ProfileSettingsActivity<StandardV
fun updateView(network: String) { fun updateView(network: String) {
host.preference.isVisible = false host.preference.isVisible = false
path.preference.isVisible = false path.preference.isVisible = false
wsCategory.isVisible = false
when (network) { when (network) {
"tcp" -> { "tcp" -> {
@ -150,6 +155,7 @@ abstract class StandardV2RaySettingsActivity : ProfileSettingsActivity<StandardV
path.preference.setTitle(R.string.ws_path) path.preference.setTitle(R.string.ws_path)
host.preference.isVisible = true host.preference.isVisible = true
path.preference.isVisible = true path.preference.isVisible = true
wsCategory.isVisible = true
} }
"grpc" -> { "grpc" -> {
path.preference.setTitle(R.string.grpc_service_name) path.preference.setTitle(R.string.grpc_service_name)

17
app/src/main/res/xml/standard_v2ray_preferences.xml
View File

@ -78,6 +78,23 @@
app:useSimpleSummaryProvider="true" /> app:useSimpleSummaryProvider="true" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory
app:key="serverWsCategory"
app:title="@string/cag_ws">
<EditTextPreference
app:defaultValue="0"
app:icon="@drawable/ic_baseline_compare_arrows_24"
app:key="wsMaxEarlyData"
app:title="@string/ws_max_early_data"
app:useSimpleSummaryProvider="true" />
<EditTextPreference
app:icon="@drawable/ic_baseline_stream_24"
app:key="earlyDataHeaderName"
app:title="@string/early_data_header_name"
app:useSimpleSummaryProvider="true" />
</PreferenceCategory>
<PreferenceCategory <PreferenceCategory
app:key="serverSecurityCategory" app:key="serverSecurityCategory"
app:title="@string/security_settings"> app:title="@string/security_settings">