diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/App.kt b/mobile/src/main/java/be/mygod/vpnhotspot/App.kt index dfabee80..12d387e5 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/App.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/App.kt @@ -30,7 +30,6 @@ class App : Application() { deviceContext.moveSharedPreferencesFrom(this, PreferenceManager.getDefaultSharedPreferencesName(this)) } else deviceContext = this // workaround for support lib PreferenceDataStore bug - operatingChannel = operatingChannel dns = dns ServiceNotification.updateNotificationChannels() } @@ -45,12 +44,10 @@ class App : Application() { val pref: SharedPreferences by lazy { PreferenceManager.getDefaultSharedPreferences(deviceContext) } val connectivity by lazy { getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager } - var operatingChannel: Int - get() { - val result = pref.getString(KEY_OPERATING_CHANNEL, null)?.toIntOrNull() ?: 0 - return if (result in 0..165) result else 0 - } - set(value) = pref.edit().putString(KEY_OPERATING_CHANNEL, value.toString()).apply() + val operatingChannel: Int get() { + val result = pref.getString(KEY_OPERATING_CHANNEL, null)?.toIntOrNull() ?: 0 + return if (result in 1..165) result else 0 + } var dns: String get() = pref.getString(KEY_DNS, "8.8.8.8") set(value) = pref.edit().putString(KEY_DNS, value).apply() diff --git a/mobile/src/main/res/values-zh-rCN/strings.xml b/mobile/src/main/res/values-zh-rCN/strings.xml index 71b4b87c..01c236c4 100644 --- a/mobile/src/main/res/values-zh-rCN/strings.xml +++ b/mobile/src/main/res/values-zh-rCN/strings.xml @@ -52,7 +52,7 @@ 服务 Wi\u2011Fi 运行频段 (不稳定) - "%s (0 = 自动, 1\u201114 = 2.4GHz, 15\u2011165 = 5GHz)" + "自动 (1\u201114 = 2.4GHz, 15\u2011165 = 5GHz)" 严格模式 只允许通过 VPN 隧道的包通过 备用 DNS 服务器[:端口] diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml index 577fcbc5..319bbbf5 100644 --- a/mobile/src/main/res/values/strings.xml +++ b/mobile/src/main/res/values/strings.xml @@ -55,7 +55,7 @@ Service Operating Wi\u2011Fi channel (unstable) - %s (0 = auto, 1\u201114 = 2.4GHz, 15\u2011165 = 5GHz) + Auto (1\u201114 = 2.4GHz, 15\u2011165 = 5GHz) Strict mode Only allow packets that goes through VPN tunnel Fallback DNS server[:port] diff --git a/mobile/src/main/res/xml/pref_settings.xml b/mobile/src/main/res/xml/pref_settings.xml index 850be482..831b4596 100644 --- a/mobile/src/main/res/xml/pref_settings.xml +++ b/mobile/src/main/res/xml/pref_settings.xml @@ -1,15 +1,14 @@ - + + android:maxLength="3"/>