Add android separates the core process

Support core status check and force restart

Optimize proxies page and access page

Update flutter and pub dependencies

.github/workflows/build.yaml

@@ -16,7 +16,7 @@ jobs:
           - platform: android
             os: ubuntu-latest
           - platform: windows
-            os: Windows-2022
+            os: windows-latest
             arch: amd64
           - platform: linux
             os: ubuntu-22.04
@@ -52,7 +52,6 @@ jobs:
         if: startsWith(matrix.platform,'android')
         run: |
           echo "${{ secrets.KEYSTORE }}" | base64 --decode > android/app/keystore.jks
-          echo "${{ secrets.SERVICE_JSON }}" | base64 --decode > android/app/google-services.json
           echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> android/local.properties
           echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> android/local.properties
           echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> android/local.properties

CHANGELOG.md

@@ -1,19 +1,3 @@
-## v0.8.88
-
-- Add android separates the core process
-
-- Support core status check and force restart
-
-- Optimize proxies page and access page
-
-- Update flutter and pub dependencies
-
-- Update go version
-
-- Optimize more details
-
-- Update changelog
-
 ## v0.8.87
 
 - Optimize desktop view

android/app/build.gradle.kts

@@ -5,8 +5,6 @@ plugins {
     id("com.android.application")
     id("kotlin-android")
     id("dev.flutter.flutter-gradle-plugin")
-    id("com.google.gms.google-services")
-    id("com.google.firebase.crashlytics")
 }
 
 val localPropertiesFile = rootProject.file("local.properties")
@@ -20,9 +18,10 @@ val mStoreFile: File = file("keystore.jks")
 val mStorePassword: String? = localProperties.getProperty("storePassword")
 val mKeyAlias: String? = localProperties.getProperty("keyAlias")
 val mKeyPassword: String? = localProperties.getProperty("keyPassword")
-val isRelease =
-    mStoreFile.exists() && mStorePassword != null && mKeyAlias != null && mKeyPassword != null
-
+val isRelease = mStoreFile.exists()
+        && mStorePassword != null
+        && mKeyAlias != null
+        && mKeyPassword != null
 
 android {
     namespace = "com.follow.clash"
@@ -30,7 +29,6 @@ android {
     ndkVersion = libs.versions.ndkVersion.get()
 
 
-
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
@@ -55,12 +53,6 @@ android {
         }
     }
 
-    packaging {
-        jniLibs {
-            useLegacyPackaging = true
-        }
-    }
-
     buildTypes {
         debug {
             isMinifyEnabled = false
@@ -77,7 +69,8 @@ android {
             }
 
             proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
             )
         }
     }
@@ -93,7 +86,6 @@ flutter {
     source = "../.."
 }
 
-
 dependencies {
     implementation(project(":service"))
     implementation(project(":common"))
@@ -102,7 +94,4 @@ dependencies {
     implementation(libs.smali.dexlib2) {
         exclude(group = "com.google.guava", module = "guava")
     }
-    implementation(platform(libs.firebase.bom))
-    implementation(libs.firebase.crashlytics.ndk)
-    implementation(libs.firebase.analytics)
 }

android/app/google-services.json

@@ -1,46 +0,0 @@
-{
-  "project_info": {
-    "project_number": "000000000000",
-    "project_id": "dev"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:000000000000:android:0000000000000000",
-        "android_client_info": {
-          "package_name": "com.follow.clash"
-        }
-      },
-      "oauth_client": [],
-      "api_key": [
-        {
-          "current_key": "0"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": []
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:000000000000:android:0000000000000000",
-        "android_client_info": {
-          "package_name": "com.follow.clash.debug"
-        }
-      },
-      "oauth_client": [],
-      "api_key": [
-        {
-          "current_key": "0"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": []
-        }
-      }
-    }
-  ]
-}

android/app/src/debug/AndroidManifest.xml

@@ -11,6 +11,7 @@
         <service
             android:name=".TileService"
             android:label="FlClash Debug"
-            tools:replace="android:label" />
+            tools:replace="android:label"
+            tools:targetApi="24" />
     </application>
 </manifest>

android/app/src/main/AndroidManifest.xml

@@ -2,6 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <permission
+        android:name="${applicationId}.permission.RECEIVE_BROADCASTS"
+        android:protectionLevel="signature" />
+
     <uses-feature
         android:name="android.hardware.touchscreen"
         android:required="false" />
@@ -20,23 +24,28 @@
     <uses-permission
         android:name="android.permission.QUERY_ALL_PACKAGES"
         tools:ignore="QueryAllPackagesPermission" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
         android:name=".Application"
         android:banner="@mipmap/ic_banner"
+        android:extractNativeLibs="true"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="FlClash">
         <activity
-            android:name=".MainActivity"
+            android:name="com.follow.clash.MainActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:exported="true"
             android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:windowSoftInputMode="adjustResize">
+            <!-- Specifies an Android theme to apply to this Activity as soon as
+                 the Android process has started. This theme is visible to the user
+                 while the Flutter UI initializes. After that, this theme continues
+                 to determine the Window background behind the Flutter UI. -->
             <meta-data
                 android:name="io.flutter.embedding.android.NormalTheme"
                 android:resource="@style/NormalTheme" />
@@ -103,11 +112,35 @@
             android:exported="true"
             android:permission="${applicationId}.permission.RECEIVE_BROADCASTS">
             <intent-filter>
-                <action android:name="${applicationId}.intent.action.SERVICE_CREATED" />
-                <action android:name="${applicationId}.intent.action.SERVICE_DESTROYED" />
+                <action android:name="${applicationId}.intent.action.START" />
+                <action android:name="${applicationId}.intent.action.STOP" />
+                <action android:name="${applicationId}.intent.action.TOGGLE" />
             </intent-filter>
         </receiver>
 
+
+        <provider
+            android:name=".FilesProvider"
+            android:authorities="${applicationId}.files"
+            android:exported="true"
+            android:grantUriPermissions="true"
+            android:permission="android.permission.MANAGE_DOCUMENTS"
+            android:process=":background">
+            <intent-filter>
+                <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
+            </intent-filter>
+        </provider>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileProvider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />

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

@@ -4,24 +4,31 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.follow.clash.common.BroadcastAction
-import com.follow.clash.common.GlobalState
 import com.follow.clash.common.action
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 
-class BroadcastReceiver : BroadcastReceiver() {
+class BroadcastReceiver : BroadcastReceiver(),
+    CoroutineScope by CoroutineScope(SupervisorJob() + Dispatchers.Default) {
     override fun onReceive(context: Context?, intent: Intent?) {
         when (intent?.action) {
-            BroadcastAction.SERVICE_CREATED.action -> {
-                GlobalState.log("Receiver service created")
-                GlobalState.launch {
+            BroadcastAction.START.action -> {
+                launch {
                     State.handleStartServiceAction()
                 }
             }
 
-            BroadcastAction.SERVICE_DESTROYED.action -> {
-                GlobalState.log("Receiver service destroyed")
+            BroadcastAction.STOP.action -> {
                 State.handleStopServiceAction()
             }
+
+            BroadcastAction.TOGGLE.action -> {
+                launch {
+                    State.handleToggleAction()
+                }
+            }
         }
     }
 }

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

@@ -25,15 +25,16 @@ suspend fun PackageManager.getPackageIconPath(packageName: String): String =
     withContext(Dispatchers.IO) {
         val cacheDir = GlobalState.application.cacheDir
         val iconDir = File(cacheDir, "icons").apply { mkdirs() }
+        val pkgInfo = getPackageInfo(packageName, 0)
+        val lastUpdateTime = pkgInfo.lastUpdateTime
+        val iconFile = File(iconDir, "${packageName}_${lastUpdateTime}.webp")
+        if (iconFile.exists() && !isExpired(iconFile)) {
+            return@withContext iconFile.absolutePath
+        }
+        iconDir.listFiles()?.forEach { file ->
+            if (file.name.startsWith(packageName + "_")) file.delete()
+        }
         return@withContext try {
-            val pkgInfo = getPackageInfo(packageName, 0)
-            val lastUpdateTime = pkgInfo.lastUpdateTime
-            val iconFile = File(iconDir, "${packageName}_${lastUpdateTime}.webp")
-            if (iconFile.exists() && !isExpired(iconFile)) {
-                return@withContext iconFile.absolutePath
-            }
-            iconDir.listFiles { f -> f.name.startsWith("${packageName}_") }?.forEach(File::delete)
-
             val icon = getApplicationIcon(packageName)
             saveDrawableToFile(icon, iconFile)
             iconFile.absolutePath
@@ -46,10 +47,8 @@ suspend fun PackageManager.getPackageIconPath(packageName: String): String =
         }
     }
 
-private suspend fun saveDrawableToFile(drawable: Drawable, file: File) {
-    val bitmap = withContext(Dispatchers.Default) {
-        drawable.toBitmap(width = 128, height = 128)
-    }
+private fun saveDrawableToFile(drawable: Drawable, file: File) {
+    val bitmap = drawable.toBitmap()
     try {
         val format = when {
             Build.VERSION.SDK_INT >= Build.VERSION_CODES.R -> {
@@ -98,13 +97,17 @@ inline fun <reified T : FlutterPlugin> FlutterEngine.plugin(): T? {
     return plugins.get(T::class.java) as T?
 }
 
+
 fun <T> MethodChannel.invokeMethodOnMainThread(
-    method: String, arguments: Any? = null, callback: ((Result<T>) -> Unit)? = null
+    method: String,
+    arguments: Any? = null,
+    callback: ((Result<T>) -> Unit)? = null
 ) {
     Handler(Looper.getMainLooper()).post {
         invokeMethod(method, arguments, object : MethodChannel.Result {
             override fun success(result: Any?) {
-                @Suppress("UNCHECKED_CAST") callback?.invoke(Result.success(result as T))
+                @Suppress("UNCHECKED_CAST")
+                callback?.invoke(Result.success(result as T))
             }
 
             override fun error(errorCode: String, errorMessage: String?, errorDetails: Any?) {

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

@@ -1,33 +1,35 @@
-package com.follow.clash.service
+package com.follow.clash
 
 import android.database.Cursor
 import android.database.MatrixCursor
 import android.os.CancellationSignal
 import android.os.ParcelFileDescriptor
-import android.provider.DocumentsContract
+import android.provider.DocumentsContract.Document
+import android.provider.DocumentsContract.Root
 import android.provider.DocumentsProvider
 import java.io.File
 import java.io.FileNotFoundException
 
+
 class FilesProvider : DocumentsProvider() {
 
     companion object {
         private const val DEFAULT_ROOT_ID = "0"
 
         private val DEFAULT_DOCUMENT_COLUMNS = arrayOf(
-            DocumentsContract.Document.COLUMN_DOCUMENT_ID,
-            DocumentsContract.Document.COLUMN_DISPLAY_NAME,
-            DocumentsContract.Document.COLUMN_MIME_TYPE,
-            DocumentsContract.Document.COLUMN_FLAGS,
-            DocumentsContract.Document.COLUMN_SIZE,
+            Document.COLUMN_DOCUMENT_ID,
+            Document.COLUMN_DISPLAY_NAME,
+            Document.COLUMN_MIME_TYPE,
+            Document.COLUMN_FLAGS,
+            Document.COLUMN_SIZE,
         )
         private val DEFAULT_ROOT_COLUMNS = arrayOf(
-            DocumentsContract.Root.COLUMN_ROOT_ID,
-            DocumentsContract.Root.COLUMN_FLAGS,
-            DocumentsContract.Root.COLUMN_ICON,
-            DocumentsContract.Root.COLUMN_TITLE,
-            DocumentsContract.Root.COLUMN_SUMMARY,
-            DocumentsContract.Root.COLUMN_DOCUMENT_ID
+            Root.COLUMN_ROOT_ID,
+            Root.COLUMN_FLAGS,
+            Root.COLUMN_ICON,
+            Root.COLUMN_TITLE,
+            Root.COLUMN_SUMMARY,
+            Root.COLUMN_DOCUMENT_ID
         )
     }
 
@@ -38,12 +40,12 @@ class FilesProvider : DocumentsProvider() {
     override fun queryRoots(projection: Array<String>?): Cursor {
         return MatrixCursor(projection ?: DEFAULT_ROOT_COLUMNS).apply {
             newRow().apply {
-                add(DocumentsContract.Root.COLUMN_ROOT_ID, DEFAULT_ROOT_ID)
-                add(DocumentsContract.Root.COLUMN_FLAGS, DocumentsContract.Root.FLAG_LOCAL_ONLY)
-                add(DocumentsContract.Root.COLUMN_ICON, R.drawable.ic_service)
-                add(DocumentsContract.Root.COLUMN_TITLE, "FlClash")
-                add(DocumentsContract.Root.COLUMN_SUMMARY, "Data")
-                add(DocumentsContract.Root.COLUMN_DOCUMENT_ID, "/")
+                add(Root.COLUMN_ROOT_ID, DEFAULT_ROOT_ID)
+                add(Root.COLUMN_FLAGS, Root.FLAG_LOCAL_ONLY)
+                add(Root.COLUMN_ICON, R.mipmap.ic_launcher)
+                add(Root.COLUMN_TITLE, "FlClash")
+                add(Root.COLUMN_SUMMARY, "Data")
+                add(Root.COLUMN_DOCUMENT_ID, "/")
             }
         }
     }
@@ -85,20 +87,20 @@ class FilesProvider : DocumentsProvider() {
 
     private fun includeFile(result: MatrixCursor, file: File) {
         result.newRow().apply {
-            add(DocumentsContract.Document.COLUMN_DOCUMENT_ID, file.absolutePath)
-            add(DocumentsContract.Document.COLUMN_DISPLAY_NAME, file.name)
-            add(DocumentsContract.Document.COLUMN_SIZE, file.length())
+            add(Document.COLUMN_DOCUMENT_ID, file.absolutePath)
+            add(Document.COLUMN_DISPLAY_NAME, file.name)
+            add(Document.COLUMN_SIZE, file.length())
             add(
-                DocumentsContract.Document.COLUMN_FLAGS,
-                DocumentsContract.Document.FLAG_SUPPORTS_WRITE or DocumentsContract.Document.FLAG_SUPPORTS_DELETE
+                Document.COLUMN_FLAGS,
+                Document.FLAG_SUPPORTS_WRITE or Document.FLAG_SUPPORTS_DELETE
             )
-            add(DocumentsContract.Document.COLUMN_MIME_TYPE, getDocumentType(file))
+            add(Document.COLUMN_MIME_TYPE, getDocumentType(file))
         }
     }
 
     private fun getDocumentType(file: File): String {
         return if (file.isDirectory) {
-            DocumentsContract.Document.MIME_TYPE_DIR
+            Document.MIME_TYPE_DIR
         } else {
             "application/octet-stream"
         }

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

@@ -2,7 +2,6 @@ package com.follow.clash
 
 import android.os.Bundle
 import androidx.lifecycle.lifecycleScope
-import com.follow.clash.common.GlobalState
 import com.follow.clash.plugins.AppPlugin
 import com.follow.clash.plugins.ServicePlugin
 import com.follow.clash.plugins.TilePlugin
@@ -32,9 +31,6 @@ class MainActivity : FlutterActivity(),
     }
 
     override fun onDestroy() {
-        GlobalState.launch {
-            Service.setEventListener(null)
-        }
         State.flutterEngine = null
         super.onDestroy()
     }

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

@@ -1,147 +1,78 @@
 package com.follow.clash
 
 import com.follow.clash.common.ServiceDelegate
-import com.follow.clash.common.formatString
 import com.follow.clash.common.intent
-import com.follow.clash.service.IAckInterface
 import com.follow.clash.service.ICallbackInterface
-import com.follow.clash.service.IEventInterface
+import com.follow.clash.service.IMessageInterface
 import com.follow.clash.service.IRemoteInterface
-import com.follow.clash.service.IResultInterface
 import com.follow.clash.service.RemoteService
 import com.follow.clash.service.models.NotificationParams
 import com.follow.clash.service.models.VpnOptions
-import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
+import java.util.concurrent.atomic.AtomicBoolean
 
 object Service {
     private val delegate by lazy {
         ServiceDelegate<IRemoteInterface>(
-            RemoteService::class.intent, ::handleServiceDisconnected
+            RemoteService::class.intent, ::handleOnServiceCrash
         ) {
             IRemoteInterface.Stub.asInterface(it)
         }
     }
 
-    var onServiceDisconnected: ((String) -> Unit)? = null
+    var onServiceCrash: (() -> Unit)? = null
 
-    private fun handleServiceDisconnected(message: String) {
-        onServiceDisconnected?.let {
-            it(message)
+    private fun handleOnServiceCrash() {
+        bindingState.set(false)
+        onServiceCrash?.let {
+            it()
         }
     }
 
+    private val bindingState = AtomicBoolean(false)
+
     fun bind() {
-        delegate.bind()
-    }
-
-    fun unbind() {
-        delegate.unbind()
-    }
-
-    suspend fun invokeAction(data: String, cb: (result: String) -> Unit): Result<Unit> {
-        val res = mutableListOf<ByteArray>()
-        return delegate.useService {
-            it.invokeAction(
-                data, object : ICallbackInterface.Stub() {
-                    override fun onResult(
-                        result: ByteArray?, isSuccess: Boolean, ack: IAckInterface?
-                    ) {
-                        res.add(result ?: byteArrayOf())
-                        ack?.onAck()
-                        if (isSuccess) {
-                            cb(res.formatString())
-                        }
-                    }
-                })
+        if (bindingState.compareAndSet(false, true)) {
+            delegate.bind()
         }
     }
 
-    suspend fun setEventListener(
-        cb: ((result: String?) -> Unit)?
-    ): Result<Unit> {
-        val results = HashMap<String, MutableList<ByteArray>>()
-        return delegate.useService {
-            it.setEventListener(
-                when (cb != null) {
-                true -> object : IEventInterface.Stub() {
-                    override fun onEvent(
-                        id: String, data: ByteArray?, isSuccess: Boolean, ack: IAckInterface?
-                    ) {
-                        if (results[id] == null) {
-                            results[id] = mutableListOf()
-                        }
-                        results[id]?.add(data ?: byteArrayOf())
-                        ack?.onAck()
-                        if (isSuccess) {
-                            cb(results[id]?.formatString())
-                            results.remove(id)
-                        }
-                    }
+    suspend fun invokeAction(
+        data: String, cb: (result: ByteArray?, isSuccess: Boolean) -> Unit
+    ) {
+        delegate.useService {
+            it.invokeAction(data, object : ICallbackInterface.Stub() {
+                override fun onResult(result: ByteArray?, isSuccess: Boolean) {
+                    cb(result, isSuccess)
                 }
-
-                false -> null
             })
         }
     }
 
     suspend fun updateNotificationParams(
         params: NotificationParams
-    ): Result<Unit> {
-        return delegate.useService {
+    ) {
+        delegate.useService {
             it.updateNotificationParams(params)
         }
     }
 
-    suspend fun setCrashlytics(
-        enable: Boolean
-    ): Result<Unit> {
-        return delegate.useService {
-            it.setCrashlytics(enable)
-        }
-    }
-
-    private suspend fun awaitIResultInterface(
-        block: (IResultInterface) -> Unit
-    ): Long = suspendCancellableCoroutine { continuation ->
-        val callback = object : IResultInterface.Stub() {
-            override fun onResult(time: Long) {
-                if (continuation.isActive) {
-                    continuation.resume(time)
+    suspend fun setMessageCallback(
+        cb: (result: String?) -> Unit
+    ) {
+        delegate.useService {
+            it.setMessageCallback(object : IMessageInterface.Stub() {
+                override fun onResult(result: String?) {
+                    cb(result)
                 }
-            }
-        }
-
-        try {
-            block(callback)
-        } catch (e: Exception) {
-            if (continuation.isActive) {
-                continuation.resumeWithException(e)
-            }
+            })
         }
     }
 
-
-    suspend fun startService(options: VpnOptions, runTime: Long): Long {
-        return delegate.useService {
-            awaitIResultInterface { callback ->
-                it.startService(options, runTime, callback)
-            }
-        }.getOrNull() ?: 0L
+    suspend fun startService(options: VpnOptions, inApp: Boolean) {
+        delegate.useService { it.startService(options, inApp) }
     }
 
-    suspend fun stopService(): Long {
-        return delegate.useService {
-            awaitIResultInterface { callback ->
-                it.stopService(callback)
-            }
-        }.getOrNull() ?: 0L
-    }
-
-    suspend fun getRunTime(): Long {
-        return delegate.useService {
-            it.runTime
-        }.getOrNull() ?: 0L
+    suspend fun stopService() {
+        delegate.useService { it.stopService() }
     }
 }

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

@@ -26,7 +26,6 @@ object State {
     var runTime: Long = 0
 
     val runStateFlow: MutableStateFlow<RunState> = MutableStateFlow(RunState.STOP)
-
     var flutterEngine: FlutterEngine? = null
     var serviceFlutterEngine: FlutterEngine? = null
 
@@ -52,18 +51,6 @@ object State {
         action?.invoke()
     }
 
-    suspend fun handleSyncState() {
-        runLock.withLock {
-            Service.bind()
-            runTime = Service.getRunTime()
-            val runState = when (runTime == 0L) {
-                true -> RunState.STOP
-                false -> RunState.START
-            }
-            runStateFlow.tryEmit(runState)
-        }
-    }
-
     suspend fun handleStartServiceAction() {
         tilePlugin?.handleStart()
         if (flutterEngine != null) {
@@ -103,9 +90,6 @@ object State {
 
     suspend fun startServiceWithEngine() {
         runLock.withLock {
-            if (serviceFlutterEngine != null || runStateFlow.value == RunState.PENDING || runStateFlow.value == RunState.START) {
-                return
-            }
             withContext(Dispatchers.Main) {
                 serviceFlutterEngine = FlutterEngine(GlobalState.application)
                 serviceFlutterEngine?.plugins?.add(ServicePlugin())
@@ -116,6 +100,7 @@ object State {
                 )
                 serviceFlutterEngine?.dartExecutor?.executeDartEntrypoint(dartEntrypoint)
             }
+
         }
     }
 
@@ -134,8 +119,9 @@ object State {
                     return@launch
                 }
                 appPlugin?.prepare(options.enable) {
-                    runTime = Service.startService(options, runTime)
+                    Service.startService(options, true)
                     runStateFlow.tryEmit(RunState.START)
+                    runTime = System.currentTimeMillis()
                 }
             }
         }
@@ -149,13 +135,14 @@ object State {
                     return@launch
                 }
                 runStateFlow.tryEmit(RunState.PENDING)
-                runTime = Service.stopService()
+                Service.stopService()
                 runStateFlow.tryEmit(RunState.STOP)
+                runTime = 0
             }
             destroyServiceEngine()
         }
+
     }
 }
 
 
-

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

@@ -4,9 +4,8 @@ import android.annotation.SuppressLint
 import android.os.Build
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
-import com.follow.clash.common.Components
-import com.follow.clash.common.GlobalState
-import com.follow.clash.common.intent
+import com.follow.clash.common.QuickAction
+import com.follow.clash.common.quickIntent
 import com.follow.clash.common.toPendingIntent
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -32,7 +31,6 @@ class TileService : TileService() {
         scope?.cancel()
         scope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
         scope?.launch {
-            State.handleSyncState()
             State.runStateFlow.collect {
                 updateTile(it)
             }
@@ -40,22 +38,20 @@ class TileService : TileService() {
     }
 
     @SuppressLint("StartActivityAndCollapseDeprecated")
-    private fun activityTransfer() {
-        val intent = Components.TEMP_ACTIVITY.intent
+    private fun handleToggle() {
+        val intent = QuickAction.TOGGLE.quickIntent
         val pendingIntent = intent.toPendingIntent
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
             startActivityAndCollapse(pendingIntent)
         } else {
-            @Suppress("DEPRECATION") startActivityAndCollapse(intent)
+            @Suppress("DEPRECATION")
+            startActivityAndCollapse(intent)
         }
     }
 
     override fun onClick() {
         super.onClick()
-        activityTransfer()
-        GlobalState.launch {
-            State.handleToggleAction()
-        }
+        handleToggle()
     }
 
     override fun onStopListening() {

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

@@ -2,8 +2,7 @@ package com.follow.clash.models
 
 
 data class AppState(
-    val crashlytics: Boolean = true,
-    val currentProfileName: String = "FlClash",
-    val stopText: String = "Stop",
-    val onlyStatisticsProxy: Boolean = false,
+    val currentProfileName: String,
+    val stopText: String,
+    val onlyStatisticsProxy: Boolean,
 )

android/app/src/main/kotlin/com/follow/clash/plugins/AppPlugin.kt

@@ -58,6 +58,8 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
 
     private var requestNotificationCallback: (() -> Unit)? = null
 
+    private val iconMap = mutableMapOf<String, String?>()
+
     private val packages = mutableListOf<Package>()
 
     private val skipPrefixList = listOf(
@@ -170,7 +172,8 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
                 result.success("")
                 return@launch
             }
-            val path = GlobalState.application.packageManager.getPackageIconPath(packageName)
+            val path =
+                GlobalState.application.packageManager.getPackageIconPath(packageName)
             result.success(path)
         }
     }
@@ -220,12 +223,13 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
         if (packages.isNotEmpty()) return packages
         packageManager?.getInstalledPackages(PackageManager.GET_META_DATA or PackageManager.GET_PERMISSIONS)
             ?.filter {
-                it.packageName != GlobalState.application.packageName && it.packageName != "android"
+                it.packageName != GlobalState.application.packageName || it.packageName == "android"
+
             }?.map {
                 Package(
                     packageName = it.packageName,
                     label = it.applicationInfo?.loadLabel(packageManager).toString(),
-                    system = (it.applicationInfo?.flags?.and(ApplicationInfo.FLAG_SYSTEM)) != 0,
+                    system = (it.applicationInfo?.flags?.and(ApplicationInfo.FLAG_SYSTEM)) == 1,
                     lastUpdateTime = it.lastUpdateTime,
                     internet = it.requestedPermissions?.contains(Manifest.permission.INTERNET) == true
                 )

android/app/src/main/kotlin/com/follow/clash/plugins/ServicePlugin.kt

@@ -5,7 +5,7 @@ import com.follow.clash.Service
 import com.follow.clash.State
 import com.follow.clash.awaitResult
 import com.follow.clash.common.Components
-import com.follow.clash.common.GlobalState
+import com.follow.clash.common.formatString
 import com.follow.clash.invokeMethodOnMainThread
 import com.follow.clash.models.AppState
 import com.follow.clash.service.models.NotificationParams
@@ -38,11 +38,7 @@ class ServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler,
 
     override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) = when (call.method) {
         "init" -> {
-            handleInit(call, result)
-        }
-
-        "shutdown" -> {
-            handleShutdown(result)
+            handleInit(result)
         }
 
         "invokeAction" -> {
@@ -73,17 +69,16 @@ class ServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler,
     private fun handleInvokeAction(call: MethodCall, result: MethodChannel.Result) {
         launch {
             val data = call.arguments<String>()!!
-            Service.invokeAction(data) {
-                result.success(it)
+            val res = mutableListOf<ByteArray>()
+            Service.invokeAction(data) { byteArray, isSuccess ->
+                res.add(byteArray ?: byteArrayOf())
+                if (isSuccess) {
+                    result.success(res.formatString())
+                }
             }
         }
     }
 
-    private fun handleShutdown(result: MethodChannel.Result) {
-        Service.unbind()
-        result.success(true)
-    }
-
     private fun handleStart(result: MethodChannel.Result) {
         State.handleStartService()
         result.success(true)
@@ -109,16 +104,15 @@ class ServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler,
         }
     }
 
-    private fun onServiceDisconnected(message: String) {
+    private fun onServiceCrash() {
         State.runStateFlow.tryEmit(RunState.STOP)
-        flutterMethodChannel.invokeMethodOnMainThread<Any>("crash", message)
+        flutterMethodChannel.invokeMethodOnMainThread<Any>("crash", null)
     }
 
     private fun handleSyncState(call: MethodCall, result: MethodChannel.Result) {
-        val data = call.arguments<String>()!!
-        val params = Gson().fromJson(data, AppState::class.java)
-        GlobalState.setCrashlytics(params.crashlytics)
         launch {
+            val data = call.arguments<String>()!!
+            val params = Gson().fromJson(data, AppState::class.java)
             Service.updateNotificationParams(
                 NotificationParams(
                     title = params.currentProfileName,
@@ -126,35 +120,22 @@ class ServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler,
                     onlyStatisticsProxy = params.onlyStatisticsProxy
                 )
             )
-            Service.setCrashlytics(params.crashlytics)
-            result.success("")
+            result.success(true)
         }
     }
 
-    fun handleInit(call: MethodCall, result: MethodChannel.Result) {
+    fun handleInit(result: MethodChannel.Result) {
         Service.bind()
         launch {
-            val needSetEventListener = call.arguments<Boolean>() ?: false
-            when (needSetEventListener) {
-                true -> Service.setEventListener {
-                    handleSendEvent(it)
-                }
-
-                false -> Service.setEventListener(null)
-            }.onSuccess {
-                result.success("")
-            }.onFailure {
-                result.success(it.message)
+            Service.setMessageCallback {
+                handleSendEvent(it)
             }
-
+            result.success(true)
         }
-        Service.onServiceDisconnected = ::onServiceDisconnected
+        Service.onServiceCrash = ::onServiceCrash
     }
 
     private fun handleGetRunTime(result: MethodChannel.Result) {
-        launch {
-            State.handleSyncState()
-            result.success(State.runTime)
-        }
+        return result.success(State.runTime)
     }
 }

android/common/build.gradle.kts

@@ -39,7 +39,4 @@ kotlin {
 dependencies {
     implementation(libs.androidx.core)
     implementation(libs.gson)
-    implementation(platform(libs.firebase.bom))
-    implementation(libs.firebase.crashlytics.ndk)
-    implementation(libs.firebase.analytics)
 }

android/common/src/main/AndroidManifest.xml

@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <permission
-        android:name="${applicationId}.permission.RECEIVE_BROADCASTS"
-        android:protectionLevel="signature" />
-
     <uses-permission android:name="${applicationId}.permission.RECEIVE_BROADCASTS" />
 </manifest>

android/common/src/main/java/com/follow/clash/common/Enums.kt

@@ -10,8 +10,9 @@ enum class QuickAction {
 }
 
 enum class BroadcastAction {
-    SERVICE_CREATED,
-    SERVICE_DESTROYED,
+    START,
+    STOP,
+    TOGGLE,
 }
 
 enum class AccessControlMode {

android/common/src/main/java/com/follow/clash/common/Ext.kt

@@ -1,7 +1,6 @@
 package com.follow.clash.common
 
 import android.annotation.SuppressLint
-import android.app.ActivityManager
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -14,21 +13,14 @@ import android.content.Context.RECEIVER_NOT_EXPORTED
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.ServiceConnection
-import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
 import android.os.Build
-import android.os.Handler
 import android.os.IBinder
-import android.os.Looper
 import android.os.RemoteException
 import android.util.Log
-import androidx.core.content.getSystemService
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.retryWhen
-import kotlinx.coroutines.withContext
 import java.nio.charset.Charset
 import kotlin.reflect.KClass
 
@@ -45,23 +37,19 @@ val KClass<*>.intent: Intent
 
 fun Service.startForegroundCompat(id: Int, notification: Notification) {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-        startForeground(id, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
+        startForeground(id, notification, FOREGROUND_SERVICE_TYPE_DATA_SYNC)
     } else {
         startForeground(id, notification)
     }
 }
 
-val ComponentName.intent: Intent
-    get() = Intent().apply {
-        setComponent(this@intent)
-        setPackage(GlobalState.packageName)
-    }
-
 val QuickAction.action: String
     get() = "${GlobalState.application.packageName}.action.${this.name}"
 
 val QuickAction.quickIntent: Intent
-    get() = Components.TEMP_ACTIVITY.intent.apply {
+    get() = Intent().apply {
+        setComponent(Components.TEMP_ACTIVITY)
+        setPackage(GlobalState.packageName)
         action = this@quickIntent.action
         addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
     }
@@ -69,18 +57,10 @@ val QuickAction.quickIntent: Intent
 val BroadcastAction.action: String
     get() = "${GlobalState.application.packageName}.intent.action.${this.name}"
 
-val Context.processName: String?
-    get() {
-        val pid = android.os.Process.myPid()
-        val activityManager = getSystemService<ActivityManager>()
-        activityManager?.runningAppProcesses?.find { it.pid == pid }?.let {
-            return it.processName
-        }
-        return null
-    }
-
 val BroadcastAction.quickIntent: Intent
-    get() = Components.BROADCAST_RECEIVER.intent.apply {
+    get() = Intent().apply {
+        setComponent(Components.BROADCAST_RECEIVER)
+        setPackage(GlobalState.packageName)
         action = this@quickIntent.action
     }
 
@@ -146,55 +126,62 @@ fun Context.receiveBroadcastFlow(
 }
 
 
+sealed class BindServiceEvent<out T : IBinder> {
+    data class Connected<T : IBinder>(val binder: T) : BindServiceEvent<T>()
+    object Disconnected : BindServiceEvent<Nothing>()
+    object Crashed : BindServiceEvent<Nothing>()
+}
+
 inline fun <reified T : IBinder> Context.bindServiceFlow(
     intent: Intent,
     flags: Int = Context.BIND_AUTO_CREATE,
-    maxRetries: Int = 10,
-    retryDelayMillis: Long = 200L
-): Flow<Pair<IBinder?, String>> = callbackFlow {
+): Flow<BindServiceEvent<T>> = callbackFlow {
+    var currentBinder: IBinder? = null
+    val deathRecipient = IBinder.DeathRecipient {
+        trySend(BindServiceEvent.Crashed)
+    }
+
     val connection = object : ServiceConnection {
         override fun onServiceConnected(name: ComponentName?, binder: IBinder?) {
             if (binder != null) {
                 try {
+                    binder.linkToDeath(deathRecipient, 0)
+                    currentBinder = binder
                     @Suppress("UNCHECKED_CAST") val casted = binder as? T
                     if (casted != null) {
-                        trySend(Pair(casted, ""))
+                        trySend(BindServiceEvent.Connected(casted))
                     } else {
-                        trySend(Pair(null, "Binder is not of type ${T::class.java}"))
+                        GlobalState.log("Binder is not of type ${T::class.java}")
+                        trySend(BindServiceEvent.Disconnected)
                     }
                 } catch (e: RemoteException) {
-                    trySend(Pair(null, "Failed to link to death: ${e.message}"))
+                    GlobalState.log("Failed to link to death: ${e.message}")
+                    binder.unlinkToDeath(deathRecipient, 0)
+                    trySend(BindServiceEvent.Disconnected)
                 }
             } else {
-                trySend(Pair(null, "Binder empty"))
+                trySend(BindServiceEvent.Disconnected)
             }
         }
 
         override fun onServiceDisconnected(name: ComponentName?) {
-            trySend(Pair(null, "Service disconnected"))
+            GlobalState.log("Service disconnected")
+            currentBinder?.unlinkToDeath(deathRecipient, 0)
+            currentBinder = null
+            trySend(BindServiceEvent.Disconnected)
         }
     }
 
-    val success = withContext(Dispatchers.Main) {
-        bindService(intent, connection, flags)
-    }
-
-    if (!success) {
-        throw IllegalStateException("bindService() failed, will retry")
+    if (!bindService(intent, connection, flags)) {
+        GlobalState.log("Failed to bind service")
+        trySend(BindServiceEvent.Disconnected)
+        close()
+        return@callbackFlow
     }
 
     awaitClose {
-        Handler(Looper.getMainLooper()).post {
-            unbindService(connection)
-            trySend(Pair(null, ""))
-        }
-    }
-}.retryWhen { cause, attempt ->
-    if (attempt < maxRetries && cause is Exception) {
-        delay(retryDelayMillis)
-        true
-    } else {
-        false
+        currentBinder?.unlinkToDeath(deathRecipient, 0)
+        unbindService(connection)
     }
 }
 
@@ -220,6 +207,7 @@ val Long.formatBytes: String
 fun String.chunkedForAidl(charset: Charset = Charsets.UTF_8): List<ByteArray> {
     val allBytes = toByteArray(charset)
     val total = allBytes.size
+
     val maxBytes = when {
         total <= 100 * 1024 -> total
         total <= 1024 * 1024 -> 64 * 1024
@@ -242,7 +230,7 @@ fun <T : List<ByteArray>> T.formatString(charset: Charset = Charsets.UTF_8): Str
     val totalSize = this.sumOf { it.size }
     val combined = ByteArray(totalSize)
     var offset = 0
-    forEach { byteArray ->
+    this.forEach { byteArray ->
         byteArray.copyInto(combined, offset)
         offset += byteArray.size
     }

android/common/src/main/java/com/follow/clash/common/GlobalState.kt

@@ -1,10 +1,7 @@
 package com.follow.clash.common
 
-
 import android.app.Application
 import android.util.Log
-import com.google.firebase.FirebaseApp
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 
@@ -15,16 +12,16 @@ object GlobalState : CoroutineScope by CoroutineScope(Dispatchers.Default) {
     const val NOTIFICATION_ID = 1
 
     val packageName: String
-        get() = application.packageName
+        get() = _application.packageName
 
     val RECEIVE_BROADCASTS_PERMISSIONS: String
         get() = "${packageName}.permission.RECEIVE_BROADCASTS"
 
 
-    private var _application: Application? = null
+    private lateinit var _application: Application
 
     val application: Application
-        get() = _application!!
+        get() = _application
 
 
     fun log(text: String) {
@@ -34,14 +31,4 @@ object GlobalState : CoroutineScope by CoroutineScope(Dispatchers.Default) {
     fun init(application: Application) {
         _application = application
     }
-
-    fun setCrashlytics(enable: Boolean) {
-        _application?.let {
-            FirebaseApp.initializeApp(it)
-            FirebaseCrashlytics.getInstance().isCrashlyticsCollectionEnabled = enable
-            if (enable) {
-                log("init crashlytics ${it.processName}")
-            }
-        }
-    }
 }

android/common/src/main/java/com/follow/clash/common/Service.kt

@@ -6,73 +6,73 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.retryWhen
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import kotlinx.coroutines.withTimeout
-import java.util.concurrent.atomic.AtomicBoolean
 
 class ServiceDelegate<T>(
     private val intent: Intent,
-    private val onServiceDisconnected: ((String) -> Unit)? = null,
+    private val onServiceDisconnected: (() -> Unit)? = null,
+    private val onServiceCrash: (() -> Unit)? = null,
     private val interfaceCreator: (IBinder) -> T,
 ) : CoroutineScope by CoroutineScope(SupervisorJob() + Dispatchers.Default) {
 
-    private val _bindingState = AtomicBoolean(false)
+    private val _service = MutableStateFlow<T?>(null)
 
-    private var _serviceState = MutableStateFlow<Pair<T?, String>?>(null)
+    val service: StateFlow<T?> = _service
 
-    val serviceState: StateFlow<Pair<T?, String>?> = _serviceState
-    private var job: Job? = null
+    private var bindJob: Job? = null
+    private fun handleBindEvent(event: BindServiceEvent<IBinder>) {
+        when (event) {
+            is BindServiceEvent.Connected -> {
+                _service.value = event.binder.let(interfaceCreator)
+            }
 
-    private fun handleBind(data: Pair<IBinder?, String>) {
-        data.first?.let {
-            _serviceState.value = Pair(interfaceCreator(it), data.second)
-        } ?: run {
-            _serviceState.value = Pair(null, data.second)
-            unbind()
-            onServiceDisconnected?.invoke(data.second)
-            _bindingState.set(false)
+            is BindServiceEvent.Disconnected -> {
+                _service.value = null
+                onServiceDisconnected?.invoke()
+            }
+
+            is BindServiceEvent.Crashed -> {
+                _service.value = null
+                onServiceCrash?.invoke()
+            }
         }
     }
 
     fun bind() {
-        if (_bindingState.compareAndSet(false, true)) {
-            job?.cancel()
-            job = null
-            _serviceState.value = null
-            job = launch {
-                runCatching {
-                    GlobalState.application.bindServiceFlow<IBinder>(intent)
-                        .collect { handleBind(it) }
-                }
+        unbind()
+        bindJob = launch {
+            GlobalState.application.bindServiceFlow<IBinder>(intent).collect { it ->
+                handleBindEvent(it)
             }
         }
     }
 
     suspend inline fun <R> useService(
-        timeoutMillis: Long = 5000, crossinline block: suspend (T) -> R
+        retries: Int = 10,
+        delayMillis: Long = 200,
+        crossinline block: (T) -> R
     ): Result<R> {
         return runCatching {
-            withTimeout(timeoutMillis) {
-                val state = serviceState.filterNotNull().first()
-                state.first?.let {
-                    withContext(Dispatchers.Default) {
-                        block(it)
+            service.filterNotNull()
+                .retryWhen { _, attempt ->
+                    (attempt < retries).also {
+                        if (it) delay(delayMillis)
                     }
-                } ?: throw Exception(state.second)
-            }
+                }.first().let {
+                    block(it)
+                }
         }
     }
 
     fun unbind() {
-        if (_bindingState.compareAndSet(true, false)) {
-            job?.cancel()
-            job = null
-            _serviceState.value = null
-        }
+        _service.value = null
+        bindJob?.cancel()
+        bindJob = null
     }
 }

android/core/src/main/cpp/core.cpp

@@ -11,7 +11,10 @@ JNIEXPORT void JNICALL
 Java_com_follow_clash_core_Core_startTun(JNIEnv *env, jobject thiz, jint fd, jobject cb,
                                          jstring stack, jstring address, jstring dns) {
     const auto interface = new_global(cb);
-    startTUN(interface, fd, get_string(stack), get_string(address), get_string(dns));
+    scoped_string stackChar = get_string(stack);
+    scoped_string addressChar = get_string(address);
+    scoped_string dnsChar = get_string(dns);
+    startTUN(interface, fd, stackChar, addressChar, dnsChar);
 }
 
 extern "C"
@@ -29,39 +32,39 @@ Java_com_follow_clash_core_Core_forceGC(JNIEnv *env, jobject thiz) {
 extern "C"
 JNIEXPORT void JNICALL
 Java_com_follow_clash_core_Core_updateDNS(JNIEnv *env, jobject thiz, jstring dns) {
-    updateDns(get_string(dns));
+    scoped_string dnsChar = get_string(dns);
+    updateDns(dnsChar);
 }
 
 extern "C"
 JNIEXPORT void JNICALL
 Java_com_follow_clash_core_Core_invokeAction(JNIEnv *env, jobject thiz, jstring data, jobject cb) {
     const auto interface = new_global(cb);
-    invokeAction(interface, get_string(data));
+    scoped_string dataChar = get_string(data);
+    invokeAction(interface, dataChar);
 }
 
 extern "C"
 JNIEXPORT void JNICALL
-Java_com_follow_clash_core_Core_setEventListener(JNIEnv *env, jobject thiz, jobject cb) {
-    if (cb != nullptr) {
-        const auto interface = new_global(cb);
-        setEventListener(interface);
-    } else {
-        setEventListener(nullptr);
-    }
+Java_com_follow_clash_core_Core_setMessageCallback(JNIEnv *env, jobject thiz, jobject cb) {
+    const auto interface = new_global(cb);
+    setMessageCallback(interface);
 }
 
 extern "C"
 JNIEXPORT jstring JNICALL
 Java_com_follow_clash_core_Core_getTraffic(JNIEnv *env, jobject thiz,
                                            const jboolean only_statistics_proxy) {
-    return new_string(getTraffic(only_statistics_proxy));
+    scoped_string res = getTraffic(only_statistics_proxy);
+    return new_string(res);
 }
 
 extern "C"
 JNIEXPORT jstring JNICALL
 Java_com_follow_clash_core_Core_getTotalTraffic(JNIEnv *env, jobject thiz,
                                                 const jboolean only_statistics_proxy) {
-    return new_string(getTotalTraffic(only_statistics_proxy));
+    scoped_string res = getTotalTraffic(only_statistics_proxy);
+    return new_string(res);
 }
 
 extern "C"
@@ -81,10 +84,6 @@ static void release_jni_object_impl(void *obj) {
     del_global(static_cast<jobject>(obj));
 }
 
-static void free_string_impl(char *str) {
-    free(str);
-}
-
 static void call_tun_interface_protect_impl(void *tun_interface, const int fd) {
     ATTACH_JNI();
     env->CallVoidMethod(static_cast<jobject>(tun_interface),
@@ -99,13 +98,14 @@ call_tun_interface_resolve_process_impl(void *tun_interface, const int protocol,
                                         const int uid) {
     ATTACH_JNI();
     const auto packageName = reinterpret_cast<jstring>(env->CallObjectMethod(
-        static_cast<jobject>(tun_interface),
-        m_tun_interface_resolve_process,
-        protocol,
-        new_string(source),
-        new_string(target),
-        uid));
-    return get_string(packageName);
+            static_cast<jobject>(tun_interface),
+            m_tun_interface_resolve_process,
+            protocol,
+            new_string(source),
+            new_string(target),
+            uid));
+    scoped_string packageNameChar = get_string(packageName);
+    return packageNameChar;
 }
 
 static void call_invoke_interface_result_impl(void *invoke_interface, const char *data) {
@@ -140,7 +140,6 @@ JNI_OnLoad(JavaVM *vm, void *) {
     resolve_process_func = &call_tun_interface_resolve_process_impl;
     result_func = &call_invoke_interface_result_impl;
     release_object_func = &release_jni_object_impl;
-    free_string_func = &free_string_impl;
 
     return JNI_VERSION_1_6;
 }
@@ -173,7 +172,7 @@ Java_com_follow_clash_core_Core_updateDNS(JNIEnv *env, jobject thiz, jstring dns
 
 extern "C"
 JNIEXPORT void JNICALL
-Java_com_follow_clash_core_Core_setEventListener(JNIEnv *env, jobject thiz, jobject cb) {
+Java_com_follow_clash_core_Core_setMessageCallback(JNIEnv *env, jobject thiz, jobject cb) {
 }
 
 extern "C"

android/core/src/main/java/com/follow/clash/core/Core.kt

@@ -84,22 +84,18 @@ data object Core {
         )
     }
 
-    private external fun setEventListener(cb: InvokeInterface?)
+    private external fun setMessageCallback(cb: InvokeInterface)
 
-    fun callSetEventListener(
-        cb: ((result: String?) -> Unit)?
+    fun setMessageCallback(
+        cb: (result: String?) -> Unit
     ) {
-        when (cb != null) {
-            true -> setEventListener(
-                object : InvokeInterface {
-                    override fun onResult(result: String?) {
-                        cb(result)
-                    }
-                },
-            )
-
-            false -> setEventListener(null)
-        }
+        setMessageCallback(
+            object : InvokeInterface {
+                override fun onResult(result: String?) {
+                    cb(result)
+                }
+            },
+        )
     }
 
     external fun stopTun()

android/gradle/libs.versions.toml

@@ -1,6 +1,5 @@
 [versions]
 #agp = "8.10.1"
-firebaseBom = "34.2.0"
 minSdk = "23"
 targetSdk = "36"
 compileSdk = "36"
@@ -11,18 +10,11 @@ coreSplashscreen = "1.0.1"
 gson = "2.13.1"
 kotlin = "2.2.10"
 smaliDexlib2 = "3.0.9"
-firebaseCrashlyticsKtx = "20.0.1"
-firebaseCommonKtx = "22.0.0"
 
 [libraries]
 build-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 androidx-core = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
 annotation-jvm = { module = "androidx.annotation:annotation-jvm", version.ref = "annotationJvm" }
 core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "coreSplashscreen" }
-firebase-analytics = { module = "com.google.firebase:firebase-analytics" }
-firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebaseBom" }
-firebase-crashlytics-ndk = { module = "com.google.firebase:firebase-crashlytics-ndk" }
 gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
-smali-dexlib2 = { module = "com.android.tools.smali:smali-dexlib2", version.ref = "smaliDexlib2" }
-firebase-crashlytics-ktx = { group = "com.google.firebase", name = "firebase-crashlytics-ktx", version.ref = "firebaseCrashlyticsKtx" }
-firebase-common-ktx = { group = "com.google.firebase", name = "firebase-common-ktx", version.ref = "firebaseCommonKtx" }
+smali-dexlib2 = { module = "com.android.tools.smali:smali-dexlib2", version.ref = "smaliDexlib2" }

android/service/src/main/AndroidManifest.xml

@@ -5,11 +5,11 @@
 
     <application>
         <service
-            android:name=".VpnService"
+            android:name="com.follow.clash.service.VpnService"
             android:exported="false"
-            android:foregroundServiceType="specialUse"
+            android:foregroundServiceType="dataSync"
             android:permission="android.permission.BIND_VPN_SERVICE"
-            android:process=":remote">
+            android:process=":background">
             <intent-filter>
                 <action android:name="android.net.VpnService" />
             </intent-filter>
@@ -19,31 +19,18 @@
         </service>
 
         <service
-            android:name=".CommonService"
+            android:name="com.follow.clash.service.CommonService"
             android:exported="false"
-            android:foregroundServiceType="specialUse"
-            android:process=":remote">
+            android:foregroundServiceType="dataSync"
+            android:process=":background">
             <property
                 android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
-                android:value="proxy" />
+                android:value="service" />
         </service>
 
         <service
-            android:name=".RemoteService"
-            android:enabled="true"
+            android:name="com.follow.clash.service.RemoteService"
             android:exported="false"
-            android:process=":remote" />
-
-        <provider
-            android:name=".FilesProvider"
-            android:authorities="${applicationId}.files"
-            android:exported="true"
-            android:grantUriPermissions="true"
-            android:permission="android.permission.MANAGE_DOCUMENTS"
-            android:process=":remote">
-            <intent-filter>
-                <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
-            </intent-filter>
-        </provider>
+            android:process=":background" />
     </application>
 </manifest>

android/service/src/main/aidl/com/follow/clash/service/IAckInterface.aidl

@@ -1,8 +0,0 @@
-// IAckInterface.aidl
-package com.follow.clash.service;
-
-import com.follow.clash.service.IAckInterface;
-
-interface IAckInterface {
-   oneway void onAck();
-}

android/service/src/main/aidl/com/follow/clash/service/ICallbackInterface.aidl

@@ -1,8 +1,6 @@
 // ICallbackInterface.aidl
 package com.follow.clash.service;
 
-import com.follow.clash.service.IAckInterface;
-
 interface ICallbackInterface {
-    oneway void onResult(in byte[] data,in boolean isSuccess, in IAckInterface ack);
+    void onResult(in byte[] result, boolean isSuccess);
 }

android/service/src/main/aidl/com/follow/clash/service/IEventInterface.aidl

@@ -1,8 +0,0 @@
-// IEventInterface.aidl
-package com.follow.clash.service;
-
-import com.follow.clash.service.IAckInterface;
-
-interface IEventInterface {
-    oneway void onEvent(in String id, in byte[] data,in boolean isSuccess, in IAckInterface ack);
-}

android/service/src/main/aidl/com/follow/clash/service/IMessageInterface.aidl

@@ -0,0 +1,6 @@
+// IMessageInterface.aidl
+package com.follow.clash.service;
+
+interface IMessageInterface {
+    void onResult(String result);
+}

android/service/src/main/aidl/com/follow/clash/service/IRemoteInterface.aidl

@@ -2,17 +2,14 @@
 package com.follow.clash.service;
 
 import com.follow.clash.service.ICallbackInterface;
-import com.follow.clash.service.IEventInterface;
-import com.follow.clash.service.IResultInterface;
+import com.follow.clash.service.IMessageInterface;
 import com.follow.clash.service.models.VpnOptions;
 import com.follow.clash.service.models.NotificationParams;
 
 interface IRemoteInterface {
     void invokeAction(in String data, in ICallbackInterface callback);
     void updateNotificationParams(in NotificationParams params);
-    void startService(in VpnOptions options, in long runTime, in IResultInterface result);
-    void stopService(in IResultInterface result);
-    void setEventListener(in IEventInterface event);
-    void setCrashlytics(in boolean enable);
-    long getRunTime();
+    void startService(in VpnOptions options,in boolean inApp);
+    void stopService();
+    void setMessageCallback(in IMessageInterface messageCallback);
 }

android/service/src/main/aidl/com/follow/clash/service/IResultInterface.aidl

@@ -1,6 +0,0 @@
-// IResultInterface.aidl
-package com.follow.clash.service;
-
-interface IResultInterface {
-    oneway void onResult(in long runTime);
-}

android/service/src/main/java/com/follow/clash/service/CommonService.kt

@@ -29,11 +29,6 @@ class CommonService : Service(), IBaseService,
         handleCreate()
     }
 
-    override fun onDestroy() {
-        handleDestroy()
-        super.onDestroy()
-    }
-
     override fun onLowMemory() {
         Core.forceGC()
         super.onLowMemory()

android/service/src/main/java/com/follow/clash/service/IBaseService.kt

@@ -1,18 +1,15 @@
 package com.follow.clash.service
 
 import com.follow.clash.common.BroadcastAction
-import com.follow.clash.common.GlobalState
 import com.follow.clash.common.sendBroadcast
 
 interface IBaseService {
     fun handleCreate() {
-        GlobalState.log("Service create")
-        BroadcastAction.SERVICE_CREATED.sendBroadcast()
-    }
-
-    fun handleDestroy() {
-        GlobalState.log("Service destroy")
-        BroadcastAction.SERVICE_DESTROYED.sendBroadcast()
+        if (!State.inApp) {
+            BroadcastAction.START.sendBroadcast()
+        } else {
+            State.inApp = false
+        }
     }
 
     fun start()

android/service/src/main/java/com/follow/clash/service/RemoteService.kt

@@ -3,97 +3,62 @@ package com.follow.clash.service
 import android.app.Service
 import android.content.Intent
 import android.os.IBinder
-import com.follow.clash.common.GlobalState
 import com.follow.clash.common.ServiceDelegate
 import com.follow.clash.common.chunkedForAidl
 import com.follow.clash.common.intent
 import com.follow.clash.core.Core
-import com.follow.clash.service.State.delegate
-import com.follow.clash.service.State.intent
-import com.follow.clash.service.State.runLock
 import com.follow.clash.service.models.NotificationParams
 import com.follow.clash.service.models.VpnOptions
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlinx.coroutines.sync.withLock
-import java.util.UUID
-import kotlin.coroutines.resume
 
 class RemoteService : Service(),
     CoroutineScope by CoroutineScope(SupervisorJob() + Dispatchers.Default) {
-    private fun handleStopService(result: IResultInterface) {
+    private var delegate: ServiceDelegate<IBaseService>? = null
+    private var intent: Intent? = null
+
+    private fun handleStopService() {
         launch {
-            runLock.withLock {
-                delegate?.useService { service ->
-                    service.stop()
-                    delegate?.unbind()
-                }
-                State.runTime = 0
-                result.onResult(0)
+            delegate?.useService { service ->
+                service.stop()
+                delegate?.unbind()
             }
         }
     }
 
-    private fun handleServiceDisconnected(message: String) {
-        GlobalState.log("Background service disconnected: $message")
-        intent = null
-        delegate = null
-    }
-
-    private fun handleStartService(runTime: Long, result: IResultInterface) {
+    private fun handleStartService() {
         launch {
-            runLock.withLock {
-                val nextIntent = when (State.options?.enable == true) {
-                    true -> VpnService::class.intent
-                    false -> CommonService::class.intent
-                }
-                if (intent != nextIntent) {
-                    delegate?.unbind()
-                    delegate = ServiceDelegate(nextIntent, ::handleServiceDisconnected) { binder ->
-                        when (binder) {
-                            is VpnService.LocalBinder -> binder.getService()
-                            is CommonService.LocalBinder -> binder.getService()
-                            else -> throw IllegalArgumentException("Invalid binder type")
-                        }
+            val nextIntent = when (State.options?.enable == true) {
+                true -> VpnService::class.intent
+                false -> CommonService::class.intent
+            }
+            if (intent != nextIntent) {
+                delegate?.unbind()
+                delegate = ServiceDelegate(nextIntent) { binder ->
+                    when (binder) {
+                        is VpnService.LocalBinder -> binder.getService()
+                        is CommonService.LocalBinder -> binder.getService()
+                        else -> throw IllegalArgumentException("Invalid binder type")
                     }
-                    intent = nextIntent
-                    delegate?.bind()
                 }
-                delegate?.useService { service ->
-                    service.start()
-                }
-                State.runTime = when (runTime != 0L) {
-                    true -> runTime
-                    false -> System.currentTimeMillis()
-                }
-                result.onResult(State.runTime)
+                intent = nextIntent
+                delegate?.bind()
+            }
+            delegate?.useService { service ->
+                service.start()
             }
         }
     }
 
-    private val binder = object : IRemoteInterface.Stub() {
+    private val binder: IRemoteInterface.Stub = object : IRemoteInterface.Stub() {
         override fun invokeAction(data: String, callback: ICallbackInterface) {
             Core.invokeAction(data) {
-                launch {
-                    runCatching {
-                        val chunks = it?.chunkedForAidl() ?: listOf()
-                        for ((index, chunk) in chunks.withIndex()) {
-                            suspendCancellableCoroutine { cont ->
-                                callback.onResult(
-                                    chunk,
-                                    index == chunks.lastIndex,
-                                    object : IAckInterface.Stub() {
-                                        override fun onAck() {
-                                            cont.resume(Unit)
-                                        }
-                                    },
-                                )
-                            }
-                        }
-                    }
+                val chunks = it?.chunkedForAidl() ?: listOf()
+                val totalSize = chunks.size
+                chunks.forEachIndexed { index, chunk ->
+                    callback.onResult(chunk, totalSize - 1 == index)
                 }
             }
         }
@@ -102,65 +67,28 @@ class RemoteService : Service(),
             State.notificationParamsFlow.tryEmit(params)
         }
 
-
         override fun startService(
-            options: VpnOptions,
-            runtime: Long,
-            result: IResultInterface,
+            options: VpnOptions, inApp: Boolean
         ) {
             State.options = options
-            handleStartService(runtime, result)
+            State.inApp = inApp
+            handleStartService()
         }
 
-        override fun stopService(result: IResultInterface) {
-            handleStopService(result)
+        override fun stopService() {
+            handleStopService()
         }
 
-        override fun setEventListener(eventListener: IEventInterface?) {
-            GlobalState.log("RemoveEventListener ${eventListener == null}")
-            when (eventListener != null) {
-                true -> Core.callSetEventListener {
-                    launch {
-                        runCatching {
-                            val id = UUID.randomUUID().toString()
-                            val chunks = it?.chunkedForAidl() ?: listOf()
-                            for ((index, chunk) in chunks.withIndex()) {
-                                suspendCancellableCoroutine { cont ->
-                                    eventListener.onEvent(
-                                        id,
-                                        chunk,
-                                        index == chunks.lastIndex,
-                                        object : IAckInterface.Stub() {
-                                            override fun onAck() {
-                                                cont.resume(Unit)
-                                            }
-                                        },
-                                    )
-                                }
-                            }
-                        }
-                    }
-                }
-
-                false -> Core.callSetEventListener(null)
-            }
+        override fun setMessageCallback(messageCallback: IMessageInterface) {
+            setMessageCallback(messageCallback::onResult)
         }
+    }
 
-        override fun setCrashlytics(enable: Boolean) {
-            GlobalState.setCrashlytics(enable)
-        }
-
-        override fun getRunTime(): Long {
-            return State.runTime
-        }
+    private fun setMessageCallback(cb: (result: String?) -> Unit) {
+        Core.setMessageCallback(cb)
     }
 
     override fun onBind(intent: Intent?): IBinder {
         return binder
     }
-
-    override fun onDestroy() {
-        GlobalState.log("Remote service destroy")
-        super.onDestroy()
-    }
 }

android/service/src/main/java/com/follow/clash/service/State.kt

@@ -1,22 +1,13 @@
 package com.follow.clash.service
 
-import android.content.Intent
-import com.follow.clash.common.ServiceDelegate
 import com.follow.clash.service.models.NotificationParams
 import com.follow.clash.service.models.VpnOptions
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.sync.Mutex
 
 object State {
     var options: VpnOptions? = null
+    var inApp: Boolean = false
     var notificationParamsFlow: MutableStateFlow<NotificationParams?> = MutableStateFlow(
         NotificationParams()
     )
-
-    val runLock = Mutex()
-    var runTime: Long = 0L
-
-    var delegate: ServiceDelegate<IBaseService>? = null
-
-    var intent: Intent? = null
 }

android/service/src/main/java/com/follow/clash/service/VpnService.kt

@@ -11,7 +11,8 @@ import android.os.RemoteException
 import android.util.Log
 import androidx.core.content.getSystemService
 import com.follow.clash.common.AccessControlMode
-import com.follow.clash.common.GlobalState
+import com.follow.clash.common.BroadcastAction
+import com.follow.clash.common.sendBroadcast
 import com.follow.clash.core.Core
 import com.follow.clash.service.models.VpnOptions
 import com.follow.clash.service.models.getIpv4RouteAddress
@@ -43,11 +44,6 @@ class VpnService : SystemVpnService(), IBaseService,
         handleCreate()
     }
 
-    override fun onDestroy() {
-        handleDestroy()
-        super.onDestroy()
-    }
-
     private val connectivity by lazy {
         getSystemService<ConnectivityManager>()
     }
@@ -111,13 +107,11 @@ class VpnService : SystemVpnService(), IBaseService,
             try {
                 val isSuccess = super.onTransact(code, data, reply, flags)
                 if (!isSuccess) {
-                    GlobalState.log("VpnService disconnected")
-                    handleDestroy()
+                    BroadcastAction.STOP.sendBroadcast()
                 }
                 return isSuccess
             } catch (e: RemoteException) {
-                GlobalState.log("VpnService onTransact $e")
-                return false
+                throw e
             }
         }
     }
@@ -213,7 +207,6 @@ class VpnService : SystemVpnService(), IBaseService,
                 allowBypass()
             }
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && options.systemProxy) {
-                GlobalState.log("Open http proxy")
                 setHttpProxy(
                     ProxyInfo.buildDirectProxy(
                         "127.0.0.1", options.port, options.bypassDomain

android/service/src/main/java/com/follow/clash/service/models/Traffic.kt

@@ -1,6 +1,5 @@
 package com.follow.clash.service.models
 
-import com.follow.clash.common.GlobalState
 import com.follow.clash.common.formatBytes
 import com.follow.clash.core.Core
 import com.google.gson.Gson
@@ -14,12 +13,7 @@ val Traffic.speedText: String
     get() = "${up.formatBytes}/s↑  ${down.formatBytes}/s↓"
 
 fun Core.getSpeedTrafficText(onlyStatisticsProxy: Boolean): String {
-    try {
-        val res = getTraffic(onlyStatisticsProxy)
-        val traffic = Gson().fromJson(res, Traffic::class.java)
-        return traffic.speedText
-    } catch (e: Exception) {
-        GlobalState.log(e.message + "")
-        return ""
-    }
+    val res = getTraffic(onlyStatisticsProxy)
+    val traffic = Gson().fromJson(res, Traffic::class.java)
+    return traffic.speedText
 }

android/service/src/main/java/com/follow/clash/service/modules/NetworkObserveModule.kt

@@ -102,7 +102,7 @@ class NetworkObserveModule(private val service: Service) : Module() {
             return
         }
         preDnsList = dnsList
-        Core.updateDNS(dnsList.toSet().joinToString(","))
+        Core.updateDNS(dnsList.joinToString { "," })
     }
 
     fun setUnderlyingNetworks(network: Network) {

android/service/src/main/java/com/follow/clash/service/modules/NotificationModule.kt

@@ -47,6 +47,9 @@ class NotificationModule(private val service: Service) : Module() {
     private val scope = CoroutineScope(Dispatchers.Default)
 
     override fun onInstall() {
+        State.notificationParamsFlow.value?.let {
+            update(it.extended)
+        }
         scope.launch {
             val screenFlow = service.receiveBroadcastFlow {
                 addAction(Intent.ACTION_SCREEN_ON)
@@ -66,12 +69,6 @@ class NotificationModule(private val service: Service) : Module() {
                 .collect { (params, _) ->
                     update(params!!)
                 }
-
-            State.notificationParamsFlow.value?.let {
-                update(it.extended)
-            } ?: run {
-                update(NotificationParams().extended)
-            }
         }
     }
 
@@ -93,13 +90,12 @@ class NotificationModule(private val service: Service) : Module() {
             setSmallIcon(R.drawable.ic)
             setContentTitle("FlClash")
             setContentIntent(intent.toPendingIntent)
-            setPriority(NotificationCompat.PRIORITY_HIGH)
             setCategory(NotificationCompat.CATEGORY_SERVICE)
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
                 foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
             }
             setOngoing(true)
-            setShowWhen(true)
+            setShowWhen(false)
             setOnlyAlertOnce(true)
         }
     }
@@ -109,6 +105,7 @@ class NotificationModule(private val service: Service) : Module() {
             with(notificationBuilder) {
                 setContentTitle(params.title)
                 setContentText(params.contentText)
+                setPriority(NotificationCompat.PRIORITY_HIGH)
                 clearActions()
                 addAction(
                     0, params.stopText, QuickAction.STOP.quickIntent.toPendingIntent

android/service/src/main/res/drawable/ic_service.xml

@@ -1,17 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:width="240dp"
-    android:height="240dp"
-    android:viewportWidth="240"
-    android:viewportHeight="240"
-    tools:ignore="VectorRaster">
-  <path
-      android:pathData="M48.1,80.89L168.44,11.41c11.08,-6.4 25.24,-2.6 31.64,8.48 0,0 0,0 0,0h0c6.4,11.08 2.6,25.24 -8.48,31.64 0,0 0,0 0,0l-120.34,69.48c-11.08,6.4 -25.24,2.6 -31.64,-8.48 0,0 0,0 0,0h0c-6.4,-11.08 -2.6,-25.24 8.48,-31.64 0,0 0,0 0,0Z"
-      android:fillColor="#6666FB"/>
-  <path
-      android:pathData="M78.98,134.37l60.18,-34.74c11.07,-6.39 25.23,-2.59 31.63,8.48h0c6.4,11.07 2.61,25.24 -8.47,31.64l-60.18,34.74c-11.08,6.4 -25.24,2.6 -31.64,-8.48 0,0 0,0 0,0h0c-6.4,-11.08 -2.6,-25.24 8.48,-31.64h0Z"
-      android:fillColor="#336AB6"/>
-  <path
-      android:pathData="M109.86,187.86h0c11.08,-6.4 25.24,-2.6 31.64,8.48 0,0 0,0 0,0h0c6.4,11.08 2.6,25.24 -8.48,31.64 0,0 0,0 0,0h0c-11.08,6.4 -25.24,2.6 -31.64,-8.48 0,0 0,0 0,0h0c-6.4,-11.08 -2.6,-25.24 8.48,-31.64 0,0 0,0 0,0Z"
-      android:fillColor="#5CA8E9"/>
-</vector>

android/settings.gradle.kts

@@ -18,10 +18,8 @@ pluginManagement {
 
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
-    id("com.android.application") version "8.12.2" apply false
+    id("com.android.application") version "8.12.1" apply false
     id("org.jetbrains.kotlin.android") version "2.2.10" apply false
-    id("com.google.gms.google-services") version ("4.3.15") apply false
-    id("com.google.firebase.crashlytics") version ("2.8.1") apply false
 }
 
 

arb/intl_en.arb

@@ -409,7 +409,7 @@
   "autoSetSystemDns": "Auto set system DNS",
   "details": "{label} details",
   "creationTime": "Creation time",
-  "process": "Process",
+  "progress": "Progress",
   "host": "Host",
   "destination": "Destination",
   "destinationGeoIP": "Destination GeoIP",
@@ -428,9 +428,5 @@
   "restartCoreTip": "Are you sure you want to restart the core?",
   "forceRestartCoreTip": "Are you sure you want to force restart the core?",
   "dnsHijacking": "DNS hijacking",
-  "coreStatus": "Core status",
-  "dataCollectionTip": "Data Collection Notice",
-  "dataCollectionContent": "This app uses Firebase Crashlytics to collect crash information to improve app stability.\nThe collected data includes device information and crash details, but does not contain personal sensitive data.\nYou can disable this feature in settings.",
-  "crashlytics": "Crash Analysis",
-  "crashlyticsTip": "When enabled, automatically uploads crash logs without sensitive information when the app crashes"
+  "coreStatus": "Core status"
 }

arb/intl_ja.arb

@@ -410,7 +410,7 @@
   "autoSetSystemDns": "オートセットシステムDNS",
   "details": "{label}詳細",
   "creationTime": "作成時間",
-  "process": "プロセス",
+  "progress": "進捗",
   "host": "ホスト",
   "destination": "宛先",
   "destinationGeoIP": "宛先地理情報",
@@ -429,9 +429,5 @@
   "restartCoreTip": "コアを再起動してもよろしいですか？",
   "forceRestartCoreTip": "コアを強制再起動してもよろしいですか？",
   "dnsHijacking": "DNSハイジャッキング",
-  "coreStatus": "コアステータス",
-  "dataCollectionTip": "データ収集説明",
-  "dataCollectionContent": "本アプリはFirebase Crashlyticsを使用してクラッシュ情報を収集し、アプリの安定性を向上させます。\n収集されるデータにはデバイス情報とクラッシュ詳細が含まれますが、個人の機密データは含まれません。\n設定でこの機能を無効にすることができます。",
-  "crashlytics": "クラッシュ分析",
-  "crashlyticsTip": "有効にすると、アプリがクラッシュした際に機密情報を含まないクラッシュログを自動的にアップロードします"
+  "coreStatus": "コアステータス"
 }

arb/intl_ru.arb

@@ -410,7 +410,7 @@
   "autoSetSystemDns": "Автоматическая настройка системного DNS",
   "details": "Детали {}",
   "creationTime": "Время создания",
-  "process": "процесс",
+  "progress": "Прогресс",
   "host": "Хост",
   "destination": "Назначение",
   "destinationGeoIP": "Геолокация назначения",
@@ -429,9 +429,5 @@
   "restartCoreTip": "Вы уверены, что хотите перезапустить ядро?",
   "forceRestartCoreTip": "Вы уверены, что хотите принудительно перезапустить ядро?",
   "dnsHijacking": "DNS-перехват",
-  "coreStatus": "Основной статус",
-  "dataCollectionTip": "Уведомление о сборе данных",
-  "dataCollectionContent": "Это приложение использует Firebase Crashlytics для сбора информации о сбоях nhằm улучшения стабильности приложения.\nСобираемые данные включают информацию об устройстве и подробности о сбоях, но не содержат персональных конфиденциальных данных.\nВы можете отключить эту функцию в настройках.",
-  "crashlytics": "Анализ сбоев",
-  "crashlyticsTip": "При включении автоматически загружает журналы сбоев без конфиденциальной информации, когда приложение выходит из строя"
+  "coreStatus": "Основной статус"
 }

arb/intl_zh_CN.arb

@@ -410,7 +410,7 @@
   "autoSetSystemDns": "自动设置系统DNS",
   "details": "{label}详情",
   "creationTime": "创建时间",
-  "process": "进程",
+  "progress": "进度",
   "host": "主机",
   "destination": "目标地址",
   "destinationGeoIP": "目标地理定位",
@@ -429,9 +429,5 @@
   "restartCoreTip": "您确定要重启核心吗？",
   "forceRestartCoreTip": "您确定要强制重启核心吗？",
   "dnsHijacking": "DNS劫持",
-  "coreStatus": "核心状态",
-  "dataCollectionTip": "数据收集说明",
-  "dataCollectionContent": "本应用使用 Firebase Crashlytics 收集崩溃信息以改进应用稳定性。\n收集的数据包括设备信息和崩溃详情，不包含个人敏感数据。\n您可以在设置中关闭此功能。",
-  "crashlytics": "崩溃分析",
-  "crashlyticsTip": "开启后，应用崩溃时自动上传不包含敏感信息的崩溃日志"
+  "coreStatus": "核心状态"
 }

core/action.go

@@ -53,8 +53,8 @@ func handleAction(action *Action, result ActionResult) {
 		result.success(handleShutdown())
 		return
 	case validateConfigMethod:
-		path := action.Data.(string)
-		result.success(handleValidateConfig(path))
+		data := []byte(action.Data.(string))
+		result.success(handleValidateConfig(data))
 		return
 	case updateConfigMethod:
 		data := []byte(action.Data.(string))

core/bride.c

@@ -2,8 +2,6 @@
 
 void (*release_object_func)(void *obj);
 
-void (*free_string_func)(char *data);
-
 void (*protect_func)(void *tun_interface, int fd);
 
 char* (*resolve_process_func)(void *tun_interface,int protocol, const char *source, const char *target, int uid);
@@ -22,10 +20,6 @@ void release_object(void *obj) {
     release_object_func(obj);
 }
 
-void free_string(char *data) {
-    free_string_func(data);
-}
-
 void result(void *invoke_Interface, const char *data) {
     return result_func(invoke_Interface, data);
 }

core/bride.go

@@ -16,7 +16,7 @@ func resolveProcess(callback unsafe.Pointer, protocol int, source, target string
 	t := C.CString(target)
 	defer C.free(unsafe.Pointer(t))
 	res := C.resolve_process(callback, C.int(protocol), s, t, C.int(uid))
-	return takeCString(res)
+	return parseCString(res)
 }
 
 func invokeResult(callback unsafe.Pointer, data string) {
@@ -29,7 +29,7 @@ func releaseObject(callback unsafe.Pointer) {
 	C.release_object(callback)
 }
 
-func takeCString(s *C.char) string {
-	defer C.free_string(s)
+func parseCString(s *C.char) string {
+	//defer C.free(unsafe.Pointer(s))
 	return C.GoString(s)
 }

core/bride.h

@@ -4,8 +4,6 @@
 
 extern void (*release_object_func)(void *obj);
 
-extern void (*free_string_func)(char *data);
-
 extern void (*protect_func)(void *tun_interface, int fd);
 
 extern char* (*resolve_process_func)(void *tun_interface, int protocol, const char *source, const char *target, int uid);
@@ -18,6 +16,4 @@ extern char* resolve_process(void *tun_interface, int protocol, const char *sour
 
 extern void release_object(void *obj);
 
-extern void free_string(char *data);
-
 extern void result(void *invoke_Interface,  const char *data);

core/common.go

@@ -17,6 +17,7 @@ import (
 	"github.com/metacubex/mihomo/constant/features"
 	cp "github.com/metacubex/mihomo/constant/provider"
 	"github.com/metacubex/mihomo/hub"
+	"github.com/metacubex/mihomo/hub/executor"
 	"github.com/metacubex/mihomo/hub/route"
 	"github.com/metacubex/mihomo/listener"
 	"github.com/metacubex/mihomo/log"
@@ -115,15 +116,11 @@ func updateListeners() {
 	listeners := currentConfig.Listeners
 	general := currentConfig.General
 	listener.PatchInboundListeners(listeners, tunnel.Tunnel, true)
-
-	allowLan := general.AllowLan
-	listener.SetAllowLan(allowLan)
+	listener.SetAllowLan(general.AllowLan)
 	inbound.SetSkipAuthPrefixes(general.SkipAuthPrefixes)
 	inbound.SetAllowedIPs(general.LanAllowedIPs)
 	inbound.SetDisAllowedIPs(general.LanDisAllowedIPs)
-
-	bindAddress := general.BindAddress
-	listener.SetBindAddress(bindAddress)
+	listener.SetBindAddress(general.BindAddress)
 	listener.ReCreateHTTP(general.Port, tunnel.Tunnel)
 	listener.ReCreateSocks(general.SocksPort, tunnel.Tunnel)
 	listener.ReCreateRedir(general.RedirPort, tunnel.Tunnel)
@@ -239,30 +236,12 @@ func updateConfig(params *UpdateParams) {
 	updateListeners()
 }
 
-func parseWithPath(path string) (*config.Config, error) {
-	buf, err := readFile(path)
-	if err != nil {
-		return nil, err
-	}
-	rawConfig := config.DefaultRawConfig()
-	err = UnmarshalJson(buf, rawConfig)
-	if err != nil {
-		return nil, err
-	}
-	parseRawConfig, err := config.ParseRawConfig(rawConfig)
-	if err != nil {
-		return nil, err
-	}
-
-	return parseRawConfig, nil
-}
-
 func setupConfig(params *SetupParams) error {
 	runLock.Lock()
 	defer runLock.Unlock()
 	var err error
 	constant.DefaultTestURL = params.TestURL
-	currentConfig, err = parseWithPath(filepath.Join(constant.Path.HomeDir(), "config.json"))
+	currentConfig, err = executor.ParseWithPath(filepath.Join(constant.Path.HomeDir(), "config.yaml"))
 	if err != nil {
 		currentConfig, _ = config.ParseRawConfig(config.DefaultRawConfig())
 	}

core/go.mod

@@ -1,6 +1,6 @@
 module core
 
-go 1.25
+go 1.20
 
 replace github.com/metacubex/mihomo => ./Clash.Meta
 

core/hub.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"github.com/metacubex/mihomo/adapter"
 	"github.com/metacubex/mihomo/adapter/outboundgroup"
 	"github.com/metacubex/mihomo/common/observable"
@@ -60,7 +61,6 @@ func handleStopListener() bool {
 	defer runLock.Unlock()
 	isRunning = false
 	listener.StopListener()
-	resolver.ResetConnection()
 	return true
 }
 
@@ -83,9 +83,8 @@ func handleShutdown() bool {
 	return true
 }
 
-func handleValidateConfig(path string) string {
-	buf, err := readFile(path)
-	_, err = config.UnmarshalRawConfig(buf)
+func handleValidateConfig(bytes []byte) string {
+	_, err := config.UnmarshalRawConfig(bytes)
 	if err != nil {
 		return err.Error()
 	}
@@ -145,7 +144,7 @@ func handleGetTraffic(onlyStatisticsProxy bool) string {
 	}
 	data, err := json.Marshal(traffic)
 	if err != nil {
-		log.Errorln("Error: %s", err)
+		fmt.Println("Error:", err)
 		return ""
 	}
 	return string(data)
@@ -159,7 +158,7 @@ func handleGetTotalTraffic(onlyStatisticsProxy bool) string {
 	}
 	data, err := json.Marshal(traffic)
 	if err != nil {
-		log.Errorln("Error: %s", err)
+		fmt.Println("Error:", err)
 		return ""
 	}
 	return string(data)
@@ -229,7 +228,7 @@ func handleGetConnections() string {
 	snapshot := statistic.DefaultManager.Snapshot()
 	data, err := json.Marshal(snapshot)
 	if err != nil {
-		log.Errorln("Error: %s", err)
+		fmt.Println("Error:", err)
 		return ""
 	}
 	return string(data)
@@ -324,13 +323,13 @@ func handleUpdateGeoData(geoType string, geoName string, fn func(value string))
 				fn(err.Error())
 				return
 			}
-		case "GEOIP":
+		case "GeoIp":
 			err := updater.UpdateGeoIpWithPath(path)
 			if err != nil {
 				fn(err.Error())
 				return
 			}
-		case "GEOSITE":
+		case "GeoSite":
 			err := updater.UpdateGeoSiteWithPath(path)
 			if err != nil {
 				fn(err.Error())

core/lib.go

@@ -27,7 +27,7 @@ import (
 	"unsafe"
 )
 
-var eventListener unsafe.Pointer
+var messageCallback unsafe.Pointer
 
 type TunHandler struct {
 	listener *sing_tun.Listener
@@ -181,7 +181,7 @@ func nextHandle(action *Action, result ActionResult) bool {
 
 //export invokeAction
 func invokeAction(callback unsafe.Pointer, paramsChar *C.char) {
-	params := takeCString(paramsChar)
+	params := parseCString(paramsChar)
 	var action = &Action{}
 	err := json.Unmarshal([]byte(params), action)
 	if err != nil {
@@ -198,39 +198,35 @@ func invokeAction(callback unsafe.Pointer, paramsChar *C.char) {
 
 //export startTUN
 func startTUN(callback unsafe.Pointer, fd C.int, stackChar, addressChar, dnsChar *C.char) bool {
-	handleStartTun(callback, int(fd), takeCString(stackChar), takeCString(addressChar), takeCString(dnsChar))
+	handleStartTun(callback, int(fd), parseCString(stackChar), parseCString(addressChar), parseCString(dnsChar))
 	return true
 }
 
-//export setEventListener
-func setEventListener(listener unsafe.Pointer) {
-	if eventListener != nil || listener == nil {
-		releaseObject(eventListener)
+//export setMessageCallback
+func setMessageCallback(callback unsafe.Pointer) {
+	if messageCallback != nil {
+		releaseObject(messageCallback)
 	}
-	eventListener = listener
+	messageCallback = callback
 }
 
 //export getTotalTraffic
 func getTotalTraffic(onlyStatisticsProxy bool) *C.char {
-	data := C.CString(handleGetTotalTraffic(onlyStatisticsProxy))
-	defer C.free(unsafe.Pointer(data))
-	return data
+	return C.CString(handleGetTotalTraffic(onlyStatisticsProxy))
 }
 
 //export getTraffic
 func getTraffic(onlyStatisticsProxy bool) *C.char {
-	data := C.CString(handleGetTraffic(onlyStatisticsProxy))
-	defer C.free(unsafe.Pointer(data))
-	return data
+	return C.CString(handleGetTraffic(onlyStatisticsProxy))
 }
 
 func sendMessage(message Message) {
-	if eventListener == nil {
+	if messageCallback == nil {
 		return
 	}
 	result := ActionResult{
 		Method:   messageMethod,
-		callback: eventListener,
+		callback: messageCallback,
 		Data:     message,
 	}
 	result.send()
@@ -253,5 +249,5 @@ func forceGC() {
 
 //export updateDns
 func updateDns(s *C.char) {
-	handleUpdateDns(takeCString(s))
+	handleUpdateDns(parseCString(s))
 }

lib/application.dart

@@ -66,7 +66,7 @@ class ApplicationState extends ConsumerState<Application> {
     });
   }
 
-  Widget _buildPlatformState({required Widget child}) {
+  Widget _buildPlatformState(Widget child) {
     if (system.isDesktop) {
       return WindowManager(
         child: TrayManager(
@@ -77,7 +77,7 @@ class ApplicationState extends ConsumerState<Application> {
     return AndroidManager(child: TileManager(child: child));
   }
 
-  Widget _buildState({required Widget child}) {
+  Widget _buildState(Widget child) {
     return AppStateManager(
       child: CoreManager(
         child: ConnectivityManager(
@@ -94,68 +94,70 @@ class ApplicationState extends ConsumerState<Application> {
     );
   }
 
-  Widget _buildPlatformApp({required Widget child}) {
+  Widget _buildPlatformApp(Widget child) {
     if (system.isDesktop) {
       return WindowHeaderContainer(child: child);
     }
     return VpnManager(child: child);
   }
 
-  Widget _buildApp({required Widget child}) {
+  Widget _buildApp(Widget child) {
     return MessageManager(child: ThemeManager(child: child));
   }
 
   @override
   Widget build(context) {
-    return Consumer(
-      builder: (_, ref, child) {
-        final locale = ref.watch(
-          appSettingProvider.select((state) => state.locale),
-        );
-        final themeProps = ref.watch(themeSettingProvider);
-        return MaterialApp(
-          debugShowCheckedModeBanner: false,
-          navigatorKey: globalState.navigatorKey,
-          localizationsDelegates: const [
-            AppLocalizations.delegate,
-            GlobalMaterialLocalizations.delegate,
-            GlobalCupertinoLocalizations.delegate,
-            GlobalWidgetsLocalizations.delegate,
-          ],
-          builder: (_, child) {
-            return AppEnvManager(
-              child: _buildApp(
-                child: _buildPlatformState(
-                  child: _buildState(child: _buildPlatformApp(child: child!)),
+    return _buildPlatformState(
+      _buildState(
+        Consumer(
+          builder: (_, ref, child) {
+            final locale = ref.watch(
+              appSettingProvider.select((state) => state.locale),
+            );
+            final themeProps = ref.watch(themeSettingProvider);
+            return MaterialApp(
+              debugShowCheckedModeBanner: false,
+              navigatorKey: globalState.navigatorKey,
+              localizationsDelegates: const [
+                AppLocalizations.delegate,
+                GlobalMaterialLocalizations.delegate,
+                GlobalCupertinoLocalizations.delegate,
+                GlobalWidgetsLocalizations.delegate,
+              ],
+              builder: (_, child) {
+                return AppEnvManager(
+                  child: _buildApp(
+                    AppSidebarContainer(child: _buildPlatformApp(child!)),
+                  ),
+                );
+              },
+              scrollBehavior: BaseScrollBehavior(),
+              title: appName,
+              locale: utils.getLocaleForString(locale),
+              supportedLocales: AppLocalizations.delegate.supportedLocales,
+              themeMode: themeProps.themeMode,
+              theme: ThemeData(
+                useMaterial3: true,
+                pageTransitionsTheme: _pageTransitionsTheme,
+                colorScheme: _getAppColorScheme(
+                  brightness: Brightness.light,
+                  primaryColor: themeProps.primaryColor,
                 ),
               ),
+              darkTheme: ThemeData(
+                useMaterial3: true,
+                pageTransitionsTheme: _pageTransitionsTheme,
+                colorScheme: _getAppColorScheme(
+                  brightness: Brightness.dark,
+                  primaryColor: themeProps.primaryColor,
+                ).toPureBlack(themeProps.pureBlack),
+              ),
+              home: child!,
             );
           },
-          scrollBehavior: BaseScrollBehavior(),
-          title: appName,
-          locale: utils.getLocaleForString(locale),
-          supportedLocales: AppLocalizations.delegate.supportedLocales,
-          themeMode: themeProps.themeMode,
-          theme: ThemeData(
-            useMaterial3: true,
-            pageTransitionsTheme: _pageTransitionsTheme,
-            colorScheme: _getAppColorScheme(
-              brightness: Brightness.light,
-              primaryColor: themeProps.primaryColor,
-            ),
-          ),
-          darkTheme: ThemeData(
-            useMaterial3: true,
-            pageTransitionsTheme: _pageTransitionsTheme,
-            colorScheme: _getAppColorScheme(
-              brightness: Brightness.dark,
-              primaryColor: themeProps.primaryColor,
-            ).toPureBlack(themeProps.pureBlack),
-          ),
-          home: child!,
-        );
-      },
-      child: const HomePage(),
+          child: const HomePage(),
+        ),
+      ),
     );
   }
 

lib/common/android.dart

@@ -0,0 +1,13 @@
+import 'package:fl_clash/plugins/service.dart';
+import 'package:fl_clash/state.dart';
+
+import 'system.dart';
+
+class Android {
+  Future<void> init() async {
+    await service?.init();
+    await service?.syncAndroidState(globalState.getAndroidState());
+  }
+}
+
+final android = system.isAndroid ? Android() : null;

lib/common/cache.dart

@@ -1,185 +0,0 @@
-import 'dart:io';
-
-import 'package:dio/dio.dart';
-import 'package:fl_clash/common/common.dart';
-import 'package:flutter_cache_manager/flutter_cache_manager.dart';
-
-class LocalImageCacheManager extends CacheManager {
-  static const key = 'ImageCaches';
-
-  static final LocalImageCacheManager _instance = LocalImageCacheManager._();
-
-  factory LocalImageCacheManager() {
-    return _instance;
-  }
-
-  LocalImageCacheManager._()
-    : super(Config(key, fileService: _LocalImageCacheFileService()));
-}
-
-class _LocalImageCacheFileService extends FileService {
-  _LocalImageCacheFileService();
-
-  @override
-  Future<FileServiceResponse> get(
-    String url, {
-    Map<String, String>? headers,
-  }) async {
-    final response = await request.dio.get<ResponseBody>(
-      url,
-      options: Options(headers: headers, responseType: ResponseType.stream),
-    );
-    return _LocalImageResponse(response);
-  }
-}
-
-class _LocalImageResponse implements FileServiceResponse {
-  _LocalImageResponse(this._response);
-
-  final DateTime _receivedTime = DateTime.now();
-
-  final Response<ResponseBody> _response;
-
-  String? _header(String name) {
-    return _response.headers.value(name);
-  }
-
-  @override
-  int get statusCode => _response.statusCode ?? 0;
-
-  @override
-  Stream<List<int>> get content =>
-      _response.data!.stream.transform(uint8ListToListIntConverter);
-
-  @override
-  int? get contentLength => _response.data?.contentLength;
-
-  @override
-  DateTime get validTill {
-    var ageDuration = const Duration(days: 7);
-    final controlHeader = _header(HttpHeaders.cacheControlHeader);
-    if (controlHeader != null) {
-      final controlSettings = controlHeader.split(',');
-      for (final setting in controlSettings) {
-        final sanitizedSetting = setting.trim().toLowerCase();
-        if (sanitizedSetting == 'no-cache') {
-          ageDuration = Duration.zero;
-        }
-        if (sanitizedSetting.startsWith('max-age=')) {
-          final validSeconds =
-              int.tryParse(sanitizedSetting.split('=')[1]) ?? 0;
-          if (validSeconds > 0) {
-            ageDuration = Duration(seconds: validSeconds);
-          }
-        }
-      }
-    }
-
-    if (ageDuration > const Duration(days: 7)) {
-      return _receivedTime.add(ageDuration);
-    }
-    return _receivedTime.add(const Duration(days: 7));
-  }
-
-  @override
-  String? get eTag => _header(HttpHeaders.etagHeader);
-
-  @override
-  String get fileExtension {
-    var fileExtension = '';
-    final contentTypeHeader = _header(HttpHeaders.contentTypeHeader);
-    if (contentTypeHeader != null) {
-      final contentType = ContentType.parse(contentTypeHeader);
-      fileExtension = contentType.fileExtension;
-    }
-    return fileExtension;
-  }
-}
-
-extension ContentTypeConverter on ContentType {
-  String get fileExtension => mimeTypes[mimeType] ?? '.$subType';
-}
-
-const mimeTypes = {
-  'application/vnd.android.package-archive': '.apk',
-  'application/epub+zip': '.epub',
-  'application/gzip': '.gz',
-  'application/java-archive': '.jar',
-  'application/json': '.json',
-  'application/ld+json': '.jsonld',
-  'application/msword': '.doc',
-  'application/octet-stream': '.bin',
-  'application/ogg': '.ogx',
-  'application/pdf': '.pdf',
-  'application/php': '.php',
-  'application/rtf': '.rtf',
-  'application/vnd.amazon.ebook': '.azw',
-  'application/vnd.apple.installer+xml': '.mpkg',
-  'application/vnd.mozilla.xul+xml': '.xul',
-  'application/vnd.ms-excel': '.xls',
-  'application/vnd.ms-fontobject': '.eot',
-  'application/vnd.ms-powerpoint': '.ppt',
-  'application/vnd.oasis.opendocument.presentation': '.odp',
-  'application/vnd.oasis.opendocument.spreadsheet': '.ods',
-  'application/vnd.oasis.opendocument.text': '.odt',
-  'application/vnd.openxmlformats-officedocument.presentationml.presentation':
-      '.pptx',
-  'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': '.xlsx',
-  'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
-      '.docx',
-  'application/vnd.rar': '.rar',
-  'application/vnd.visio': '.vsd',
-  'application/x-7z-compressed': '.7z',
-  'application/x-abiword': '.abw',
-  'application/x-bzip': '.bz',
-  'application/x-bzip2': '.bz2',
-  'application/x-csh': '.csh',
-  'application/x-freearc': '.arc',
-  'application/x-sh': '.sh',
-  'application/x-shockwave-flash': '.swf',
-  'application/x-tar': '.tar',
-  'application/xhtml+xml': '.xhtml',
-  'application/xml': '.xml',
-  'application/zip': '.zip',
-  'audio/3gpp': '.3gp',
-  'audio/3gpp2': '.3g2',
-  'audio/aac': '.aac',
-  'audio/x-aac': '.aac',
-  'audio/midi': '.midi',
-  'audio/x-midi': '.midi',
-  'audio/x-m4a': '.m4a',
-  'audio/m4a': '.m4a',
-  'audio/mpeg': '.mp3',
-  'audio/ogg': '.oga',
-  'audio/opus': '.opus',
-  'audio/wav': '.wav',
-  'audio/x-wav': '.wav',
-  'audio/webm': '.weba',
-  'font/otf': '.otf',
-  'font/ttf': '.ttf',
-  'font/woff': '.woff',
-  'font/woff2': '.woff2',
-  'image/bmp': '.bmp',
-  'image/gif': '.gif',
-  'image/jpeg': '.jpg',
-  'image/png': '.png',
-  'image/svg+xml': '.svg',
-  'image/tiff': '.tiff',
-  'image/vnd.microsoft.icon': '.ico',
-  'image/webp': '.webp',
-  'text/calendar': '.ics',
-  'text/css': '.css',
-  'text/csv': '.csv',
-  'text/html': '.html',
-  'text/javascript': '.js',
-  'text/plain': '.txt',
-  'text/xml': '.xml',
-  'video/3gpp': '.3gp',
-  'video/3gpp2': '.3g2',
-  'video/mp2t': '.ts',
-  'video/mpeg': '.mpeg',
-  'video/ogg': '.ogv',
-  'video/webm': '.webm',
-  'video/x-msvideo': '.avi',
-  'video/quicktime': '.mov',
-};

lib/common/common.dart

@@ -1,5 +1,5 @@
+export 'android.dart';
 export 'app_localizations.dart';
-export 'cache.dart';
 export 'color.dart';
 export 'compute.dart';
 export 'constant.dart';

lib/common/compute.dart

@@ -2,6 +2,7 @@ import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 
 import 'string.dart';
+import 'utils.dart';
 
 List<Group> computeSort({
   required List<Group> groups,
@@ -106,5 +107,8 @@ List<Proxy> _sortOfDelay({
 }
 
 List<Proxy> _sortOfName(List<Proxy> proxies) {
-  return List.of(proxies)..sort((a, b) => a.name.compareTo(b.name));
+  return List.of(proxies)..sort(
+    (a, b) =>
+        utils.sortByChar(utils.getPinyin(a.name), utils.getPinyin(b.name)),
+  );
 }

lib/common/constant.dart

@@ -1,5 +1,3 @@
-// ignore_for_file: constant_identifier_names
-
 import 'dart:math';
 import 'dart:ui';
 
@@ -32,10 +30,10 @@ const animateDuration = Duration(milliseconds: 100);
 const midDuration = Duration(milliseconds: 200);
 const commonDuration = Duration(milliseconds: 300);
 const defaultUpdateDuration = Duration(days: 1);
-const MMDB = 'GEOIP.metadb';
-const ASN = 'ASN.mmdb';
-const GEOIP = 'GEOIP.dat';
-const GEOSITE = 'GEOSITE.dat';
+const mmdbFileName = 'geoip.metadb';
+const asnFileName = 'ASN.mmdb';
+const geoIpFileName = 'GeoIP.dat';
+const geoSiteFileName = 'GeoSite.dat';
 final double kHeaderHeight = system.isDesktop
     ? !system.isMacOS
           ? 40

lib/common/context.dart

@@ -7,17 +7,28 @@ extension BuildContextExtension on BuildContext {
     return findAncestorStateOfType<CommonScaffoldState>();
   }
 
-  void showNotifier(String text) {
+  Future<void>? showNotifier(String text) {
     return findAncestorStateOfType<MessageManagerState>()?.message(text);
   }
 
-  void showSnackBar(String message, {SnackBarAction? action}) {
+  void showSnackBar(
+    String message, {
+    SnackBarAction? action,
+  }) {
     final width = viewWidth;
     EdgeInsets margin;
     if (width < 600) {
-      margin = const EdgeInsets.only(bottom: 16, right: 16, left: 16);
+      margin = const EdgeInsets.only(
+        bottom: 16,
+        right: 16,
+        left: 16,
+      );
     } else {
-      margin = EdgeInsets.only(bottom: 16, left: 16, right: width - 316);
+      margin = EdgeInsets.only(
+        bottom: 16,
+        left: 16,
+        right: width - 316,
+      );
     }
     ScaffoldMessenger.of(this).showSnackBar(
       SnackBar(
@@ -65,11 +76,8 @@ extension BuildContextExtension on BuildContext {
 class BackHandleInherited extends InheritedWidget {
   final Function handleBack;
 
-  const BackHandleInherited({
-    super.key,
-    required this.handleBack,
-    required super.child,
-  });
+  const BackHandleInherited(
+      {super.key, required this.handleBack, required super.child});
 
   static BackHandleInherited? of(BuildContext context) =>
       context.dependOnInheritedWidgetOfExactType<BackHandleInherited>();

lib/common/function.dart

@@ -36,25 +36,16 @@ class Throttler {
     Function func, {
     List<dynamic>? args,
     Duration duration = const Duration(milliseconds: 600),
-    bool fire = false,
   }) {
     final timer = _operations[tag];
     if (timer != null) {
       return true;
     }
-    if (fire) {
+    _operations[tag] = Timer(duration, () {
+      _operations[tag]?.cancel();
+      _operations.remove(tag);
       Function.apply(func, args);
-      _operations[tag] = Timer(duration, () {
-        _operations[tag]?.cancel();
-        _operations.remove(tag);
-      });
-    } else {
-      _operations[tag] = Timer(duration, () {
-        Function.apply(func, args);
-        _operations[tag]?.cancel();
-        _operations.remove(tag);
-      });
-    }
+    });
     return false;
   }
 

lib/common/navigation.dart

@@ -15,14 +15,12 @@ class Navigation {
         keep: false,
         icon: Icon(Icons.space_dashboard),
         label: PageLabel.dashboard,
-        builder: (_) =>
-            const DashboardView(key: GlobalObjectKey(PageLabel.dashboard)),
+        builder: (_) => const DashboardView(),
       ),
       NavigationItem(
         icon: const Icon(Icons.article),
         label: PageLabel.proxies,
-        builder: (_) =>
-            const ProxiesView(key: GlobalObjectKey(PageLabel.proxies)),
+        builder: (_) => const ProxiesView(),
         modes: hasProxies
             ? [NavigationItemMode.mobile, NavigationItemMode.desktop]
             : [],
@@ -30,22 +28,19 @@ class Navigation {
       NavigationItem(
         icon: Icon(Icons.folder),
         label: PageLabel.profiles,
-        builder: (_) =>
-            const ProfilesView(key: GlobalObjectKey(PageLabel.profiles)),
+        builder: (_) => const ProfilesView(),
       ),
       NavigationItem(
         icon: Icon(Icons.view_timeline),
         label: PageLabel.requests,
-        builder: (_) =>
-            const RequestsView(key: GlobalObjectKey(PageLabel.requests)),
+        builder: (_) => const RequestsView(),
         description: 'requestsDesc',
         modes: [NavigationItemMode.desktop, NavigationItemMode.more],
       ),
       NavigationItem(
         icon: Icon(Icons.ballot),
         label: PageLabel.connections,
-        builder: (_) =>
-            const ConnectionsView(key: GlobalObjectKey(PageLabel.connections)),
+        builder: (_) => const ConnectionsView(),
         description: 'connectionsDesc',
         modes: [NavigationItemMode.desktop, NavigationItemMode.more],
       ),
@@ -53,14 +48,13 @@ class Navigation {
         icon: Icon(Icons.storage),
         label: PageLabel.resources,
         description: 'resourcesDesc',
-        builder: (_) =>
-            const ResourcesView(key: GlobalObjectKey(PageLabel.resources)),
+        builder: (_) => const ResourcesView(),
         modes: [NavigationItemMode.more],
       ),
       NavigationItem(
         icon: const Icon(Icons.adb),
         label: PageLabel.logs,
-        builder: (_) => const LogsView(key: GlobalObjectKey(PageLabel.logs)),
+        builder: (_) => const LogsView(),
         description: 'logsDesc',
         modes: openLogs
             ? [NavigationItemMode.desktop, NavigationItemMode.more]
@@ -69,7 +63,7 @@ class Navigation {
       NavigationItem(
         icon: Icon(Icons.construction),
         label: PageLabel.tools,
-        builder: (_) => const ToolsView(key: GlobalObjectKey(PageLabel.tools)),
+        builder: (_) => const ToolsView(),
         modes: [NavigationItemMode.desktop, NavigationItemMode.mobile],
       ),
     ];

lib/common/navigator.dart

@@ -134,15 +134,11 @@ class CommonPageTransition extends StatefulWidget {
     bool allowSnapshotting,
     Widget? child,
   ) {
-    final CurvedAnimation animation = CurvedAnimation(
+    final Animation<Offset> delegatedPositionAnimation = CurvedAnimation(
       parent: secondaryAnimation,
       curve: Curves.linearToEaseOut,
       reverseCurve: Curves.easeInToLinear,
-    );
-    final Animation<Offset> delegatedPositionAnimation = animation.drive(
-      _kMiddleLeftTween,
-    );
-    animation.dispose();
+    ).drive(_kMiddleLeftTween);
 
     assert(debugCheckHasDirectionality(context));
     final TextDirection textDirection = Directionality.of(context);

lib/common/path.dart

@@ -68,12 +68,7 @@ class AppPath {
 
   Future<String> get configFilePath async {
     final homeDirPath = await appPath.homeDirPath;
-    return join(homeDirPath, 'config.json');
-  }
-
-  Future<String> get validateFilePath async {
-    final homeDirPath = await appPath.homeDirPath;
-    return join(homeDirPath, 'temp', 'validate${utils.id}.yaml');
+    return join(homeDirPath, 'config.yaml');
   }
 
   Future<String> get sharedPreferencesPath async {

lib/common/print.dart

@@ -1,4 +1,3 @@
-import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/cupertino.dart';
@@ -13,14 +12,14 @@ class CommonPrint {
     return _instance!;
   }
 
-  void log(String? text, {LogLevel logLevel = LogLevel.info}) {
+  void log(String? text) {
     final payload = '[APP] $text';
     debugPrint(payload);
     if (!globalState.isInit) {
       return;
     }
     globalState.appController.addLog(
-      Log.app(payload).copyWith(logLevel: logLevel),
+      Log.app(payload),
     );
   }
 }

lib/common/request.dart

@@ -11,12 +11,12 @@ import 'package:fl_clash/state.dart';
 import 'package:flutter/cupertino.dart';
 
 class Request {
-  late final Dio dio;
+  late final Dio _dio;
   late final Dio _clashDio;
   String? userAgent;
 
   Request() {
-    dio = Dio(BaseOptions(headers: {'User-Agent': browserUa}));
+    _dio = Dio(BaseOptions(headers: {'User-Agent': browserUa}));
     _clashDio = Dio();
     _clashDio.httpClientAdapter = IOHttpClientAdapter(
       createHttpClient: () {
@@ -48,7 +48,7 @@ class Request {
 
   Future<MemoryImage?> getImage(String url) async {
     if (url.isEmpty) return null;
-    final response = await dio.get<Uint8List>(
+    final response = await _dio.get<Uint8List>(
       url,
       options: Options(responseType: ResponseType.bytes),
     );
@@ -58,7 +58,7 @@ class Request {
   }
 
   Future<Map<String, dynamic>?> checkForUpdate() async {
-    final response = await dio.get(
+    final response = await _dio.get(
       'https://api.github.com/repos/$repository/releases/latest',
       options: Options(responseType: ResponseType.json),
     );
@@ -73,13 +73,13 @@ class Request {
   }
 
   final Map<String, IpInfo Function(Map<String, dynamic>)> _ipInfoSources = {
-    'https://ipwho.is': IpInfo.fromIpWhoIsJson,
-    'https://api.myip.com': IpInfo.fromMyIpJson,
-    'https://ipapi.co/json': IpInfo.fromIpApiCoJson,
-    'https://ident.me/json': IpInfo.fromIdentMeJson,
-    'http://ip-api.com/json': IpInfo.fromIpAPIJson,
-    'https://api.ip.sb/geoip': IpInfo.fromIpSbJson,
-    'https://ipinfo.io/json': IpInfo.fromIpInfoIoJson,
+    'https://ipwho.is/': IpInfo.fromIpWhoIsJson,
+    'https://api.myip.com/': IpInfo.fromMyIpJson,
+    'https://ipapi.co/json/': IpInfo.fromIpApiCoJson,
+    'https://ident.me/json/': IpInfo.fromIdentMeJson,
+    'http://ip-api.com/json/': IpInfo.fromIpAPIJson,
+    'https://api.ip.sb/geoip/': IpInfo.fromIpSbJson,
+    'https://ipinfo.io/json/': IpInfo.fromIpInfoIoJson,
   };
 
   Future<Result<IpInfo?>> checkIp({CancelToken? cancelToken}) async {
@@ -92,13 +92,11 @@ class Request {
         }
       }
 
-      final future = dio
-          .get<Map<String, dynamic>>(
-            source.key,
-            cancelToken: cancelToken,
-            options: Options(responseType: ResponseType.json),
-          )
-          .timeout(const Duration(seconds: 10));
+      final future = _dio.get<Map<String, dynamic>>(
+        source.key,
+        cancelToken: cancelToken,
+        options: Options(responseType: ResponseType.json),
+      );
       future
           .then((res) {
             if (res.statusCode == HttpStatus.ok && res.data != null) {
@@ -109,6 +107,7 @@ class Request {
             handleFailRes();
           })
           .catchError((e) {
+            print(e);
             failureCount++;
             if (e is DioException && e.type == DioExceptionType.cancel) {
               completer.complete(Result.error('cancelled'));
@@ -124,7 +123,7 @@ class Request {
 
   Future<bool> pingHelper() async {
     try {
-      final response = await dio
+      final response = await _dio
           .get(
             'http://$localhost:$helperPort/ping',
             options: Options(responseType: ResponseType.plain),
@@ -141,7 +140,7 @@ class Request {
 
   Future<bool> startCoreByHelper(String arg) async {
     try {
-      final response = await dio
+      final response = await _dio
           .post(
             'http://$localhost:$helperPort/start',
             data: json.encode({'path': appPath.corePath, 'arg': arg}),
@@ -160,7 +159,7 @@ class Request {
 
   Future<bool> stopCoreByHelper() async {
     try {
-      final response = await dio
+      final response = await _dio
           .post(
             'http://$localhost:$helperPort/stop',
             options: Options(responseType: ResponseType.plain),

lib/common/scroll.dart

@@ -8,40 +8,13 @@ import 'package:flutter/material.dart';
 class BaseScrollBehavior extends MaterialScrollBehavior {
   @override
   Set<PointerDeviceKind> get dragDevices => {
-    PointerDeviceKind.touch,
-    PointerDeviceKind.stylus,
-    PointerDeviceKind.invertedStylus,
-    PointerDeviceKind.trackpad,
-    if (system.isDesktop) PointerDeviceKind.mouse,
-    PointerDeviceKind.unknown,
-  };
-
-  @override
-  Widget buildScrollbar(
-    BuildContext context,
-    Widget child,
-    ScrollableDetails details,
-  ) {
-    switch (axisDirectionToAxis(details.direction)) {
-      case Axis.horizontal:
-        return child;
-      case Axis.vertical:
-        switch (getPlatform(context)) {
-          case TargetPlatform.linux:
-          case TargetPlatform.macOS:
-          case TargetPlatform.windows:
-            assert(details.controller != null);
-            return CommonScrollBar(
-              controller: details.controller,
-              child: child,
-            );
-          case TargetPlatform.android:
-          case TargetPlatform.fuchsia:
-          case TargetPlatform.iOS:
-            return child;
-        }
-    }
-  }
+        PointerDeviceKind.touch,
+        PointerDeviceKind.stylus,
+        PointerDeviceKind.invertedStylus,
+        PointerDeviceKind.trackpad,
+        if (system.isDesktop) PointerDeviceKind.mouse,
+        PointerDeviceKind.unknown,
+      };
 }
 
 class HiddenBarScrollBehavior extends BaseScrollBehavior {
@@ -62,7 +35,10 @@ class ShowBarScrollBehavior extends BaseScrollBehavior {
     Widget child,
     ScrollableDetails details,
   ) {
-    return CommonScrollBar(controller: details.controller, child: child);
+    return CommonScrollBar(
+      controller: details.controller,
+      child: child,
+    );
   }
 }
 
@@ -76,9 +52,7 @@ class NextClampingScrollPhysics extends ClampingScrollPhysics {
 
   @override
   Simulation? createBallisticSimulation(
-    ScrollMetrics position,
-    double velocity,
-  ) {
+      ScrollMetrics position, double velocity) {
     final Tolerance tolerance = toleranceFor(position);
     if (position.outOfRange) {
       double? end;

lib/common/string.dart

@@ -11,15 +11,16 @@ extension StringExtension on String {
   }
 
   dynamic get splitByMultipleSeparators {
-    final parts = split(
-      RegExp(r'[, ;]+'),
-    ).where((part) => part.isNotEmpty).toList();
+    final parts =
+        split(RegExp(r'[, ;]+')).where((part) => part.isNotEmpty).toList();
 
     return parts.length > 1 ? parts : this;
   }
 
   int compareToLower(String other) {
-    return toLowerCase().compareTo(other.toLowerCase());
+    return toLowerCase().compareTo(
+      other.toLowerCase(),
+    );
   }
 
   List<int> get encodeUtf16LeWithBom {
@@ -65,9 +66,9 @@ extension StringExtension on String {
     return md5.convert(bytes).toString();
   }
 
-  // bool containsToLower(String target) {
-  //   return toLowerCase().contains(target);
-  // }
+// bool containsToLower(String target) {
+//   return toLowerCase().contains(target);
+// }
 }
 
 extension StringExtensionSafe on String? {

lib/common/system.dart

@@ -37,7 +37,7 @@ class System {
       'macos' => (deviceInfo as MacOsDeviceInfo).majorVersion,
       'android' => (deviceInfo as AndroidDeviceInfo).version.sdkInt,
       'windows' => (deviceInfo as WindowsDeviceInfo).majorVersion,
-      String() => 0,
+      String() => 0
     };
   }
 
@@ -104,7 +104,7 @@ class System {
       );
       final arguments = [
         '-c',
-        'echo "$password" | sudo -S chown root:root "$corePath" && echo "$password" | sudo -S chmod +sx "$corePath"',
+        'echo "$password" | sudo -S chown root:root "$corePath" && echo "$password" | sudo -S chmod +sx "$corePath"'
       ];
       final result = await Process.run(shell, arguments);
       if (result.exitCode != 0) {
@@ -148,25 +148,21 @@ class Windows {
     final argumentsPtr = arguments.toNativeUtf16();
     final operationPtr = 'runas'.toNativeUtf16();
 
-    final shellExecute = _shell32
-        .lookupFunction<
-          Int32 Function(
+    final shellExecute = _shell32.lookupFunction<
+        Int32 Function(
             Pointer<Utf16> hwnd,
             Pointer<Utf16> lpOperation,
             Pointer<Utf16> lpFile,
             Pointer<Utf16> lpParameters,
             Pointer<Utf16> lpDirectory,
-            Int32 nShowCmd,
-          ),
-          int Function(
+            Int32 nShowCmd),
+        int Function(
             Pointer<Utf16> hwnd,
             Pointer<Utf16> lpOperation,
             Pointer<Utf16> lpFile,
             Pointer<Utf16> lpParameters,
             Pointer<Utf16> lpDirectory,
-            int nShowCmd,
-          )
-        >('ShellExecuteW');
+            int nShowCmd)>('ShellExecuteW');
 
     final result = shellExecute(
       nullptr,
@@ -181,10 +177,7 @@ class Windows {
     calloc.free(argumentsPtr);
     calloc.free(operationPtr);
 
-    commonPrint.log(
-      'windows runas: $command $arguments resultCode:$result',
-      logLevel: LogLevel.warning,
-    );
+    commonPrint.log('windows runas: $command $arguments resultCode:$result');
 
     if (result < 42) {
       return false;
@@ -255,14 +248,15 @@ class Windows {
 
     final res = runas('cmd.exe', command);
 
-    await Future.delayed(Duration(milliseconds: 300));
+    await Future.delayed(
+      Duration(milliseconds: 300),
+    );
 
     return res;
   }
 
   Future<bool> registerTask(String appName) async {
-    final taskXml =
-        '''
+    final taskXml = '''
 <?xml version="1.0" encoding="UTF-16"?>
 <Task version="1.3" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task">
   <Principals>
@@ -301,9 +295,8 @@ class Windows {
 </Task>''';
     final taskPath = join(await appPath.tempPath, 'task.xml');
     await File(taskPath).create(recursive: true);
-    await File(
-      taskPath,
-    ).writeAsBytes(taskXml.encodeUtf16LeWithBom, flush: true);
+    await File(taskPath)
+        .writeAsBytes(taskXml.encodeUtf16LeWithBom, flush: true);
     final commandLine = [
       '/Create',
       '/TN',
@@ -312,7 +305,10 @@ class Windows {
       '%s',
       '/F',
     ].join(' ');
-    return runas('schtasks', commandLine.replaceFirst('%s', taskPath));
+    return runas(
+      'schtasks',
+      commandLine.replaceFirst('%s', taskPath),
+    );
   }
 }
 
@@ -341,25 +337,23 @@ class MacOS {
       return null;
     }
     final device = lineSplits[1];
-    final serviceResult = await Process.run('networksetup', [
-      '-listnetworkserviceorder',
-    ]);
+    final serviceResult = await Process.run(
+      'networksetup',
+      ['-listnetworkserviceorder'],
+    );
     final serviceResultOutput = serviceResult.stdout.toString();
-    final currentService = serviceResultOutput
-        .split('\n\n')
-        .firstWhere((s) => s.contains('Device: $device'), orElse: () => '');
+    final currentService = serviceResultOutput.split('\n\n').firstWhere(
+          (s) => s.contains('Device: $device'),
+          orElse: () => '',
+        );
     if (currentService.isEmpty) {
       return null;
     }
-    final currentServiceNameLine = currentService
-        .split('\n')
-        .firstWhere(
-          (line) => RegExp(r'^\(\d+\).*').hasMatch(line),
-          orElse: () => '',
-        );
-    final currentServiceNameLineSplits = currentServiceNameLine.trim().split(
-      ' ',
-    );
+    final currentServiceNameLine = currentService.split('\n').firstWhere(
+        (line) => RegExp(r'^\(\d+\).*').hasMatch(line),
+        orElse: () => '');
+    final currentServiceNameLineSplits =
+        currentServiceNameLine.trim().split(' ');
     if (currentServiceNameLineSplits.length < 2) {
       return null;
     }
@@ -371,10 +365,10 @@ class MacOS {
     if (deviceServiceName == null) {
       return null;
     }
-    final result = await Process.run('networksetup', [
-      '-getdnsservers',
-      deviceServiceName,
-    ]);
+    final result = await Process.run(
+      'networksetup',
+      ['-getdnsservers', deviceServiceName],
+    );
     final output = result.stdout.toString().trim();
     if (output.startsWith("There aren't any DNS Servers set on")) {
       originDns = [];
@@ -406,12 +400,15 @@ class MacOS {
     if (nextDns == null) {
       return;
     }
-    await Process.run('networksetup', [
-      '-setdnsservers',
-      serviceName,
-      if (nextDns.isNotEmpty) ...nextDns,
-      if (nextDns.isEmpty) 'Empty',
-    ]);
+    await Process.run(
+      'networksetup',
+      [
+        '-setdnsservers',
+        serviceName,
+        if (nextDns.isNotEmpty) ...nextDns,
+        if (nextDns.isEmpty) 'Empty',
+      ],
+    );
   }
 }
 

lib/common/utils.dart

@@ -8,6 +8,7 @@ import 'package:fl_clash/enum/enum.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:lpinyin/lpinyin.dart';
 
 class Utils {
   Color? getDelayColor(int? delay) {
@@ -177,11 +178,11 @@ class Utils {
     return build1.compareTo(build2);
   }
 
-  // String getPinyin(String value) {
-  //   return value.isNotEmpty
-  //       ? PinyinHelper.getFirstWordPinyin(value.substring(0, 1))
-  //       : '';
-  // }
+  String getPinyin(String value) {
+    return value.isNotEmpty
+        ? PinyinHelper.getFirstWordPinyin(value.substring(0, 1))
+        : '';
+  }
 
   String? getFileNameForDisposition(String? disposition) {
     if (disposition == null) return null;
@@ -227,7 +228,7 @@ class Utils {
   }
 
   int getProxiesColumns(double viewWidth, ProxiesLayout proxiesLayout) {
-    final columns = max((viewWidth / 250).ceil(), 2);
+    final columns = max((viewWidth / 300).ceil(), 2);
     return switch (proxiesLayout) {
       ProxiesLayout.tight => columns + 1,
       ProxiesLayout.standard => columns,
@@ -236,7 +237,7 @@ class Utils {
   }
 
   int getProfilesColumns(double viewWidth) {
-    return max((viewWidth / 280).floor(), 1);
+    return max((viewWidth / 320).floor(), 1);
   }
 
   final _indexPrimary = [50, 100, 200, 300, 400, 500, 600, 700, 800, 850, 900];

lib/common/window.dart

@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_acrylic/flutter_acrylic.dart' as acrylic;
 import 'package:screen_retriever/screen_retriever.dart';
 import 'package:window_manager/window_manager.dart';
 
@@ -18,6 +19,9 @@ class Window {
       protocol.register('clashmeta');
       protocol.register('flclash');
     }
+    if ((version > 10 && system.isMacOS)) {
+      await acrylic.Window.initialize();
+    }
     await windowManager.ensureInitialized();
     WindowOptions windowOptions = WindowOptions(
       size: Size(props.width, props.height),
@@ -35,18 +39,25 @@ class Window {
         await windowManager.setAlignment(Alignment.center);
       } else {
         final displays = await screenRetriever.getAllDisplays();
-        final isPositionValid = displays.any((display) {
-          final displayBounds = Rect.fromLTWH(
-            display.visiblePosition!.dx,
-            display.visiblePosition!.dy,
-            display.size.width,
-            display.size.height,
-          );
-          return displayBounds.contains(Offset(left, top)) ||
-              displayBounds.contains(Offset(right, bottom));
-        });
+        final isPositionValid = displays.any(
+          (display) {
+            final displayBounds = Rect.fromLTWH(
+              display.visiblePosition!.dx,
+              display.visiblePosition!.dy,
+              display.size.width,
+              display.size.height,
+            );
+            return displayBounds.contains(Offset(left, top)) ||
+                displayBounds.contains(Offset(right, bottom));
+          },
+        );
         if (isPositionValid) {
-          await windowManager.setPosition(Offset(left, top));
+          await windowManager.setPosition(
+            Offset(
+              left,
+              top,
+            ),
+          );
         }
       }
     }
@@ -55,6 +66,13 @@ class Window {
     });
   }
 
+  void updateMacOSBrightness(Brightness brightness) {
+    if (!system.isMacOS) {
+      return;
+    }
+    acrylic.Window.overrideMacOSBrightness(dark: brightness == Brightness.dark);
+  }
+
   Future<void> show() async {
     render?.resume();
     await windowManager.show();

lib/controller.dart

@@ -72,11 +72,11 @@ class AppController {
   }
 
   Future<void> restartCore() async {
-    globalState.isUserDisconnected = true;
     await coreController.shutdown();
-    await _connectCore();
+    _ref.read(coreStatusProvider.notifier).value = CoreStatus.connecting;
+    await coreController.preload();
     await _initCore();
-    _ref.read(initProvider.notifier).value = true;
+    _ref.read(coreStatusProvider.notifier).value = CoreStatus.connected;
     if (_ref.read(isStartProvider)) {
       await globalState.handleStart();
     }
@@ -353,7 +353,7 @@ class AppController {
       try {
         await updateProfile(profile);
       } catch (e) {
-        commonPrint.log(e.toString(), logLevel: LogLevel.warning);
+        commonPrint.log(e.toString());
       }
     }
   }
@@ -527,15 +527,18 @@ class AppController {
 
   Future<void> init() async {
     FlutterError.onError = (details) {
-      commonPrint.log(
-        'exception: ${details.exception} stack: ${details.stack}',
-        logLevel: LogLevel.warning,
-      );
+      if (kDebugMode) {
+        commonPrint.log(
+          'exception: ${details.exception} stack: ${details.stack}',
+        );
+      }
     };
     updateTray(true);
+    await _initCore();
+    await _initStatus();
+    autoLaunch?.updateStatus(_ref.read(appSettingProvider).autoLaunch);
     autoUpdateProfiles();
     autoCheckUpdate();
-    autoLaunch?.updateStatus(_ref.read(appSettingProvider).autoLaunch);
     if (!_ref.read(appSettingProvider).silentLaunch) {
       window?.show();
     } else {
@@ -543,31 +546,9 @@ class AppController {
     }
     await _handlePreference();
     await _handlerDisclaimer();
-    await _showCrashlyticsTip();
-    await _connectCore();
-    await _initCore();
-    await _initStatus();
     _ref.read(initProvider.notifier).value = true;
   }
 
-  Future<void> _connectCore() async {
-    _ref.read(coreStatusProvider.notifier).value = CoreStatus.connecting;
-    final result = await Future.wait([
-      coreController.preload(),
-      if (!globalState.isService) Future.delayed(Duration(milliseconds: 300)),
-    ]);
-    final String message = result[0];
-    await Future.delayed(commonDuration);
-    if (message.isNotEmpty) {
-      _ref.read(coreStatusProvider.notifier).value = CoreStatus.disconnected;
-      if (context.mounted) {
-        context.showNotifier(message);
-      }
-      return;
-    }
-    _ref.read(coreStatusProvider.notifier).value = CoreStatus.connected;
-  }
-
   Future<void> _initStatus() async {
     if (system.isAndroid) {
       await globalState.updateStartTime();
@@ -637,47 +618,30 @@ class AppController {
               ),
               TextButton(
                 onPressed: () {
+                  _ref
+                      .read(appSettingProvider.notifier)
+                      .updateState(
+                        (state) => state.copyWith(disclaimerAccepted: true),
+                      );
                   Navigator.of(context).pop<bool>(true);
                 },
                 child: Text(appLocalizations.agree),
               ),
             ],
-            child: Text(appLocalizations.disclaimerDesc),
+            child: SelectableText(appLocalizations.disclaimerDesc),
           ),
         ) ??
         false;
   }
 
-  Future<void> _showCrashlyticsTip() async {
-    if (!system.isAndroid) {
-      return;
-    }
-    if (_ref.read(appSettingProvider.select((state) => state.crashlyticsTip))) {
-      return;
-    }
-    await globalState.showMessage(
-      title: appLocalizations.dataCollectionTip,
-      cancelable: false,
-      message: TextSpan(text: appLocalizations.dataCollectionContent),
-    );
-    _ref
-        .read(appSettingProvider.notifier)
-        .updateState((state) => state.copyWith(crashlyticsTip: true));
-  }
-
   Future<void> _handlerDisclaimer() async {
-    if (_ref.read(
-      appSettingProvider.select((state) => state.disclaimerAccepted),
-    )) {
+    if (_ref.read(appSettingProvider).disclaimerAccepted) {
       return;
     }
     final isDisclaimerAccepted = await showDisclaimer();
     if (!isDisclaimerAccepted) {
       await handleExit();
     }
-    _ref
-        .read(appSettingProvider.notifier)
-        .updateState((state) => state.copyWith(disclaimerAccepted: true));
     return;
   }
 
@@ -962,7 +926,7 @@ class AppController {
       final res = await futureFunction();
       return res;
     } catch (e) {
-      commonPrint.log('$futureFunction ===> $e', logLevel: LogLevel.warning);
+      commonPrint.log('$futureFunction ===> $e');
       if (realSilence) {
         globalState.showNotifier(e.toString());
       } else {

lib/core/controller.dart

@@ -29,7 +29,7 @@ class CoreController {
     return _instance!;
   }
 
-  Future<String> preload() {
+  Future<bool> preload() {
     return _interface.preload();
   }
 
@@ -40,7 +40,12 @@ class CoreController {
     if (!isExists) {
       await homeDir.create(recursive: true);
     }
-    const geoFileNameList = [MMDB, GEOIP, GEOSITE, ASN];
+    const geoFileNameList = [
+      mmdbFileName,
+      geoIpFileName,
+      geoSiteFileName,
+      asnFileName,
+    ];
     try {
       for (final geoFileName in geoFileNameList) {
         final geoFile = File(join(homePath, geoFileName));
@@ -71,20 +76,8 @@ class CoreController {
 
   FutureOr<bool> get isInit => _interface.isInit;
 
-  Future<String> validateConfig(String data) async {
-    final path = await appPath.validateFilePath;
-    await globalState.genValidateFile(path, data);
-    final res = await _interface.validateConfig(path);
-    await File(path).delete();
-    return res;
-  }
-
-  Future<String> validateConfigFormBytes(Uint8List bytes) async {
-    final path = await appPath.validateFilePath;
-    await globalState.genValidateFileFormBytes(path, bytes);
-    final res = await _interface.validateConfig(path);
-    await File(path).delete();
-    return res;
+  FutureOr<String> validateConfig(String data) {
+    return _interface.validateConfig(data);
   }
 
   Future<String> updateConfig(UpdateParams updateParams) async {

lib/core/event.dart

@@ -13,7 +13,7 @@ abstract mixin class CoreEventListener {
 
   void onLoaded(String providerName) {}
 
-  void onCrash(String message) {}
+  void onCrash() {}
 }
 
 class CoreEventManager {
@@ -36,7 +36,7 @@ class CoreEventManager {
             listener.onLoaded(event.data);
             break;
           case CoreEventType.crash:
-            listener.onCrash(event.data);
+            listener.onCrash();
             break;
         }
       }

lib/core/interface.dart

@@ -9,7 +9,7 @@ import 'package:fl_clash/models/models.dart';
 mixin CoreInterface {
   Future<bool> init(InitParams params);
 
-  Future<String> preload();
+  Future<bool> preload();
 
   Future<bool> shutdown();
 
@@ -17,7 +17,7 @@ mixin CoreInterface {
 
   Future<bool> forceGc();
 
-  Future<String> validateConfig(String path);
+  Future<String> validateConfig(String data);
 
   Future<Result> getConfig(String path);
 
@@ -125,10 +125,10 @@ abstract class CoreHandlerInterface with CoreInterface {
   }
 
   @override
-  Future<String> validateConfig(String path) async {
+  Future<String> validateConfig(String data) async {
     return await _invoke<String>(
           method: ActionMethod.validateConfig,
-          data: path,
+          data: data,
         ) ??
         '';
   }
@@ -306,7 +306,6 @@ abstract class CoreHandlerInterface with CoreInterface {
     return await _invoke<String>(
           method: ActionMethod.asyncTestDelay,
           data: json.encode(delayParams),
-          timeout: Duration(seconds: 6),
         ) ??
         json.encode(Delay(name: proxyName, value: -1, url: url));
   }

lib/core/lib.dart

@@ -4,7 +4,6 @@ import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/core.dart';
 import 'package:fl_clash/plugins/service.dart';
-import 'package:fl_clash/state.dart';
 
 import 'interface.dart';
 
@@ -16,16 +15,10 @@ class CoreLib extends CoreHandlerInterface {
   CoreLib._internal();
 
   @override
-  Future<String> preload() async {
-    final res = await service?.init();
-    if (res?.isEmpty != true) {
-      return res ?? '';
-    }
+  Future<bool> preload() async {
+    await service?.init();
     _connectedCompleter.complete(true);
-    final syncRes = await service?.syncAndroidState(
-      globalState.getAndroidState(),
-    );
-    return syncRes ?? '';
+    return true;
   }
 
   factory CoreLib() {
@@ -40,7 +33,6 @@ class CoreLib extends CoreHandlerInterface {
 
   @override
   Future<bool> shutdown() async {
-    await service?.shutdown();
     _connectedCompleter = Completer();
     return true;
   }

lib/core/service.dart

@@ -52,7 +52,7 @@ class CoreService extends CoreHandlerInterface {
         }
       },
       (error, stack) async {
-        commonPrint.log('Service error: $error', logLevel: LogLevel.warning);
+        commonPrint.log('Service error: $error');
       },
     );
   }
@@ -73,9 +73,7 @@ class CoreService extends CoreHandlerInterface {
   }
 
   void _handleInvokeCrashEvent() {
-    coreEventManager.sendEvent(
-      CoreEvent(type: CoreEventType.crash, data: 'socket done'),
-    );
+    coreEventManager.sendEvent(CoreEvent(type: CoreEventType.crash));
   }
 
   Future<void> start() async {
@@ -97,10 +95,9 @@ class CoreService extends CoreHandlerInterface {
     _process?.stderr.listen((e) {
       final error = utf8.decode(e);
       if (error.isNotEmpty) {
-        commonPrint.log(error, logLevel: LogLevel.warning);
+        commonPrint.log(error);
       }
     });
-    await _socketCompleter.future;
   }
 
   @override
@@ -127,9 +124,9 @@ class CoreService extends CoreHandlerInterface {
 
   Future<void> _destroySocket() async {
     if (_socketCompleter.isCompleted) {
-      final socket = await _socketCompleter.future;
+      final lastSocket = await _socketCompleter.future;
       _socketCompleter = Completer();
-      socket.close();
+      lastSocket.close();
     }
   }
 
@@ -152,10 +149,10 @@ class CoreService extends CoreHandlerInterface {
   }
 
   @override
-  Future<String> preload() async {
+  Future<bool> preload() async {
     await _serverCompleter.future;
     await start();
-    return '';
+    return true;
   }
 
   @override
@@ -180,9 +177,7 @@ class CoreService extends CoreHandlerInterface {
   }
 
   @override
-  Future get connected {
-    return _socketCompleter.future;
-  }
+  Future get connected => _socketCompleter.future;
 }
 
 final coreService = system.isDesktop ? CoreService() : null;

lib/l10n/intl/messages_en.dart

@@ -199,21 +199,11 @@ class MessageLookup extends MessageLookupByLibrary {
     "coreStatus": MessageLookupByLibrary.simpleMessage("Core status"),
     "country": MessageLookupByLibrary.simpleMessage("Country"),
     "crashTest": MessageLookupByLibrary.simpleMessage("Crash test"),
-    "crashlytics": MessageLookupByLibrary.simpleMessage("Crash Analysis"),
-    "crashlyticsTip": MessageLookupByLibrary.simpleMessage(
-      "When enabled, automatically uploads crash logs without sensitive information when the app crashes",
-    ),
     "create": MessageLookupByLibrary.simpleMessage("Create"),
     "creationTime": MessageLookupByLibrary.simpleMessage("Creation time"),
     "cut": MessageLookupByLibrary.simpleMessage("Cut"),
     "dark": MessageLookupByLibrary.simpleMessage("Dark"),
     "dashboard": MessageLookupByLibrary.simpleMessage("Dashboard"),
-    "dataCollectionContent": MessageLookupByLibrary.simpleMessage(
-      "This app uses Firebase Crashlytics to collect crash information to improve app stability.\nThe collected data includes device information and crash details, but does not contain personal sensitive data.\nYou can disable this feature in settings.",
-    ),
-    "dataCollectionTip": MessageLookupByLibrary.simpleMessage(
-      "Data Collection Notice",
-    ),
     "days": MessageLookupByLibrary.simpleMessage("Days"),
     "defaultNameserver": MessageLookupByLibrary.simpleMessage(
       "Default nameserver",
@@ -531,7 +521,6 @@ class MessageLookup extends MessageLookupByLibrary {
       "Please press the keyboard.",
     ),
     "preview": MessageLookupByLibrary.simpleMessage("Preview"),
-    "process": MessageLookupByLibrary.simpleMessage("Process"),
     "profile": MessageLookupByLibrary.simpleMessage("Profile"),
     "profileAutoUpdateIntervalInvalidValidationDesc":
         MessageLookupByLibrary.simpleMessage(
@@ -558,6 +547,7 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "profiles": MessageLookupByLibrary.simpleMessage("Profiles"),
     "profilesSort": MessageLookupByLibrary.simpleMessage("Profiles sort"),
+    "progress": MessageLookupByLibrary.simpleMessage("Progress"),
     "project": MessageLookupByLibrary.simpleMessage("Project"),
     "providers": MessageLookupByLibrary.simpleMessage("Providers"),
     "proxies": MessageLookupByLibrary.simpleMessage("Proxies"),

lib/l10n/intl/messages_ja.dart

@@ -151,19 +151,11 @@ class MessageLookup extends MessageLookupByLibrary {
     "coreStatus": MessageLookupByLibrary.simpleMessage("コアステータス"),
     "country": MessageLookupByLibrary.simpleMessage("国"),
     "crashTest": MessageLookupByLibrary.simpleMessage("クラッシュテスト"),
-    "crashlytics": MessageLookupByLibrary.simpleMessage("クラッシュ分析"),
-    "crashlyticsTip": MessageLookupByLibrary.simpleMessage(
-      "有効にすると、アプリがクラッシュした際に機密情報を含まないクラッシュログを自動的にアップロードします",
-    ),
     "create": MessageLookupByLibrary.simpleMessage("作成"),
     "creationTime": MessageLookupByLibrary.simpleMessage("作成時間"),
     "cut": MessageLookupByLibrary.simpleMessage("切り取り"),
     "dark": MessageLookupByLibrary.simpleMessage("ダーク"),
     "dashboard": MessageLookupByLibrary.simpleMessage("ダッシュボード"),
-    "dataCollectionContent": MessageLookupByLibrary.simpleMessage(
-      "本アプリはFirebase Crashlyticsを使用してクラッシュ情報を収集し、アプリの安定性を向上させます。\n収集されるデータにはデバイス情報とクラッシュ詳細が含まれますが、個人の機密データは含まれません。\n設定でこの機能を無効にすることができます。",
-    ),
-    "dataCollectionTip": MessageLookupByLibrary.simpleMessage("データ収集説明"),
     "days": MessageLookupByLibrary.simpleMessage("日"),
     "defaultNameserver": MessageLookupByLibrary.simpleMessage("デフォルトネームサーバー"),
     "defaultNameserverDesc": MessageLookupByLibrary.simpleMessage(
@@ -403,7 +395,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "preferH3Desc": MessageLookupByLibrary.simpleMessage("DOHのHTTP/3を優先使用"),
     "pressKeyboard": MessageLookupByLibrary.simpleMessage("キーボードを押してください"),
     "preview": MessageLookupByLibrary.simpleMessage("プレビュー"),
-    "process": MessageLookupByLibrary.simpleMessage("プロセス"),
     "profile": MessageLookupByLibrary.simpleMessage("プロファイル"),
     "profileAutoUpdateIntervalInvalidValidationDesc":
         MessageLookupByLibrary.simpleMessage("有効な間隔形式を入力してください"),
@@ -426,6 +417,7 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "profiles": MessageLookupByLibrary.simpleMessage("プロファイル一覧"),
     "profilesSort": MessageLookupByLibrary.simpleMessage("プロファイルの並び替え"),
+    "progress": MessageLookupByLibrary.simpleMessage("進捗"),
     "project": MessageLookupByLibrary.simpleMessage("プロジェクト"),
     "providers": MessageLookupByLibrary.simpleMessage("プロバイダー"),
     "proxies": MessageLookupByLibrary.simpleMessage("プロキシ"),

lib/l10n/intl/messages_ru.dart

@@ -204,21 +204,11 @@ class MessageLookup extends MessageLookupByLibrary {
     "coreStatus": MessageLookupByLibrary.simpleMessage("Основной статус"),
     "country": MessageLookupByLibrary.simpleMessage("Страна"),
     "crashTest": MessageLookupByLibrary.simpleMessage("Тест на сбои"),
-    "crashlytics": MessageLookupByLibrary.simpleMessage("Анализ сбоев"),
-    "crashlyticsTip": MessageLookupByLibrary.simpleMessage(
-      "При включении автоматически загружает журналы сбоев без конфиденциальной информации, когда приложение выходит из строя",
-    ),
     "create": MessageLookupByLibrary.simpleMessage("Создать"),
     "creationTime": MessageLookupByLibrary.simpleMessage("Время создания"),
     "cut": MessageLookupByLibrary.simpleMessage("Вырезать"),
     "dark": MessageLookupByLibrary.simpleMessage("Темный"),
     "dashboard": MessageLookupByLibrary.simpleMessage("Панель управления"),
-    "dataCollectionContent": MessageLookupByLibrary.simpleMessage(
-      "Это приложение использует Firebase Crashlytics для сбора информации о сбоях nhằm улучшения стабильности приложения.\nСобираемые данные включают информацию об устройстве и подробности о сбоях, но не содержат персональных конфиденциальных данных.\nВы можете отключить эту функцию в настройках.",
-    ),
-    "dataCollectionTip": MessageLookupByLibrary.simpleMessage(
-      "Уведомление о сборе данных",
-    ),
     "days": MessageLookupByLibrary.simpleMessage("Дней"),
     "defaultNameserver": MessageLookupByLibrary.simpleMessage(
       "Сервер имен по умолчанию",
@@ -558,7 +548,6 @@ class MessageLookup extends MessageLookupByLibrary {
       "Пожалуйста, нажмите клавишу.",
     ),
     "preview": MessageLookupByLibrary.simpleMessage("Предпросмотр"),
-    "process": MessageLookupByLibrary.simpleMessage("процесс"),
     "profile": MessageLookupByLibrary.simpleMessage("Профиль"),
     "profileAutoUpdateIntervalInvalidValidationDesc":
         MessageLookupByLibrary.simpleMessage(
@@ -585,6 +574,7 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "profiles": MessageLookupByLibrary.simpleMessage("Профили"),
     "profilesSort": MessageLookupByLibrary.simpleMessage("Сортировка профилей"),
+    "progress": MessageLookupByLibrary.simpleMessage("Прогресс"),
     "project": MessageLookupByLibrary.simpleMessage("Проект"),
     "providers": MessageLookupByLibrary.simpleMessage("Провайдеры"),
     "proxies": MessageLookupByLibrary.simpleMessage("Прокси"),

lib/l10n/intl/messages_zh_CN.dart

@@ -141,19 +141,11 @@ class MessageLookup extends MessageLookupByLibrary {
     "coreStatus": MessageLookupByLibrary.simpleMessage("核心状态"),
     "country": MessageLookupByLibrary.simpleMessage("区域"),
     "crashTest": MessageLookupByLibrary.simpleMessage("崩溃测试"),
-    "crashlytics": MessageLookupByLibrary.simpleMessage("崩溃分析"),
-    "crashlyticsTip": MessageLookupByLibrary.simpleMessage(
-      "开启后，应用崩溃时自动上传不包含敏感信息的崩溃日志",
-    ),
     "create": MessageLookupByLibrary.simpleMessage("创建"),
     "creationTime": MessageLookupByLibrary.simpleMessage("创建时间"),
     "cut": MessageLookupByLibrary.simpleMessage("剪切"),
     "dark": MessageLookupByLibrary.simpleMessage("深色"),
     "dashboard": MessageLookupByLibrary.simpleMessage("仪表盘"),
-    "dataCollectionContent": MessageLookupByLibrary.simpleMessage(
-      "本应用使用 Firebase Crashlytics 收集崩溃信息以改进应用稳定性。\n收集的数据包括设备信息和崩溃详情，不包含个人敏感数据。\n您可以在设置中关闭此功能。",
-    ),
-    "dataCollectionTip": MessageLookupByLibrary.simpleMessage("数据收集说明"),
     "days": MessageLookupByLibrary.simpleMessage("天"),
     "defaultNameserver": MessageLookupByLibrary.simpleMessage("默认域名服务器"),
     "defaultNameserverDesc": MessageLookupByLibrary.simpleMessage("用于解析DNS服务器"),
@@ -355,7 +347,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "preferH3Desc": MessageLookupByLibrary.simpleMessage("优先使用DOH的http/3"),
     "pressKeyboard": MessageLookupByLibrary.simpleMessage("请按下按键"),
     "preview": MessageLookupByLibrary.simpleMessage("预览"),
-    "process": MessageLookupByLibrary.simpleMessage("进程"),
     "profile": MessageLookupByLibrary.simpleMessage("配置"),
     "profileAutoUpdateIntervalInvalidValidationDesc":
         MessageLookupByLibrary.simpleMessage("请输入有效间隔时间格式"),
@@ -376,6 +367,7 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "profiles": MessageLookupByLibrary.simpleMessage("配置"),
     "profilesSort": MessageLookupByLibrary.simpleMessage("配置排序"),
+    "progress": MessageLookupByLibrary.simpleMessage("进度"),
     "project": MessageLookupByLibrary.simpleMessage("项目"),
     "providers": MessageLookupByLibrary.simpleMessage("提供者"),
     "proxies": MessageLookupByLibrary.simpleMessage("代理"),

lib/l10n/l10n.dart

@@ -3159,9 +3159,9 @@ class AppLocalizations {
     );
   }
 
-  /// `Process`
-  String get process {
-    return Intl.message('Process', name: 'process', desc: '', args: []);
+  /// `Progress`
+  String get progress {
+    return Intl.message('Progress', name: 'progress', desc: '', args: []);
   }
 
   /// `Host`
@@ -3318,46 +3318,6 @@ class AppLocalizations {
   String get coreStatus {
     return Intl.message('Core status', name: 'coreStatus', desc: '', args: []);
   }
-
-  /// `Data Collection Notice`
-  String get dataCollectionTip {
-    return Intl.message(
-      'Data Collection Notice',
-      name: 'dataCollectionTip',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `This app uses Firebase Crashlytics to collect crash information to improve app stability.\nThe collected data includes device information and crash details, but does not contain personal sensitive data.\nYou can disable this feature in settings.`
-  String get dataCollectionContent {
-    return Intl.message(
-      'This app uses Firebase Crashlytics to collect crash information to improve app stability.\nThe collected data includes device information and crash details, but does not contain personal sensitive data.\nYou can disable this feature in settings.',
-      name: 'dataCollectionContent',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Crash Analysis`
-  String get crashlytics {
-    return Intl.message(
-      'Crash Analysis',
-      name: 'crashlytics',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `When enabled, automatically uploads crash logs without sensitive information when the app crashes`
-  String get crashlyticsTip {
-    return Intl.message(
-      'When enabled, automatically uploads crash logs without sensitive information when the app crashes',
-      name: 'crashlyticsTip',
-      desc: '',
-      args: [],
-    );
-  }
 }
 
 class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> {

lib/main.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:fl_clash/plugins/app.dart';
+import 'package:fl_clash/plugins/service.dart';
 import 'package:fl_clash/plugins/tile.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
@@ -22,9 +23,8 @@ Future<void> main() async {
 @pragma('vm:entry-point')
 Future<void> _service(List<String> flags) async {
   WidgetsFlutterBinding.ensureInitialized();
-  globalState.isService = true;
   await globalState.init();
-  await coreController.preload();
+  await service?.init();
   tile?.addListener(
     _TileListenerWithService(
       onStop: () async {

lib/manager/android_manager.dart

@@ -48,11 +48,9 @@ class _AndroidContainerState extends ConsumerState<AndroidManager>
   }
 
   @override
-  void onServiceCrash(String message) {
-    coreEventManager.sendEvent(
-      CoreEvent(type: CoreEventType.crash, data: message),
-    );
-    super.onServiceCrash(message);
+  void onServiceCrash() {
+    coreEventManager.sendEvent(CoreEvent(type: CoreEventType.crash));
+    super.onServiceCrash();
   }
 
   @override

lib/manager/app_manager.dart

@@ -7,6 +7,7 @@ import 'package:fl_clash/providers/providers.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_acrylic/widgets/transparent_macos_sidebar.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:intl/intl.dart';
 
@@ -44,7 +45,7 @@ class _AppStateManagerState extends ConsumerState<AppStateManager>
     });
     ref.listenManual(needUpdateGroupsProvider, (prev, next) {
       if (prev != next) {
-        globalState.appController.updateGroupsDebounce();
+        globalState.appController.updateGroupsDebounce(commonDuration);
       }
     });
     if (window == null) {
@@ -60,6 +61,12 @@ class _AppStateManagerState extends ConsumerState<AppStateManager>
         macOS?.updateDns(true);
       }
     });
+    ref.listenManual(currentBrightnessProvider, (prev, next) {
+      if (prev == next) {
+        return;
+      }
+      window?.updateMacOSBrightness(next);
+    }, fireImmediately: true);
   }
 
   @override
@@ -151,25 +158,15 @@ class AppSidebarContainer extends ConsumerWidget {
     required BuildContext context,
     required Widget child,
   }) {
-    return Material(color: context.colorScheme.surfaceContainer, child: child);
-    // if (!system.isMacOS) {
-    //   return Material(
-    //     color: context.colorScheme.surfaceContainer,
-    //     child: child,
-    //   );
-    // }
-    // return child;
-    // return TransparentMacOSSidebar(
-    //   child: Material(color: Colors.transparent, child: child),
-    // );
-  }
-
-  void _updateSideBarWidth(WidgetRef ref, double contentWidth) {
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      ref.read(sideWidthProvider.notifier).value =
-          ref.read(viewSizeProvider.select((state) => state.width)) -
-          contentWidth;
-    });
+    if (!system.isMacOS) {
+      return Material(
+        color: context.colorScheme.surfaceContainer,
+        child: child,
+      );
+    }
+    return TransparentMacOSSidebar(
+      child: Material(color: Colors.transparent, child: child),
+    );
   }
 
   @override
@@ -184,102 +181,76 @@ class AppSidebarContainer extends ConsumerWidget {
     final showLabel = ref.watch(appSettingProvider).showLabel;
     return Row(
       children: [
-        _buildBackground(
-          context: context,
-          child: SafeArea(
-            child: Stack(
-              alignment: Alignment.topRight,
-              children: [
-                Column(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  children: [
-                    if (system.isMacOS) SizedBox(height: 22),
-                    SizedBox(height: 10),
-                    if (!system.isMacOS) ...[
-                      ClipRect(child: AppIcon()),
-                      SizedBox(height: 12),
-                    ],
-                    Expanded(
-                      child: ScrollConfiguration(
-                        behavior: HiddenBarScrollBehavior(),
-                        child: Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            Expanded(
-                              child: NavigationRail(
-                                scrollable: true,
-                                minExtendedWidth: 200,
-                                backgroundColor: Colors.transparent,
-                                selectedLabelTextStyle: context
-                                    .textTheme
-                                    .labelLarge!
-                                    .copyWith(
-                                      color: context.colorScheme.onSurface,
-                                    ),
-                                unselectedLabelTextStyle: context
-                                    .textTheme
-                                    .labelLarge!
-                                    .copyWith(
-                                      color: context.colorScheme.onSurface,
-                                    ),
-                                destinations: navigationItems
-                                    .map(
-                                      (e) => NavigationRailDestination(
-                                        icon: e.icon,
-                                        label: Text(Intl.message(e.label.name)),
-                                      ),
-                                    )
-                                    .toList(),
-                                onDestinationSelected: (index) {
-                                  globalState.appController.toPage(
-                                    navigationItems[index].label,
-                                  );
-                                },
-                                extended: false,
-                                selectedIndex: currentIndex,
-                                labelType: showLabel
-                                    ? NavigationRailLabelType.all
-                                    : NavigationRailLabelType.none,
-                              ),
-                            ),
-                          ],
+        Stack(
+          alignment: Alignment.topRight,
+          children: [
+            _buildBackground(
+              context: context,
+              child: Column(
+                children: [
+                  SizedBox(height: 32),
+                  if (!system.isMacOS) ...[AppIcon(), SizedBox(height: 12)],
+                  Expanded(
+                    child: ScrollConfiguration(
+                      behavior: HiddenBarScrollBehavior(),
+                      child: SingleChildScrollView(
+                        child: IntrinsicHeight(
+                          child: NavigationRail(
+                            backgroundColor: Colors.transparent,
+                            selectedLabelTextStyle: context
+                                .textTheme
+                                .labelLarge!
+                                .copyWith(color: context.colorScheme.onSurface),
+                            unselectedLabelTextStyle: context
+                                .textTheme
+                                .labelLarge!
+                                .copyWith(color: context.colorScheme.onSurface),
+                            destinations: navigationItems
+                                .map(
+                                  (e) => NavigationRailDestination(
+                                    icon: e.icon,
+                                    label: Text(Intl.message(e.label.name)),
+                                  ),
+                                )
+                                .toList(),
+                            onDestinationSelected: (index) {
+                              globalState.appController.toPage(
+                                navigationItems[index].label,
+                              );
+                            },
+                            extended: false,
+                            selectedIndex: currentIndex,
+                            labelType: showLabel
+                                ? NavigationRailLabelType.all
+                                : NavigationRailLabelType.none,
+                          ),
                         ),
                       ),
                     ),
-                    const SizedBox(height: 16),
-                    IconButton(
-                      onPressed: () {
-                        ref
-                            .read(appSettingProvider.notifier)
-                            .updateState(
-                              (state) =>
-                                  state.copyWith(showLabel: !state.showLabel),
-                            );
-                      },
-                      icon: Icon(
-                        Icons.menu,
-                        color: context.colorScheme.onSurfaceVariant,
-                      ),
+                  ),
+                  const SizedBox(height: 16),
+                  IconButton(
+                    onPressed: () {
+                      ref
+                          .read(appSettingProvider.notifier)
+                          .updateState(
+                            (state) =>
+                                state.copyWith(showLabel: !state.showLabel),
+                          );
+                    },
+                    icon: Icon(
+                      Icons.menu,
+                      color: context.colorScheme.onSurfaceVariant,
                     ),
-                    const SizedBox(height: 16),
-                  ],
-                ),
-                _buildLoading(),
-              ],
+                  ),
+                  const SizedBox(height: 16),
+                ],
+              ),
             ),
-          ),
-        ),
-        Expanded(
-          flex: 1,
-          child: ClipRect(
-            child: LayoutBuilder(
-              builder: (_, constraints) {
-                _updateSideBarWidth(ref, constraints.maxWidth);
-                return child;
-              },
-            ),
-          ),
+            _buildLoading(),
+          ],
         ),
+        Expanded(flex: 1, child: ClipRect(child: child)),
       ],
     );
   }

lib/manager/core_manager.dart

@@ -92,16 +92,13 @@ class _CoreContainerState extends ConsumerState<CoreManager>
   }
 
   @override
-  Future<void> onCrash(String message) async {
-    if (!globalState.isUserDisconnected) {
-      context.showNotifier(message);
-    }
-    globalState.isUserDisconnected = false;
+  Future<void> onCrash() async {
     if (ref.read(coreStatusProvider) != CoreStatus.connected) {
       return;
     }
+    context.showNotifier('Core crash');
     ref.read(coreStatusProvider.notifier).value = CoreStatus.disconnected;
     await coreController.shutdown();
-    super.onCrash(message);
+    super.onCrash();
   }
 }

lib/manager/message_manager.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:collection';
 import 'dart:math';
 
 import 'package:fl_clash/common/common.dart';
@@ -18,9 +17,8 @@ class MessageManager extends StatefulWidget {
 
 class MessageManagerState extends State<MessageManager> {
   final _messagesNotifier = ValueNotifier<List<CommonMessage>>([]);
-  final _bufferMessages = Queue<CommonMessage>();
-  final _activeTimers = <String, Timer>{};
-  bool _isDisplayingMessage = false;
+  final List<CommonMessage> _bufferMessages = [];
+  bool _pushing = false;
 
   @override
   void initState() {
@@ -30,48 +28,38 @@ class MessageManagerState extends State<MessageManager> {
   @override
   void dispose() {
     _messagesNotifier.dispose();
-    for (final timer in _activeTimers.values) {
-      timer.cancel();
-    }
-    _activeTimers.clear();
-    _bufferMessages.clear();
     super.dispose();
   }
 
-  void message(String text) {
+  Future<void> message(String text) async {
     final commonMessage = CommonMessage(id: utils.uuidV4, text: text);
+    commonPrint.log(text);
     _bufferMessages.add(commonMessage);
-    commonPrint.log('message: $text');
-    _processQueue();
+    await _showMessage();
   }
 
-  void _cancelMessage(String id) {
-    _bufferMessages.removeWhere((msg) => msg.id == id);
-    if (_activeTimers.containsKey(id)) {
-      _removeMessage(id);
-    }
-  }
-
-  void _processQueue() {
-    if (_isDisplayingMessage || _bufferMessages.isEmpty) {
+  Future<void> _showMessage() async {
+    if (_pushing == true) {
       return;
     }
-    _isDisplayingMessage = true;
-    final message = _bufferMessages.removeFirst();
-    _messagesNotifier.value = List.from(_messagesNotifier.value)..add(message);
-    final timer = Timer(message.duration, () {
-      _removeMessage(message.id);
-    });
-    _activeTimers[message.id] = timer;
+    _pushing = true;
+    while (_bufferMessages.isNotEmpty) {
+      final commonMessage = _bufferMessages.removeAt(0);
+      _messagesNotifier.value = List.from(_messagesNotifier.value)
+        ..add(commonMessage);
+      await Future.delayed(Duration(seconds: 1));
+      Future.delayed(commonMessage.duration, () {
+        _handleRemove(commonMessage);
+      });
+    }
   }
 
-  void _removeMessage(String id) {
-    _activeTimers.remove(id)?.cancel();
-    final currentMessages = List<CommonMessage>.from(_messagesNotifier.value);
-    currentMessages.removeWhere((msg) => msg.id == id);
-    _messagesNotifier.value = currentMessages;
-    _isDisplayingMessage = false;
-    _processQueue();
+  Future<void> _handleRemove(CommonMessage commonMessage) async {
+    _messagesNotifier.value = List<CommonMessage>.from(_messagesNotifier.value)
+      ..remove(commonMessage);
+    if (_bufferMessages.isEmpty) {
+      _pushing = false;
+    }
   }
 
   @override
@@ -95,47 +83,35 @@ class MessageManagerState extends State<MessageManager> {
                     : LayoutBuilder(
                         key: Key(messages.last.id),
                         builder: (_, constraints) {
-                          return Dismissible(
-                            key: ValueKey(messages.last.id),
-                            onDismissed: (_) {
-                              _cancelMessage(messages.last.id);
-                            },
-                            child: Card(
-                              shape: const RoundedSuperellipseBorder(
-                                borderRadius: BorderRadius.all(
-                                  Radius.circular(14),
-                                ),
+                          return Card(
+                            shape: const RoundedRectangleBorder(
+                              borderRadius: BorderRadius.all(
+                                Radius.circular(12.0),
                               ),
-                              elevation: 10,
-                              color: context.colorScheme.surfaceContainerHigh,
-                              child: Container(
-                                width: min(constraints.maxWidth, 500),
-                                padding: EdgeInsets.symmetric(
-                                  horizontal: 16,
-                                  vertical: 8,
-                                ),
-                                child: Row(
-                                  mainAxisAlignment:
-                                      MainAxisAlignment.spaceBetween,
-                                  children: [
-                                    Flexible(
-                                      child: Text(
-                                        messages.last.text,
-                                        maxLines: 3,
-                                        overflow: TextOverflow.ellipsis,
-                                      ),
-                                    ),
-                                    SizedBox(width: 16),
-                                    IconButton(
-                                      padding: EdgeInsets.all(2),
-                                      visualDensity: VisualDensity.compact,
-                                      onPressed: () {
-                                        _cancelMessage(messages.last.id);
-                                      },
-                                      icon: Icon(Icons.close),
-                                    ),
-                                  ],
-                                ),
+                            ),
+                            elevation: 10,
+                            color: context.colorScheme.surfaceContainerHigh,
+                            child: Container(
+                              width: min(constraints.maxWidth, 500),
+                              padding: EdgeInsets.symmetric(
+                                horizontal: 12,
+                                vertical: 10,
+                              ),
+                              child: Row(
+                                mainAxisAlignment:
+                                    MainAxisAlignment.spaceBetween,
+                                children: [
+                                  Flexible(child: Text(messages.last.text)),
+                                  IconButton(
+                                    visualDensity: VisualDensity.compact,
+                                    iconSize: 18,
+                                    padding: EdgeInsets.zero,
+                                    onPressed: () {
+                                      _handleRemove(messages.last);
+                                    },
+                                    icon: Icon(Icons.close),
+                                  ),
+                                ],
                               ),
                             ),
                           );

lib/manager/theme_manager.dart

@@ -13,7 +13,10 @@ import '../providers/state.dart';
 class ThemeManager extends ConsumerWidget {
   final Widget child;
 
-  const ThemeManager({super.key, required this.child});
+  const ThemeManager({
+    super.key,
+    required this.child,
+  });
 
   Widget _buildSystemUi(Widget child) {
     if (!system.isAndroid) {
@@ -82,28 +85,23 @@ class ThemeManager extends ConsumerWidget {
     final height = MediaQuery.of(context).size.height;
     return MediaQuery(
       data: MediaQuery.of(context).copyWith(
-        textScaler: TextScaler.linear(textScaleFactor),
+        textScaler: TextScaler.linear(
+          textScaleFactor,
+        ),
         padding: padding.copyWith(
           top: padding.top > height * 0.3 ? 20.0 : padding.top,
         ),
       ),
-      child: Theme(
-        data: Theme.of(context).copyWith(
-          floatingActionButtonTheme: Theme.of(context).floatingActionButtonTheme
-              .copyWith(
-                shape: const RoundedSuperellipseBorder(
-                  borderRadius: BorderRadius.all(Radius.circular(16.0)),
-                ),
-              ),
-        ),
-        child: LayoutBuilder(
-          builder: (_, container) {
-            globalState.appController.updateViewSize(
-              Size(container.maxWidth, container.maxHeight),
-            );
-            return _buildSystemUi(child);
-          },
-        ),
+      child: LayoutBuilder(
+        builder: (_, container) {
+          globalState.appController.updateViewSize(
+            Size(
+              container.maxWidth,
+              container.maxHeight,
+            ),
+          );
+          return _buildSystemUi(child);
+        },
       ),
     );
   }

lib/manager/tile_manager.dart

@@ -1,4 +1,3 @@
-import 'package:fl_clash/models/app.dart';
 import 'package:fl_clash/plugins/tile.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
@@ -6,7 +5,10 @@ import 'package:flutter/material.dart';
 class TileManager extends StatefulWidget {
   final Widget child;
 
-  const TileManager({super.key, required this.child});
+  const TileManager({
+    super.key,
+    required this.child,
+  });
 
   @override
   State<TileManager> createState() => _TileContainerState();
@@ -20,18 +22,12 @@ class _TileContainerState extends State<TileManager> with TileListener {
 
   @override
   void onStart() {
-    if (globalState.appState.isStart) {
-      return;
-    }
     globalState.appController.updateStatus(true);
     super.onStart();
   }
 
   @override
   Future<void> onStop() async {
-    if (!globalState.appState.isStart) {
-      return;
-    }
     globalState.appController.updateStatus(false);
     super.onStop();
   }

lib/manager/vpn_manager.dart

@@ -24,16 +24,11 @@ class _VpnContainerState extends ConsumerState<VpnManager> {
   }
 
   void showTip() {
-    throttler.call(
-      FunctionTag.vpnTip,
-      () {
-        if (ref.read(isStartProvider)) {
-          globalState.showNotifier(appLocalizations.vpnTip);
-        }
-      },
-      duration: const Duration(seconds: 6),
-      fire: true,
-    );
+    debouncer.call(FunctionTag.vpnTip, () {
+      if (ref.read(isStartProvider)) {
+        globalState.showNotifier(appLocalizations.vpnTip);
+      }
+    });
   }
 
   @override

lib/manager/window_manager.dart

@@ -271,16 +271,18 @@ class AppIcon extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      decoration: ShapeDecoration(
-        color: context.colorScheme.surfaceContainerHighest,
-        shape: RoundedSuperellipseBorder(
-          borderRadius: BorderRadius.circular(14),
-        ),
+      decoration: BoxDecoration(
+        color: context.colorScheme.primaryContainer,
+        borderRadius: BorderRadius.circular(12),
       ),
-      padding: EdgeInsets.all(8),
-      child: Transform.translate(
-        offset: Offset(0, -1),
-        child: Image.asset('assets/images/icon.png', width: 34, height: 34),
+      padding: EdgeInsets.all(6),
+      child: SizedBox(
+        width: 28,
+        height: 28,
+        child: CircleAvatar(
+          foregroundImage: AssetImage('assets/images/icon.png'),
+          backgroundColor: Colors.transparent,
+        ),
       ),
     );
   }

lib/models/app.dart

@@ -20,7 +20,6 @@ abstract class AppState with _$AppState {
     @Default([]) List<Package> packages,
     @Default(0) int sortNum,
     required Size viewSize,
-    @Default(0) double sideWidth,
     @Default({}) DelayMap delayMap,
     @Default([]) List<Group> groups,
     @Default(0) int checkIpNum,