Goooler · Goooler · Apr 16, 2026 · Apr 16, 2026 · Apr 16, 2026 · Apr 16, 2026
diff --git a/app/src/main/java/com/github/kr328/clash/AppCrashedActivity.kt b/app/src/main/java/com/github/kr328/clash/AppCrashedActivity.kt
@@ -1,6 +1,5 @@
 package com.github.kr328.clash
 
-import com.github.kr328.clash.common.compat.versionCodeCompat
 import com.github.kr328.clash.common.log.Log
 import com.github.kr328.clash.design.AppCrashedDesign
 import com.github.kr328.clash.log.SystemLogcat
@@ -18,7 +17,7 @@ class AppCrashedActivity : BaseActivity<AppCrashedDesign>() {
             withContext(Dispatchers.IO) { packageManager.getPackageInfo(packageName, 0) }
 
         Log.i(
-            "App version: versionName = ${packageInfo.versionName} versionCode = ${packageInfo.versionCodeCompat}"
+            "App version: versionName = ${packageInfo.versionName} versionCode = ${packageInfo.longVersionCode}"
         )
 
         val logs = withContext(Dispatchers.IO) { SystemLogcat.dumpCrash() }

diff --git a/app/src/main/java/com/github/kr328/clash/AppSettingsActivity.kt b/app/src/main/java/com/github/kr328/clash/AppSettingsActivity.kt
@@ -26,7 +26,7 @@ class AppSettingsActivity : BaseActivity<AppSettingsDesign>(), Behavior {
         setContentDesign(design)
 
         while (isActive) {
-            select<Unit> {
+            select {
                 events.onReceive {
                     when (it) {
                         Event.ClashStart,

diff --git a/app/src/main/java/com/github/kr328/clash/BaseActivity.kt b/app/src/main/java/com/github/kr328/clash/BaseActivity.kt
@@ -2,7 +2,6 @@ package com.github.kr328.clash
 
 import android.app.ActivityManager
 import android.content.res.Configuration
-import android.os.Build
 import android.os.Bundle
 import android.view.View
 import androidx.activity.result.contract.ActivityResultContract
@@ -28,14 +27,14 @@ import com.github.kr328.clash.util.ApplicationObserver
 import java.util.UUID
 import java.util.concurrent.atomic.AtomicInteger
 import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
 
 abstract class BaseActivity<D : Design<*>> :
@@ -76,7 +75,7 @@ abstract class BaseActivity<D : Design<*>> :
             val requestKey = nextRequestKey.getAndIncrement().toString()
 
             ActivityResultLifecycle().use { lifecycle, start ->
-                suspendCoroutine { c ->
+                suspendCancellableCoroutine { c ->
                     activityResultRegistry
                         .register(requestKey, lifecycle, contracts) { c.resume(it) }
                         .apply { start() }
@@ -86,7 +85,7 @@ abstract class BaseActivity<D : Design<*>> :
         }
 
     suspend fun setContentDesign(design: D) {
-        suspendCoroutine<Unit> {
+        suspendCancellableCoroutine {
             window.decorView.post {
                 this.design = design
                 it.resume(Unit)
@@ -147,10 +146,6 @@ abstract class BaseActivity<D : Design<*>> :
         }
     }
 
-    open fun shouldDisplayHomeAsUpEnabled(): Boolean {
-        return true
-    }
-
     override fun onSupportNavigateUp(): Boolean {
         this.onBackPressed()
         return true
@@ -215,15 +210,9 @@ abstract class BaseActivity<D : Design<*>> :
         window.statusBarColor = resolveThemedColor(android.R.attr.statusBarColor)
         window.navigationBarColor = resolveThemedColor(android.R.attr.navigationBarColor)
 
-        if (Build.VERSION.SDK_INT >= 23) {
-            window.isLightStatusBarsCompat =
-                resolveThemedBoolean(android.R.attr.windowLightStatusBar)
-        }
-
-        if (Build.VERSION.SDK_INT >= 27) {
-            window.isLightNavigationBarCompat =
-                resolveThemedBoolean(android.R.attr.windowLightNavigationBar)
-        }
+        window.isLightStatusBarsCompat = resolveThemedBoolean(android.R.attr.windowLightStatusBar)
+        window.isLightNavigationBarCompat =
+            resolveThemedBoolean(android.R.attr.windowLightNavigationBar)
 
         this.dayNight = dayNight
     }

diff --git a/app/src/main/java/com/github/kr328/clash/FilesActivity.kt b/app/src/main/java/com/github/kr328/clash/FilesActivity.kt
@@ -1,5 +1,3 @@
-@file:Suppress("BlockingMethodInNonBlockingContext")
-
 package com.github.kr328.clash
 
 import android.content.Intent
@@ -37,7 +35,7 @@ class FilesActivity : BaseActivity<FilesDesign>() {
         val ticker = ticker(TimeUnit.MINUTES.toMillis(1))
 
         while (isActive) {
-            select<Unit> {
+            select {
                 events.onReceive {
                     when (it) {
                         Event.ActivityStart,

diff --git a/app/src/main/java/com/github/kr328/clash/LogcatActivity.kt b/app/src/main/java/com/github/kr328/clash/LogcatActivity.kt
@@ -1,13 +1,11 @@
 package com.github.kr328.clash
 
 import android.content.ComponentName
-import android.content.Context
 import android.content.ServiceConnection
 import android.net.Uri
 import android.os.IBinder
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
-import com.github.kr328.clash.common.compat.startForegroundServiceCompat
 import com.github.kr328.clash.common.log.Log
 import com.github.kr328.clash.common.util.fileName
 import com.github.kr328.clash.common.util.intent
@@ -24,10 +22,10 @@ import com.github.kr328.clash.log.LogcatReader
 import com.github.kr328.clash.util.logsDir
 import java.io.OutputStreamWriter
 import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.selects.select
+import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
 
 class LogcatActivity : BaseActivity<LogcatDesign>() {
@@ -94,15 +92,15 @@ class LogcatActivity : BaseActivity<LogcatDesign>() {
 
         setContentDesign(design)
 
-        startForegroundServiceCompat(LogcatService::class.intent)
+        startForegroundService(LogcatService::class.intent)
 
         val logcat = bindLogcatService()
         val ticker = ticker(500)
 
         var initial = true
 
         while (isActive) {
-            select<Unit> {
+            select {
                 events.onReceive {}
 
                 design.requests.onReceive {
@@ -135,7 +133,7 @@ class LogcatActivity : BaseActivity<LogcatDesign>() {
     }
 
     private suspend fun bindLogcatService(): LogcatService {
-        return suspendCoroutine { ctx ->
+        return suspendCancellableCoroutine { ctx ->
             bindService(
                 LogcatService::class.intent,
                 object : ServiceConnection {
@@ -151,12 +149,11 @@ class LogcatActivity : BaseActivity<LogcatDesign>() {
                         conn = null
                     }
                 },
-                Context.BIND_AUTO_CREATE,
+                BIND_AUTO_CREATE,
             )
         }
     }
 
-    @Suppress("BlockingMethodInNonBlockingContext")
     private suspend fun writeLogTo(messages: List<LogMessage>, file: LogFile, uri: Uri) {
         LogcatFilter(OutputStreamWriter(contentResolver.openOutputStream(uri)), this).use {
             withContext(Dispatchers.Main) {

diff --git a/app/src/main/java/com/github/kr328/clash/LogcatService.kt b/app/src/main/java/com/github/kr328/clash/LogcatService.kt
@@ -3,7 +3,6 @@ package com.github.kr328.clash
 import android.app.PendingIntent
 import android.app.Service
 import android.content.ComponentName
-import android.content.Context
 import android.content.Intent
 import android.content.ServiceConnection
 import android.os.Binder
@@ -58,7 +57,7 @@ class LogcatService : Service(), CoroutineScope by CoroutineScope(Dispatchers.De
 
         showNotification()
 
-        bindService(RemoteService::class.intent, connection, Context.BIND_AUTO_CREATE)
+        bindService(RemoteService::class.intent, connection, BIND_AUTO_CREATE)
     }
 
     override fun onDestroy() {

diff --git a/app/src/main/java/com/github/kr328/clash/LogsActivity.kt b/app/src/main/java/com/github/kr328/clash/LogsActivity.kt
@@ -18,7 +18,7 @@ class LogsActivity : BaseActivity<LogsDesign>() {
         setContentDesign(design)
 
         while (isActive) {
-            select<Unit> {
+            select {
                 events.onReceive {
                     when (it) {
                         Event.ActivityStart -> {

diff --git a/app/src/main/java/com/github/kr328/clash/MainActivity.kt b/app/src/main/java/com/github/kr328/clash/MainActivity.kt
@@ -33,7 +33,7 @@ class MainActivity : BaseActivity<MainDesign>() {
         val ticker = ticker(TimeUnit.SECONDS.toMillis(1))
 
         while (isActive) {
-            select<Unit> {
+            select {
                 events.onReceive {
                     when (it) {
                         Event.ActivityStart,

diff --git a/app/src/main/java/com/github/kr328/clash/MainApplication.kt b/app/src/main/java/com/github/kr328/clash/MainApplication.kt
@@ -17,7 +17,6 @@ import com.github.kr328.clash.util.clashDir
 import java.io.File
 import java.io.FileOutputStream
 
-@Suppress("unused")
 class MainApplication : Application() {
     private val uiStore by lazy(LazyThreadSafetyMode.NONE) { UiStore(this) }
 

diff --git a/app/src/main/java/com/github/kr328/clash/MetaFeatureSettingsActivity.kt b/app/src/main/java/com/github/kr328/clash/MetaFeatureSettingsActivity.kt
@@ -29,7 +29,7 @@ class MetaFeatureSettingsActivity : BaseActivity<MetaFeatureSettingsDesign>() {
         setContentDesign(design)
 
         while (isActive) {
-            select<Unit> {
+            select {
                 events.onReceive {}
 
                 design.requests.onReceive {

diff --git a/app/src/main/java/com/github/kr328/clash/NetworkSettingsActivity.kt b/app/src/main/java/com/github/kr328/clash/NetworkSettingsActivity.kt
@@ -13,7 +13,7 @@ class NetworkSettingsActivity : BaseActivity<NetworkSettingsDesign>() {
         setContentDesign(design)
 
         while (isActive) {
-            select<Unit> {
+            select {
                 events.onReceive {
                     when (it) {
                         Event.ClashStart,

diff --git a/app/src/main/java/com/github/kr328/clash/NewProfileActivity.kt b/app/src/main/java/com/github/kr328/clash/NewProfileActivity.kt
@@ -1,6 +1,5 @@
 package com.github.kr328.clash
 
-import android.app.Activity
 import android.content.ComponentName
 import android.content.Intent
 import android.net.Uri
@@ -43,7 +42,7 @@ class NewProfileActivity : BaseActivity<NewProfileDesign>() {
         setContentDesign(design)
 
         while (isActive) {
-            select<Unit> {
+            select {
                 events.onReceive {}
 
                 design.requests.onReceive {
@@ -109,7 +108,7 @@ class NewProfileActivity : BaseActivity<NewProfileDesign>() {
                 PropertiesActivity::class.intent.setUUID(uuid),
             )
 
-        if (r.resultCode == Activity.RESULT_OK) finish()
+        if (r.resultCode == RESULT_OK) finish()
     }
 
     private suspend fun ProfileProvider.External.get(): Pair<Uri, String?>? {

diff --git a/app/src/main/java/com/github/kr328/clash/OverrideSettingsActivity.kt b/app/src/main/java/com/github/kr328/clash/OverrideSettingsActivity.kt
@@ -2,15 +2,13 @@ package com.github.kr328.clash
 
 import com.github.kr328.clash.core.Clash
 import com.github.kr328.clash.design.OverrideSettingsDesign
-import com.github.kr328.clash.service.store.ServiceStore
 import com.github.kr328.clash.util.withClash
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.selects.select
 
 class OverrideSettingsActivity : BaseActivity<OverrideSettingsDesign>() {
     override suspend fun main() {
         val configuration = withClash { queryOverride(Clash.OverrideSlot.Persist) }
-        val service = ServiceStore(this)
 
         defer { withClash { patchOverride(Clash.OverrideSlot.Persist, configuration) } }
 
@@ -19,7 +17,7 @@ class OverrideSettingsActivity : BaseActivity<OverrideSettingsDesign>() {
         setContentDesign(design)
 
         while (isActive) {
-            select<Unit> {
+            select {
                 events.onReceive {}
 
                 design.requests.onReceive {

diff --git a/app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt b/app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt
@@ -25,7 +25,7 @@ class ProfilesActivity : BaseActivity<ProfilesDesign>() {
         val ticker = ticker(TimeUnit.MINUTES.toMillis(1))
 
         while (isActive) {
-            select<Unit> {
+            select {
                 events.onReceive {
                     when (it) {
                         Event.ActivityStart,

diff --git a/app/src/main/java/com/github/kr328/clash/PropertiesActivity.kt b/app/src/main/java/com/github/kr328/clash/PropertiesActivity.kt
@@ -37,7 +37,7 @@ class PropertiesActivity : BaseActivity<PropertiesDesign>() {
         }
 
         while (isActive) {
-            select<Unit> {
+            select {
                 events.onReceive {
                     when (it) {
                         Event.ActivityStop -> {

diff --git a/app/src/main/java/com/github/kr328/clash/ProxyActivity.kt b/app/src/main/java/com/github/kr328/clash/ProxyActivity.kt
@@ -17,7 +17,7 @@ class ProxyActivity : BaseActivity<ProxyDesign>() {
         val mode = withClash { queryOverride(Clash.OverrideSlot.Session).mode }
         val names = withClash { queryProxyGroupNames(uiStore.proxyExcludeNotSelectable) }
         val states = List(names.size) { ProxyState("?") }
-        val unorderedStates = names.indices.map { names[it] to states[it] }.toMap()
+        val unorderedStates = names.indices.associate { names[it] to states[it] }
         val reloadLock = Semaphore(10)
 
         val design = ProxyDesign(this, mode, names, uiStore)

diff --git a/app/src/main/java/com/github/kr328/clash/SettingsActivity.kt b/app/src/main/java/com/github/kr328/clash/SettingsActivity.kt
@@ -12,7 +12,7 @@ class SettingsActivity : BaseActivity<SettingsDesign>() {
         setContentDesign(design)
 
         while (isActive) {
-            select<Unit> {
+            select {
                 events.onReceive {}
 
                 design.requests.onReceive {

diff --git a/app/src/main/java/com/github/kr328/clash/TileService.kt b/app/src/main/java/com/github/kr328/clash/TileService.kt
@@ -68,7 +68,7 @@ class TileService : TileService() {
 
         tile.state = if (clashRunning) Tile.STATE_ACTIVE else Tile.STATE_INACTIVE
 
-        tile.label = if (currentProfile.isEmpty()) getText(R.string.launch_name) else currentProfile
+        tile.label = currentProfile.ifEmpty { getText(R.string.launch_name) }
 
         tile.icon =
             Icon.createWithResource(this, com.github.kr328.clash.service.R.drawable.ic_logo_service)

diff --git a/app/src/main/java/com/github/kr328/clash/log/LogcatReader.kt b/app/src/main/java/com/github/kr328/clash/log/LogcatReader.kt
@@ -23,7 +23,7 @@ class LogcatReader(context: Context, file: LogFile) : AutoCloseable {
             .filter { !it.startsWith("#") }
             .map { it.split(":", limit = 3) }
             .map {
-                val time = it[0].toLongOrNull()?.let { Date(it) } ?: lastTime
+                val time = it[0].toLongOrNull()?.let { date -> Date(date) } ?: lastTime
                 val logMessage =
                     if (it[0].toLongOrNull() != null) {
                         LogMessage(

diff --git a/app/src/main/java/com/github/kr328/clash/remote/FilesClient.kt b/app/src/main/java/com/github/kr328/clash/remote/FilesClient.kt
@@ -1,5 +1,3 @@
-@file:Suppress("BlockingMethodInNonBlockingContext")
-
 package com.github.kr328.clash.remote
 
 import android.content.Context

diff --git a/app/src/main/java/com/github/kr328/clash/remote/Remote.kt b/app/src/main/java/com/github/kr328/clash/remote/Remote.kt
@@ -11,7 +11,6 @@ import com.github.kr328.clash.store.AppStore
 import com.github.kr328.clash.util.ApplicationObserver
 import com.github.kr328.clash.util.verifyApk
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.launch
 
 object Remote {
@@ -25,8 +24,6 @@ object Remote {
             Global.application.startActivity(intent)
         }
 
-    private val visible = Channel<Boolean>(Channel.CONFLATED)
-
     fun launch() {
         ApplicationObserver.attach(Global.application)
 
@@ -45,7 +42,7 @@ object Remote {
         Global.launch(Dispatchers.IO) { verifyApp() }
     }
 
-    private suspend fun verifyApp() {
+    private fun verifyApp() {
         val context = Global.application
         val store = AppStore(context)
         val updatedAt = getLastUpdated(context)

diff --git a/app/src/main/java/com/github/kr328/clash/store/TipsStore.kt b/app/src/main/java/com/github/kr328/clash/store/TipsStore.kt