vodorod/umbrix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 1 Wiki Activity

Fix android service mode

Browse Source
This commit is contained in:
problematicconsumer
2023-12-21 14:45:22 +03:30
parent c95b55106d
commit f62f2991b3
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
android/app/src/main/kotlin/com/hiddify/hiddify/Settings.kt
View File

@@ -55,7 +55,7 @@ object Settings {
set(value) = preferences.edit().putString(SettingsKey.ACTIVE_PROFILE_NAME, value).apply() set(value) = preferences.edit().putString(SettingsKey.ACTIVE_PROFILE_NAME, value).apply()
var serviceMode: String var serviceMode: String
get() = preferences.getString(SettingsKey.SERVICE_MODE, ServiceMode.NORMAL)!! get() = preferences.getString(SettingsKey.SERVICE_MODE, ServiceMode.VPN)!!
set(value) = preferences.edit().putString(SettingsKey.SERVICE_MODE, value).apply() set(value) = preferences.edit().putString(SettingsKey.SERVICE_MODE, value).apply()
var configOptions: String var configOptions: String
@@ -94,12 +94,15 @@ object Settings {
suspend fun rebuildServiceMode(): Boolean { suspend fun rebuildServiceMode(): Boolean {
var newMode = ServiceMode.NORMAL var newMode = ServiceMode.NORMAL
try { if (serviceMode == ServiceMode.VPN) {
if (needVPNService()) {
newMode = ServiceMode.VPN newMode = ServiceMode.VPN
} }
} catch (_: Exception) { // try {
} // if (needVPNService()) {
// newMode = ServiceMode.VPN
// }
// } catch (_: Exception) {
// }
if (serviceMode == newMode) { if (serviceMode == newMode) {
return false return false
} }

2
libcore

Submodule libcore updated: c499693ddc...4099f968e2