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

Fix android service mode switch

Browse Source
This commit is contained in:
problematicconsumer
2024-01-04 22:22:22 +03:30
parent 6096c1c1ea
commit eed938f107
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,26 +92,24 @@ object Settings {
} }
} }
private var currentServiceMode = ServiceMode.NORMAL;
suspend fun rebuildServiceMode(): Boolean { suspend fun rebuildServiceMode(): Boolean {
var newMode = ServiceMode.NORMAL var newMode = ServiceMode.NORMAL
try {
if (serviceMode == ServiceMode.VPN) { if (serviceMode == ServiceMode.VPN) {
newMode = ServiceMode.VPN newMode = ServiceMode.VPN
} }
// try { } catch (_: Exception) {
// if (needVPNService()) { }
// newMode = ServiceMode.VPN if (currentServiceMode == newMode) {
// }
// } catch (_: Exception) {
// }
if (serviceMode == newMode) {
return false return false
} }
serviceMode = newMode currentServiceMode = newMode
return true return true
} }
private suspend fun needVPNService(): Boolean { private suspend fun needVPNService(): Boolean {
if (serviceMode == ServiceMode.VPN) return true
val filePath = activeConfigPath val filePath = activeConfigPath
if (filePath.isBlank()) return false if (filePath.isBlank()) return false
val content = JSONObject(File(filePath).readText()) val content = JSONObject(File(filePath).readText())