Remove fallback upstream monitor

This option has been deprecated. As a replacement, if one wants to forbid fallback communication, a global routed VPN can be used instead.
This commit is contained in:
Mygod
2019-02-01 21:11:49 +08:00
parent f1973116ca
commit 99e721bf7e
7 changed files with 19 additions and 83 deletions

View File

@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="#FF000000"
android:pathData="M5,2c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v4L1,6v6h6L7,6L5,6L5,2zM9,16c0,1.3 0.84,2.4 2,2.82L11,23h2v-4.18c1.16,-0.41 2,-1.51 2,-2.82v-2L9,14v2zM1,16c0,1.3 0.84,2.4 2,2.82L3,23h2v-4.18C6.16,18.4 7,17.3 7,16v-2L1,14v2zM21,6L21,2c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v4h-2v6h6L23,6h-2zM13,2c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v4L9,6v6h6L15,6h-2L13,2zM17,16c0,1.3 0.84,2.4 2,2.82L19,23h2v-4.18c1.16,-0.41 2,-1.51 2,-2.82v-2h-6v2z"/>
</vector>

View File

@@ -100,8 +100,6 @@
<string name="settings_service_dns">备用 DNS 服务器[:端口]</string>
<string name="settings_service_upstream">上游网络接口</string>
<string name="settings_service_upstream_auto">自动检测系统 VPN</string>
<string name="settings_upstream_fallback">备用上游接口</string>
<string name="settings_upstream_fallback_auto">自动检测系统默认网络</string>
<string name="settings_service_clean">清理/重新应用路由规则</string>
<string name="settings_service_clean_summary">将修改的设置应用到当前启用的服务上。也可用于修复偶尔会发生的竞态条件。</string>
<string name="settings_service_dhcp_workaround">尝试修复 DHCP</string>

View File

@@ -106,8 +106,6 @@
<string name="settings_service_dns">Fallback DNS server[:port]</string>
<string name="settings_service_upstream">Upstream network interface</string>
<string name="settings_service_upstream_auto">Auto detect system VPN</string>
<string name="settings_upstream_fallback">Fallback upstream interface</string>
<string name="settings_upstream_fallback_auto">Auto detect system default network</string>
<string name="settings_service_dhcp_workaround">Enable DHCP workaround</string>
<string name="settings_service_dhcp_workaround_summary">Use this if clients cannot obtain IP addresses.</string>
<string name="settings_service_clean">Clean/reapply routing rules</string>

View File

@@ -12,11 +12,6 @@
app:icon="@drawable/ic_action_settings_ethernet"
app:title="@string/settings_service_upstream"
app:summary="@string/settings_service_upstream_auto"/>
<be.mygod.vpnhotspot.preference.AlwaysAutoCompleteEditTextPreference
app:key="service.upstream.fallback"
app:icon="@drawable/ic_action_settings_input_component"
app:title="@string/settings_upstream_fallback"
app:summary="@string/settings_upstream_fallback_auto"/>
<com.takisoft.preferencex.SimpleMenuPreference
app:key="service.masqueradeMode"
app:icon="@drawable/ic_social_people"