Add netd masquerade mode

This commit is contained in:
Mygod
2019-02-01 21:06:22 +08:00
parent 1dd8a9dcb6
commit f1973116ca
9 changed files with 84 additions and 37 deletions

View File

@@ -80,8 +80,10 @@
<string name="settings_upstream">上游</string>
<string name="settings_downstream">下游</string>
<string name="settings_service_masquerade">IP 掩蔽</string>
<string name="settings_service_masquerade_summary">建议使用广告拦截器与 socksfier 等虚拟 VPN 应用时禁用此选项。</string>
<string name="settings_service_masquerade">IP 掩蔽模式</string>
<string name="settings_service_masquerade_none"></string>
<string name="settings_service_masquerade_simple">简易</string>
<string name="settings_service_masquerade_netd">Android Netd 服务</string>
<string name="settings_service_repeater_oc">Wi\u2011Fi 运行频段 (不稳定)</string>
<string name="settings_service_repeater_oc_summary">"自动 (1\u201114 = 2.4GHz, 15\u2011165 = 5GHz)"</string>
<string name="settings_service_disable_ipv6">禁用 IPv6 共享</string>

View File

@@ -1,5 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="settings_service_masquerade">
<item>@string/settings_service_masquerade_none</item>
<item>@string/settings_service_masquerade_simple</item>
<item>@string/settings_service_masquerade_netd</item>
</string-array>
<string-array name="settings_service_masquerade_values">
<item>None</item>
<item>Simple</item>
<item>Netd</item>
</string-array>
<string-array name="settings_service_wifi_lock">
<item>@string/settings_service_wifi_lock_none</item>
<item>@string/settings_service_wifi_lock_full</item>
@@ -10,6 +21,7 @@
<item>Full</item>
<item>HighPerf</item>
</string-array>
<string-array name="settings_service_ip_monitor">
<item>@string/settings_service_ip_monitor_monitor</item>
<item>@string/settings_service_ip_monitor_monitor_root</item>

View File

@@ -86,9 +86,10 @@
<string name="settings_upstream">Upstream</string>
<string name="settings_downstream">Downstream</string>
<string name="settings_service_masquerade">IP Masquerade</string>
<string name="settings_service_masquerade_summary">Recommended to disable this option for dummy VPNs like
ad-blockers and socksifiers.</string>
<string name="settings_service_masquerade">IP Masquerade Mode</string>
<string name="settings_service_masquerade_none">None</string>
<string name="settings_service_masquerade_simple">Simple</string>
<string name="settings_service_masquerade_netd">Android Netd Service</string>
<string name="settings_service_repeater_oc">Operating Wi\u2011Fi channel (unstable)</string>
<string name="settings_service_repeater_oc_summary">Auto (1\u201114 = 2.4GHz, 15\u2011165 = 5GHz)</string>
<string name="settings_service_disable_ipv6">Disable IPv6 tethering</string>

View File

@@ -17,12 +17,13 @@
app:icon="@drawable/ic_action_settings_input_component"
app:title="@string/settings_upstream_fallback"
app:summary="@string/settings_upstream_fallback_auto"/>
<SwitchPreference
app:key="service.masquerade"
<com.takisoft.preferencex.SimpleMenuPreference
app:key="service.masqueradeMode"
app:icon="@drawable/ic_social_people"
app:title="@string/settings_service_masquerade"
app:summary="@string/settings_service_masquerade_summary"
app:defaultValue="true"/>
app:entries="@array/settings_service_masquerade"
app:entryValues="@array/settings_service_masquerade_values"
app:useSimpleSummaryProvider="true"/>
</PreferenceCategory>
<PreferenceCategory
app:title="@string/settings_downstream">
@@ -52,8 +53,8 @@
app:entries="@array/settings_service_wifi_lock"
app:entryValues="@array/settings_service_wifi_lock_values"
app:defaultValue="Full"
app:summary="%s"
app:title="@string/settings_service_wifi_lock"/>
app:title="@string/settings_service_wifi_lock"
app:useSimpleSummaryProvider="true"/>
<SwitchPreference
app:key="service.repeater.startOnBoot"
app:icon="@drawable/ic_action_autorenew"
@@ -64,8 +65,8 @@
app:entries="@array/settings_service_ip_monitor"
app:entryValues="@array/settings_service_ip_monitor_values"
app:defaultValue="Poll"
app:summary="%s"
app:title="@string/settings_service_ip_monitor"/>
app:title="@string/settings_service_ip_monitor"
app:useSimpleSummaryProvider="true"/>
</PreferenceCategory>
<PreferenceCategory
app:title="@string/settings_help">