app: Fix always-on-vpn for android 10+

Signed-off-by: hamjin <jinham@qq.com>

Author: hamjin

app/src/main/java/com/github/kr328/clash/util/Clash.kt

@@ -9,10 +9,11 @@ import com.github.kr328.clash.common.util.intent
 import com.github.kr328.clash.design.store.UiStore
 import com.github.kr328.clash.service.ClashService
 import com.github.kr328.clash.service.TunService
+import com.github.kr328.clash.service.store.ServiceStore
 import com.github.kr328.clash.service.util.sendBroadcastSelf
 
-fun Context.runClashService(): Intent? {
-    if (!UiStore(this).enableClashService)
+fun Context.runClashService(manual : Boolean = false): Intent? {
+    if (!ServiceStore(this).enableClashService && !manual)
         return null;
 
     val startTun = UiStore(this).enableVpn
@@ -27,16 +28,17 @@ fun Context.runClashService(): Intent? {
         startForegroundServiceCompat(ClashService::class.intent)
     }
 
+    ServiceStore(this).enableClashService = true
+
     return null
 }
 
 fun Context.startClashService(): Intent? {
-    UiStore(this).enableClashService = true
-    return runClashService()
+    return runClashService(manual = true)
 }
 
 fun Context.stopClashService() {
-    UiStore(this).enableClashService = false
+    ServiceStore(this).enableClashService = false
     sendBroadcastSelf(Intent(Intents.ACTION_CLASH_REQUEST_STOP))
 }
 

design/src/main/java/com/github/kr328/clash/design/store/UiStore.kt

@@ -14,11 +14,6 @@ class UiStore(context: Context) {
             .asStoreProvider()
     )
 
-    var enableClashService: Boolean by store.boolean(
-        key = "enable_clash_service",
-        defaultValue = false
-    )
-
     var enableVpn: Boolean by store.boolean(
         key = "enable_vpn",
         defaultValue = true

service/src/main/java/com/github/kr328/clash/service/clash/module/CloseModule.kt

@@ -1,19 +1,28 @@
 package com.github.kr328.clash.service.clash.module
 
 import android.app.Service
+import android.os.Build
 import com.github.kr328.clash.common.constants.Intents
 import com.github.kr328.clash.common.log.Log
+import com.github.kr328.clash.service.TunService
 
 class CloseModule(service: Service) : Module<CloseModule.RequestClose>(service) {
     object RequestClose
 
+    fun isAlwaysOn(service: Service): Boolean {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && service is TunService && service.isAlwaysOn
+    }
+
     override suspend fun run() {
         val broadcasts = receiveBroadcast {
             addAction(Intents.ACTION_CLASH_REQUEST_STOP)
         }
 
         broadcasts.receive()
 
+        if (isAlwaysOn(service))
+            return
+
         Log.d("User request close")
 
         return enqueueEvent(RequestClose)

service/src/main/java/com/github/kr328/clash/service/store/ServiceStore.kt

@@ -14,6 +14,11 @@ class ServiceStore(context: Context) {
             .asStoreProvider()
     )
 
+    var enableClashService: Boolean by store.boolean(
+        key = "enable_clash_service",
+        defaultValue = false
+    )
+
     var activeProfile: UUID? by store.typedString(
         key = "active_profile",
         from = { if (it.isBlank()) null else UUID.fromString(it) },