Replace strict mode with fallback upstream interface
Fixes #40. Apparently we can no longer take advantage of default network rules set by Android system since Android 9.0 thanks to this commit: 758627c4d9
This commit is contained in:
Mygod
@@ -1,6 +0,0 @@
|
||||
<vector android:autoMirrored="true" android:height="24dp"
|
||||
android:viewportHeight="24.0" android:viewportWidth="24.0"
|
||||
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:tint="?attr/colorControlNormal">
|
||||
<path android:fillColor="#FF000000" android:pathData="M23,5.5V20c0,2.2 -1.8,4 -4,4h-7.3c-1.08,0 -2.1,-0.43 -2.85,-1.19L1,14.83s1.26,-1.23 1.3,-1.25c0.22,-0.19 0.49,-0.29 0.79,-0.29 0.22,0 0.42,0.06 0.6,0.16 0.04,0.01 4.31,2.46 4.31,2.46V4c0,-0.83 0.67,-1.5 1.5,-1.5S11,3.17 11,4v7h1V1.5c0,-0.83 0.67,-1.5 1.5,-1.5S15,0.67 15,1.5V11h1V2.5c0,-0.83 0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5V11h1V5.5c0,-0.83 0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5z"/>
|
||||
</vector>
|
||||
@@ -0,0 +1,10 @@
|
||||
<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>
|
||||
@@ -64,7 +64,7 @@
|
||||
<string name="clients_nickname_title">%s 的昵称</string>
|
||||
<string name="clients_stats_title">%s 的流量</string>
|
||||
<plurals name="clients_stats_message_1">
|
||||
<item quantity="other">自 %2$s 以来连了 %1$s 次</item>
|
||||
<item quantity="other">自 %2$s 以来重新路由了 %1$s 次</item>
|
||||
</plurals>
|
||||
<plurals name="clients_stats_message_2">
|
||||
<item quantity="other">上传 %1$s 个包，%2$s</item>
|
||||
@@ -79,14 +79,14 @@
|
||||
<string name="settings_service_masquerade_summary">建议使用广告拦截器与 socksfier 等虚拟 VPN 应用时禁用此选项。</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_repeater_strict">严格模式</string>
|
||||
<string name="settings_service_repeater_strict_summary">只允许通过 VPN 隧道的包通过</string>
|
||||
<string name="settings_service_disable_ipv6">禁用 IPv6 共享</string>
|
||||
<string name="settings_service_disable_ipv6_summary">防止 IPv6 VPN 泄漏。</string>
|
||||
<string name="settings_service_repeater_start_on_boot">开机自启动中继</string>
|
||||
<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>
|
||||
|
||||
@@ -68,8 +68,8 @@
|
||||
<string name="clients_nickname_title">Nickname for %s</string>
|
||||
<string name="clients_stats_title">Stats for %s</string>
|
||||
<plurals name="clients_stats_message_1">
|
||||
<item quantity="one">Connected 1 time since %2$s</item>
|
||||
<item quantity="other">Connected %1$s times since %2$s</item>
|
||||
<item quantity="one">Rerouted 1 time since %2$s</item>
|
||||
<item quantity="other">Rerouted %1$s times since %2$s</item>
|
||||
</plurals>
|
||||
<plurals name="clients_stats_message_2">
|
||||
<item quantity="one">Sent 1 packet, %2$s</item>
|
||||
@@ -87,14 +87,14 @@
|
||||
ad-blockers and socksifiers.</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_repeater_strict">Strict mode</string>
|
||||
<string name="settings_service_repeater_strict_summary">Only allow packets that goes through VPN tunnel.</string>
|
||||
<string name="settings_service_disable_ipv6">Disable IPv6 tethering</string>
|
||||
<string name="settings_service_disable_ipv6_summary">Enabling this option will prevent VPN leaks via IPv6.</string>
|
||||
<string name="settings_service_repeater_start_on_boot">Start repeater on boot</string>
|
||||
<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>
|
||||
|
||||
@@ -14,6 +14,13 @@
|
||||
android:summary="@string/settings_service_upstream_auto"
|
||||
android:hint="@string/settings_service_upstream_auto"
|
||||
android:singleLine="true"/>
|
||||
<be.mygod.vpnhotspot.preference.AlwaysAutoCompleteEditTextPreference
|
||||
android:key="service.upstream.fallback"
|
||||
android:icon="@drawable/ic_action_settings_input_component"
|
||||
android:title="@string/settings_upstream_fallback"
|
||||
android:summary="@string/settings_upstream_fallback_auto"
|
||||
android:hint="@string/settings_upstream_fallback_auto"
|
||||
android:singleLine="true"/>
|
||||
<SwitchPreference
|
||||
android:key="service.masquerade"
|
||||
android:icon="@drawable/ic_social_people"
|
||||
@@ -23,11 +30,6 @@
|
||||
</PreferenceCategory>
|
||||
<PreferenceCategory
|
||||
android:title="@string/settings_downstream">
|
||||
<SwitchPreference
|
||||
android:key="service.repeater.strict"
|
||||
android:icon="@drawable/ic_action_pan_tool"
|
||||
android:title="@string/settings_service_repeater_strict"
|
||||
android:summary="@string/settings_service_repeater_strict_summary"/>
|
||||
<SwitchPreference
|
||||
android:key="service.disableIpv6"
|
||||
android:icon="@drawable/ic_image_looks_6"
|
||||
|
||||
Reference in New Issue
Block a user