update tun2socket & remove ipv6 for VpnService
This commit is contained in:
15 files changed
+49
-62
No files matched your search
@@ -1,5 +1,5 @@
|
||||
package com.github.kr328.clash.pipeline
|
||||
|
||||
import com.github.kr328.clash.service.settings.BaseSettings
|
||||
import com.github.kr328.clash.common.settings.BaseSettings
|
||||
|
||||
data class Pipeline<T>(val input: T, val settings: BaseSettings)
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.github.kr328.clash.preference
|
||||
|
||||
import android.content.Context
|
||||
import com.github.kr328.clash.service.settings.BaseSettings
|
||||
import com.github.kr328.clash.common.settings.BaseSettings
|
||||
|
||||
class UiSettings(context: Context) :
|
||||
BaseSettings(context.getSharedPreferences(FILE_NAME, Context.MODE_PRIVATE)) {
|
||||
|
||||
@@ -11,7 +11,6 @@ import com.github.kr328.clash.service.util.intent
|
||||
class NetworkFragment : BaseSettingFragment() {
|
||||
companion object {
|
||||
private const val KEY_ENABLE_VPN_SERVICE = "enable_vpn_service"
|
||||
private const val KEY_IPV6 = "ipv6"
|
||||
private const val BYPASS_PRIVATE_NETWORK = "bypass_private_network"
|
||||
private const val KEY_DNS_HIJACKING = "dns_hijacking"
|
||||
private const val KEY_DNS_OVERRIDE = "dns_override"
|
||||
@@ -34,7 +33,6 @@ class NetworkFragment : BaseSettingFragment() {
|
||||
override fun onCreateDataStore(): SettingsDataStore {
|
||||
return SettingsDataStore().apply {
|
||||
on(KEY_ENABLE_VPN_SERVICE, UiSettings.ENABLE_VPN.asSource(ui))
|
||||
on(KEY_IPV6, ServiceSettings.IPV6_SUPPORT.asSource(service))
|
||||
on(BYPASS_PRIVATE_NETWORK, ServiceSettings.BYPASS_PRIVATE_NETWORK.asSource(service))
|
||||
on(KEY_DNS_HIJACKING, ServiceSettings.DNS_HIJACKING.asSource(service))
|
||||
on(KEY_DNS_OVERRIDE, ServiceSettings.OVERRIDE_DNS.asSource(service))
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.github.kr328.clash.settings
|
||||
|
||||
import com.github.kr328.clash.service.settings.BaseSettings
|
||||
import com.github.kr328.clash.common.settings.BaseSettings
|
||||
import moe.shizuku.preference.PreferenceDataStore
|
||||
|
||||
class SettingsDataStore : PreferenceDataStore() {
|
||||
|
||||
@@ -7,11 +7,6 @@
|
||||
android:summary="@string/routing_via_vpn_service"
|
||||
android:defaultValue="true" />
|
||||
<PreferenceCategory android:title="@string/vpn_service" android:dependency="enable_vpn_service">
|
||||
<SwitchPreference
|
||||
android:key="ipv6"
|
||||
android:title="@string/ipv6"
|
||||
android:summary="@string/enable_ipv6"
|
||||
android:defaultValue="false"/>
|
||||
<SwitchPreference
|
||||
android:key="bypass_private_network"
|
||||
android:title="@string/bypass_private_network"
|
||||
|
||||
Reference in new issue
Block a user