Fix android vpn issues

Override default socksPort,port

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

@@ -44,7 +44,7 @@ object GlobalState {
     fun initServiceEngine(context: Context) {
         if (serviceEngine != null) return
         lock.withLock {
-            if (serviceEngine != null) return
+            destroyServiceEngine()
             serviceEngine = FlutterEngine(context)
             serviceEngine?.plugins?.add(ProxyPlugin())
             serviceEngine?.plugins?.add(AppPlugin())

android/app/src/main/kotlin/com/follow/clash/services/FlClashTileService.kt

@@ -71,7 +71,7 @@ class FlClashTileService : TileService() {
             if (titlePlugin != null) {
                 titlePlugin.handleStart()
             } else {
-                GlobalState.initServiceEngine(this)
+                GlobalState.initServiceEngine(applicationContext)
             }
         } else if (GlobalState.runState.value == RunState.START) {
             GlobalState.runState.value = RunState.PENDING

android/app/src/main/kotlin/com/follow/clash/services/FlClashVpnService.kt

@@ -11,12 +11,17 @@ import android.net.VpnService
 import android.os.Binder
 import android.os.Build
 import android.os.IBinder
+import android.os.Parcel
+import android.os.RemoteException
 import androidx.core.app.NotificationCompat
 import com.follow.clash.GlobalState
 import com.follow.clash.MainActivity
 import com.follow.clash.R
 import com.follow.clash.models.AccessControlMode
 import com.follow.clash.models.Props
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
 
 class FlClashVpnService : VpnService() {
@@ -131,7 +136,7 @@ class FlClashVpnService : VpnService() {
     }
 
     fun initServiceEngine() {
-        GlobalState.initServiceEngine(this)
+        GlobalState.initServiceEngine(applicationContext)
     }
 
     override fun onTrimMemory(level: Int) {
@@ -168,8 +173,23 @@ class FlClashVpnService : VpnService() {
 
     inner class LocalBinder : Binder() {
         fun getService(): FlClashVpnService = this@FlClashVpnService
+
+//        override fun onTransact(code: Int, data: Parcel, reply: Parcel?, flags: Int): Boolean {
+//            try {
+//                val isSuccess = super.onTransact(code, data, reply, flags)
+//                if (!isSuccess) {
+//                    CoroutineScope(Dispatchers.Main).launch {
+//                        GlobalState.getCurrentTitlePlugin()?.handleStop()
+//                    }
+//                }
+//                return isSuccess
+//            } catch (e: RemoteException) {
+//                throw e
+//            }
+//        }
     }
 
+
     override fun onBind(intent: Intent): IBinder {
         return binder
     }

core/common.go

@@ -325,8 +325,8 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	//targetConfig.GeodataMode = false
 	targetConfig.IPv6 = patchConfig.IPv6
 	targetConfig.LogLevel = patchConfig.LogLevel
-	//targetConfig.Port = 0
-	//targetConfig.SocksPort = 0
+	targetConfig.Port = 0
+	targetConfig.SocksPort = 0
 	targetConfig.MixedPort = patchConfig.MixedPort
 	targetConfig.FindProcessMode = patchConfig.FindProcessMode
 	targetConfig.AllowLan = patchConfig.AllowLan

lib/main.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:io';
 
 import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/plugins/app.dart';
@@ -67,7 +66,6 @@ Future<void> vpnService() async {
         clashCore.setFdMap(fd.id);
       },
       onProcess: (Process process) async {
-        print(process);
         var packageName = await app?.resolverProcess(process);
         clashCore.setProcessMap(
           ProcessMapItem(
@@ -112,14 +110,13 @@ Future<void> vpnService() async {
       onStop: () async {
         await app?.tip(appLocalizations.stopVpn);
         await globalState.stopSystemProxy();
-        exit(0);
       },
     ),
   );
 
   globalState.updateTraffic();
   globalState.updateFunctionLists = [
-    () {
+        () {
       globalState.updateTraffic();
     }
   ];
@@ -137,7 +134,8 @@ class ServiceMessageHandler with ServiceMessageListener {
     required Function(Process process) onProcess,
     required Function(String runTime) onStarted,
     required Function(String groupName) onLoaded,
-  })  : _onProtect = onProtect,
+  })
+      : _onProtect = onProtect,
         _onProcess = onProcess,
         _onStarted = onStarted,
         _onLoaded = onLoaded;
@@ -163,10 +161,11 @@ class ServiceMessageHandler with ServiceMessageListener {
   }
 }
 
+@immutable
 class TileListenerWithVpn with TileListener {
   final Function() _onStop;
 
-  TileListenerWithVpn({
+  const TileListenerWithVpn({
     required Function() onStop,
   }) : _onStop = onStop;
 

lib/plugins/proxy.dart

@@ -8,6 +8,7 @@ import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:proxy/proxy_platform_interface.dart';
 
@@ -80,6 +81,7 @@ class Proxy extends ProxyPlatform {
   bool get isStart => startTime != null && startTime!.isBeforeNow;
 
   onStarted(int? fd) {
+    debugPrint("onStarted ==> $fd");
     if (fd == null) return;
     if (receiver != null) {
       receiver!.close();

pubspec.yaml

@@ -1,7 +1,7 @@
 name: fl_clash
 description: A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.
 publish_to: 'none'
-version: 0.8.38+202407142
+version: 0.8.40+202407152
 environment:
   sdk: '>=3.1.0 <4.0.0'