Fix android tile service

Author: chen08209

android/app/src/main/AndroidManifest.xml

@@ -66,6 +66,7 @@
 
         <activity
             android:name=".TempActivity"
+            android:excludeFromRecents="true"
             android:exported="true"
             android:theme="@style/TransparentTheme">
             <intent-filter>

android/app/src/main/kotlin/com/follow/clash/State.kt

@@ -92,6 +92,7 @@ object State {
 
     suspend fun destroyServiceEngine() {
         runLock.withLock {
+            GlobalState.log("Destroy service engine")
             withContext(Dispatchers.Main) {
                 runCatching {
                     serviceFlutterEngine?.destroy()
@@ -103,10 +104,12 @@ object State {
 
     suspend fun startServiceWithEngine() {
         runLock.withLock {
-            if (serviceFlutterEngine != null || runStateFlow.value == RunState.PENDING || runStateFlow.value == RunState.START) {
+            if (runStateFlow.value == RunState.PENDING || runStateFlow.value == RunState.START) {
                 return
             }
+            GlobalState.log("Create service engine")
             withContext(Dispatchers.Main) {
+                serviceFlutterEngine?.destroy()
                 serviceFlutterEngine = FlutterEngine(GlobalState.application)
                 serviceFlutterEngine?.plugins?.add(ServicePlugin())
                 serviceFlutterEngine?.plugins?.add(AppPlugin())

android/app/src/main/kotlin/com/follow/clash/TempActivity.kt

@@ -30,6 +30,6 @@ class TempActivity : Activity(),
                 }
             }
         }
-        finishAndRemoveTask()
+        finish()
     }
 }

core/hub.go

@@ -33,6 +33,8 @@ var (
 )
 
 func handleInitClash(paramsString string) bool {
+	runLock.Lock()
+	defer runLock.Unlock()
 	var params = InitParams{}
 	err := json.Unmarshal([]byte(paramsString), &params)
 	if err != nil {

core/lib.go

@@ -37,6 +37,8 @@ type TunHandler struct {
 }
 
 func (th *TunHandler) start(fd int, stack, address, dns string) {
+	runLock.Lock()
+	defer runLock.Unlock()
 	_ = th.limit.Acquire(context.TODO(), 4)
 	defer th.limit.Release(4)
 	th.initHook()

lib/controller.dart

@@ -466,9 +466,6 @@ class AppController {
     Map<String, dynamic>? data,
     bool handleError = false,
   }) async {
-    if (globalState.isPre) {
-      return;
-    }
     if (data != null) {
       final tagName = data['tag_name'];
       final body = data['body'];
@@ -962,7 +959,7 @@ class AppController {
       final res = await futureFunction();
       return res;
     } catch (e) {
-      commonPrint.log('$futureFunction ===> $e', logLevel: LogLevel.warning);
+      commonPrint.log('$title===> $e', logLevel: LogLevel.warning);
       if (realSilence) {
         globalState.showNotifier(e.toString());
       } else {

lib/core/interface.dart

@@ -157,7 +157,7 @@ abstract class CoreHandlerInterface with CoreInterface {
   @override
   Future<Result> getConfig(String path) async {
     return await _invoke<Result>(method: ActionMethod.getConfig, data: path) ??
-        Result<Map<String, dynamic>>.success({});
+        Result.success({});
   }
 
   @override

lib/main.dart

@@ -33,16 +33,14 @@ Future<void> _service(List<String> flags) async {
       },
     ),
   );
-  Future(() async {
-    app?.tip(appLocalizations.startVpn);
-    final version = await system.version;
-    await coreController.init(version);
-    final clashConfig = globalState.config.patchClashConfig.copyWith.tun(
-      enable: false,
-    );
-    await globalState.handleStart();
-    await coreController.setupConfig(clashConfig);
-  });
+  app?.tip(appLocalizations.startVpn);
+  final version = await system.version;
+  await coreController.init(version);
+  final clashConfig = globalState.config.patchClashConfig.copyWith.tun(
+    enable: false,
+  );
+  coreController.setupConfig(clashConfig);
+  globalState.handleStart();
 }
 
 @immutable

lib/models/core.dart

@@ -192,7 +192,7 @@ extension ActionResultExt on ActionResult {
     if (code == ResultType.success) {
       return Result.success(data);
     } else {
-      return Result.error(data);
+      return Result.error('$data');
     }
   }
 }

lib/state.dart

@@ -304,7 +304,13 @@ class GlobalState {
 
   Future<void> genConfigFile(ClashConfig pathConfig) async {
     final configFilePath = await appPath.configFilePath;
-    final config = await patchRawConfig(patchConfig: pathConfig);
+    var config = {};
+    try {
+      config = await patchRawConfig(patchConfig: pathConfig);
+    } catch (e) {
+      globalState.showNotifier(e.toString());
+      config = {};
+    }
     final res = await Isolate.run<String>(() async {
       try {
         final res = json.encode(config);