From f62f2991b3976c79b1bc2bc09dff99e47e8f8500 Mon Sep 17 00:00:00 2001
From: problematicconsumer <problematicconsumer@protonmail.com>
Date: Thu, 21 Dec 2023 14:45:22 +0330
Subject: [PATCH] Fix android service mode

---
 .../main/kotlin/com/hiddify/hiddify/Settings.kt   | 15 +++++++++------
 libcore                                           |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/android/app/src/main/kotlin/com/hiddify/hiddify/Settings.kt b/android/app/src/main/kotlin/com/hiddify/hiddify/Settings.kt
index 62e2743a..9b142a5b 100644
--- a/android/app/src/main/kotlin/com/hiddify/hiddify/Settings.kt
+++ b/android/app/src/main/kotlin/com/hiddify/hiddify/Settings.kt
@@ -55,7 +55,7 @@ object Settings {
         set(value) = preferences.edit().putString(SettingsKey.ACTIVE_PROFILE_NAME, value).apply()
 
     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()
 
     var configOptions: String
@@ -94,12 +94,15 @@ object Settings {
 
     suspend fun rebuildServiceMode(): Boolean {
         var newMode = ServiceMode.NORMAL
-        try {
-            if (needVPNService()) {
-                newMode = ServiceMode.VPN
-            }
-        } catch (_: Exception) {
+        if (serviceMode == ServiceMode.VPN) {
+            newMode = ServiceMode.VPN
         }
+//        try {
+//            if (needVPNService()) {
+//                newMode = ServiceMode.VPN
+//            }
+//        } catch (_: Exception) {
+//        }
         if (serviceMode == newMode) {
             return false
         }
diff --git a/libcore b/libcore
index c499693d..4099f968 160000
--- a/libcore
+++ b/libcore
@@ -1 +1 @@
-Subproject commit c499693ddcb8e8992fc29c57093fe48e164cea5a
+Subproject commit 4099f968e21264f94d0feb9004cd20281aadc20f