Improve: migrate to latest dependencies

app/src/main/java/com/github/kr328/clash/BaseActivity.kt

@@ -114,7 +114,7 @@ abstract class BaseActivity<D : Design<*>> :
 
         Remote.broadcasts.addObserver(this)
 
-        events.offer(Event.ActivityStart)
+        events.trySend(Event.ActivityStart)
     }
 
     override fun onStop() {
@@ -124,7 +124,7 @@ abstract class BaseActivity<D : Design<*>> :
 
         Remote.broadcasts.removeObserver(this)
 
-        events.offer(Event.ActivityStop)
+        events.trySend(Event.ActivityStop)
     }
 
     override fun onDestroy() {
@@ -174,23 +174,23 @@ abstract class BaseActivity<D : Design<*>> :
     }
 
     override fun onProfileChanged() {
-        events.offer(Event.ProfileChanged)
+        events.trySend(Event.ProfileChanged)
     }
 
     override fun onProfileLoaded() {
-        events.offer(Event.ProfileLoaded)
+        events.trySend(Event.ProfileLoaded)
     }
 
     override fun onServiceRecreated() {
-        events.offer(Event.ServiceRecreated)
+        events.trySend(Event.ServiceRecreated)
     }
 
     override fun onStarted() {
-        events.offer(Event.ClashStart)
+        events.trySend(Event.ClashStart)
     }
 
     override fun onStopped(cause: String?) {
-        events.offer(Event.ClashStop)
+        events.trySend(Event.ClashStop)
 
         if (cause != null && activityStarted) {
             launch {

app/src/main/java/com/github/kr328/clash/FilesActivity.kt

@@ -141,7 +141,7 @@ class FilesActivity : BaseActivity<FilesDesign>() {
     }
 
     override fun onBackPressed() {
-        design?.requests?.offer(FilesDesign.Request.PopStack)
+        design?.requests?.trySend(FilesDesign.Request.PopStack)
     }
 
     private suspend fun FilesDesign.fetch(client: FilesClient, stack: Stack<String>, root: String) {

app/src/main/java/com/github/kr328/clash/LogcatService.kt

@@ -97,7 +97,7 @@ class LogcatService : Service(), CoroutineScope by CoroutineScope(Dispatchers.De
                 LogcatWriter(this@LogcatService).use {
                     val observer = object : ILogObserver {
                         override fun newItem(log: LogMessage) {
-                            channel.offer(log)
+                            channel.trySend(log)
                         }
                     }
 

app/src/main/java/com/github/kr328/clash/LogsActivity.kt

@@ -47,7 +47,7 @@ class LogsActivity : BaseActivity<LogsDesign>() {
                                     deleteAllLogs()
                                 }
 
-                                events.offer(Event.ActivityStart)
+                                events.trySend(Event.ActivityStart)
                             }
                         }
                         is LogsDesign.Request.OpenFile -> {

app/src/main/java/com/github/kr328/clash/MainApplication.kt

@@ -32,4 +32,8 @@ class MainApplication : Application() {
             sendServiceRecreated()
         }
     }
+
+    fun finalize() {
+        Global.destroy()
+    }
 }
\ No newline at end of file

app/src/main/java/com/github/kr328/clash/ProxyActivity.kt

@@ -73,7 +73,7 @@ class ProxyActivity : BaseActivity<ProxyDesign>() {
                         }
                         ProxyDesign.Request.ReloadAll -> {
                             names.indices.forEach { idx ->
-                                design.requests.offer(ProxyDesign.Request.Reload(idx))
+                                design.requests.trySend(ProxyDesign.Request.Reload(idx))
                             }
                         }
                         is ProxyDesign.Request.Reload -> {

app/src/main/java/com/github/kr328/clash/remote/Remote.kt

@@ -10,7 +10,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.GlobalScope
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.launch
 
@@ -30,9 +29,9 @@ object Remote {
     fun launch() {
         ApplicationObserver.attach(Global.application)
 
-        ApplicationObserver.onVisibleChanged(visible::offer)
+        ApplicationObserver.onVisibleChanged { visible.trySend(it) }
 
-        GlobalScope.launch(Dispatchers.IO) {
+        Global.launch(Dispatchers.IO) {
             run()
         }
     }

common/src/main/java/com/github/kr328/clash/common/Global.kt

 package com.github.kr328.clash.common
 
 import android.app.Application
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
 
-object Global {
+object Global : CoroutineScope by CoroutineScope(Dispatchers.IO) {
     val application: Application
         get() = application_
 
@@ -11,4 +14,8 @@ object Global {
     fun init(application: Application) {
         this.application_ = application
     }
+
+    fun destroy() {
+        cancel()
+    }
 }
\ No newline at end of file

core/src/main/java/com/github/kr328/clash/core/Clash.kt

@@ -218,7 +218,7 @@ object Clash {
         return Channel<LogMessage>(32).apply {
             Bridge.nativeSubscribeLogcat(object : LogcatInterface {
                 override fun received(jsonPayload: String) {
-                    offer(Json.decodeFromString(LogMessage.serializer(), jsonPayload))
+                    trySend(Json.decodeFromString(LogMessage.serializer(), jsonPayload))
                 }
             })
         }

design/src/foss/java/com/github/kr328/clash/design/OverrideSettingsDesign.kt

@@ -236,7 +236,7 @@ class OverrideSettingsDesign(
                 summary = R.string.sideload_geoip_summary
             ) {
                 clicked {
-                    requests.offer(Request.EditSideloadGeoip)
+                    requests.trySend(Request.EditSideloadGeoip)
                 }
             }
 
@@ -394,6 +394,6 @@ class OverrideSettingsDesign(
     }
 
     fun requestClear() {
-        requests.offer(Request.ResetOverride)
+        requests.trySend(Request.ResetOverride)
     }
 }
\ No newline at end of file

design/src/foss/java/com/github/kr328/clash/design/component/ProxyMenu.kt

@@ -32,48 +32,48 @@ class ProxyMenu(
             R.id.not_selectable -> {
                 uiStore.proxyExcludeNotSelectable = item.isChecked
 
-                requests.offer(ProxyDesign.Request.ReLaunch)
+                requests.trySend(ProxyDesign.Request.ReLaunch)
             }
             R.id.single -> {
                 uiStore.proxySingleLine = true
 
                 updateConfig()
 
-                requests.offer(ProxyDesign.Request.ReloadAll)
+                requests.trySend(ProxyDesign.Request.ReloadAll)
             }
             R.id.multiple -> {
                 uiStore.proxySingleLine = false
 
                 updateConfig()
 
-                requests.offer(ProxyDesign.Request.ReloadAll)
+                requests.trySend(ProxyDesign.Request.ReloadAll)
             }
             R.id.default_ -> {
                 uiStore.proxySort = ProxySort.Default
 
-                requests.offer(ProxyDesign.Request.ReloadAll)
+                requests.trySend(ProxyDesign.Request.ReloadAll)
             }
             R.id.name -> {
                 uiStore.proxySort = ProxySort.Title
 
-                requests.offer(ProxyDesign.Request.ReloadAll)
+                requests.trySend(ProxyDesign.Request.ReloadAll)
             }
             R.id.delay -> {
                 uiStore.proxySort = ProxySort.Delay
 
-                requests.offer(ProxyDesign.Request.ReloadAll)
+                requests.trySend(ProxyDesign.Request.ReloadAll)
             }
             R.id.dont_modify -> {
-                requests.offer(ProxyDesign.Request.PatchMode(null))
+                requests.trySend(ProxyDesign.Request.PatchMode(null))
             }
             R.id.direct_mode -> {
-                requests.offer(ProxyDesign.Request.PatchMode(TunnelState.Mode.Direct))
+                requests.trySend(ProxyDesign.Request.PatchMode(TunnelState.Mode.Direct))
             }
             R.id.global_mode -> {
-                requests.offer(ProxyDesign.Request.PatchMode(TunnelState.Mode.Global))
+                requests.trySend(ProxyDesign.Request.PatchMode(TunnelState.Mode.Global))
             }
             R.id.rule_mode -> {
-                requests.offer(ProxyDesign.Request.PatchMode(TunnelState.Mode.Rule))
+                requests.trySend(ProxyDesign.Request.PatchMode(TunnelState.Mode.Rule))
             }
             else -> return false
         }

design/src/main/java/com/github/kr328/clash/design/AccessControlDesign.kt

@@ -93,7 +93,7 @@ class AccessControlDesign(
             binding.surface = dialog.surface
             binding.mainList.applyLinearAdapter(context, adapter)
             binding.keywordView.addTextChangedListener {
-                filter.offer(Unit)
+                filter.trySend(Unit)
             }
             binding.closeView.setOnClickListener {
                 dialog.dismiss()

design/src/main/java/com/github/kr328/clash/design/ApkBrokenDesign.kt

@@ -38,7 +38,7 @@ class ApkBrokenDesign(context: Context) : Design<ApkBrokenDesign.Request>(contex
                 summary = R.string.google_play_url
             ) {
                 clicked {
-                    requests.offer(Request(context.getString(R.string.google_play_url)))
+                    requests.trySend(Request(context.getString(R.string.google_play_url)))
                 }
             }
 
@@ -47,7 +47,7 @@ class ApkBrokenDesign(context: Context) : Design<ApkBrokenDesign.Request>(contex
                 summary = R.string.github_releases_url
             ) {
                 clicked {
-                    requests.offer(Request(context.getString(R.string.github_releases_url)))
+                    requests.trySend(Request(context.getString(R.string.github_releases_url)))
                 }
             }
         }

design/src/main/java/com/github/kr328/clash/design/AppSettingsDesign.kt

@@ -61,7 +61,7 @@ class AppSettingsDesign(
                 title = R.string.dark_mode
             ) {
                 listener = OnChangedListener {
-                    requests.offer(Request.ReCreateAllActivities)
+                    requests.trySend(Request.ReCreateAllActivities)
                 }
             }
 

design/src/main/java/com/github/kr328/clash/design/FilesDesign.kt

@@ -72,38 +72,38 @@ class FilesDesign(context: Context) : Design<FilesDesign.Request>(context) {
 
     private fun requestOpen(file: File) {
         if (file.isDirectory) {
-            requests.offer(Request.OpenDirectory(file))
+            requests.trySend(Request.OpenDirectory(file))
         } else {
-            requests.offer(Request.OpenFile(file))
+            requests.trySend(Request.OpenFile(file))
         }
     }
 
     fun requestRename(dialog: Dialog, file: File) {
-        requests.offer(Request.RenameFile(file))
+        requests.trySend(Request.RenameFile(file))
 
         dialog.dismiss()
     }
 
     fun requestImport(dialog: Dialog, file: File) {
-        requests.offer(Request.ImportFile(file))
+        requests.trySend(Request.ImportFile(file))
 
         dialog.dismiss()
     }
 
     fun requestExport(dialog: Dialog, file: File) {
-        requests.offer(Request.ExportFile(file))
+        requests.trySend(Request.ExportFile(file))
 
         dialog.dismiss()
     }
 
     fun requestDelete(dialog: Dialog, file: File) {
-        requests.offer(Request.DeleteFile(file))
+        requests.trySend(Request.DeleteFile(file))
 
         dialog.dismiss()
     }
 
     fun requestNew() {
-        requests.offer(Request.ImportFile(null))
+        requests.trySend(Request.ImportFile(null))
     }
 
     private fun requestMore(file: File) {

design/src/main/java/com/github/kr328/clash/design/LogsDesign.kt

@@ -23,7 +23,7 @@ class LogsDesign(context: Context) : Design<LogsDesign.Request>(context) {
     private val binding = DesignLogsBinding
         .inflate(context.layoutInflater, context.root, false)
     private val adapter = LogFileAdapter(context) {
-        requests.offer(Request.OpenFile(it))
+        requests.trySend(Request.OpenFile(it))
     }
 
     override val root: View

design/src/main/java/com/github/kr328/clash/design/MainDesign.kt

@@ -97,6 +97,6 @@ class MainDesign(context: Context) : Design<MainDesign.Request>(context) {
     }
 
     fun request(request: Request) {
-        requests.offer(request)
+        requests.trySend(request)
     }
 }
\ No newline at end of file

design/src/main/java/com/github/kr328/clash/design/NetworkSettingsDesign.kt

@@ -96,7 +96,7 @@ class NetworkSettingsDesign(
                 summary = R.string.access_control_packages_summary,
             ) {
                 clicked {
-                    requests.offer(Request.StartAccessControlList)
+                    requests.trySend(Request.StartAccessControlList)
                 }
 
                 vpnDependencies.add(this)

design/src/main/java/com/github/kr328/clash/design/NewProfileDesign.kt

@@ -38,13 +38,13 @@ class NewProfileDesign(context: Context) : Design<NewProfileDesign.Request>(cont
     }
 
     private fun requestCreate(provider: ProfileProvider) {
-        requests.offer(Request.Create(provider))
+        requests.trySend(Request.Create(provider))
     }
 
     private fun requestDetail(provider: ProfileProvider): Boolean {
         if (provider !is ProfileProvider.External) return false
 
-        requests.offer(Request.OpenDetail(provider))
+        requests.trySend(Request.OpenDetail(provider))
 
         return true
     }

design/src/main/java/com/github/kr328/clash/design/ProfilesDesign.kt

@@ -49,7 +49,7 @@ class ProfilesDesign(context: Context) : Design<ProfilesDesign.Request>(context)
     suspend fun requestSave(profile: Profile) {
         showToast(R.string.active_unsaved_tips, ToastDuration.Long) {
             setAction(R.string.edit) {
-                requests.offer(Request.Edit(profile))
+                requests.trySend(Request.Edit(profile))
             }
         }
     }
@@ -84,37 +84,37 @@ class ProfilesDesign(context: Context) : Design<ProfilesDesign.Request>(context)
     }
 
     fun requestUpdateAll() {
-        requests.offer(Request.UpdateAll)
+        requests.trySend(Request.UpdateAll)
     }
 
     fun requestCreate() {
-        requests.offer(Request.Create)
+        requests.trySend(Request.Create)
     }
 
     private fun requestActive(profile: Profile) {
-        requests.offer(Request.Active(profile))
+        requests.trySend(Request.Active(profile))
     }
 
     fun requestUpdate(dialog: Dialog, profile: Profile) {
-        requests.offer(Request.Update(profile))
+        requests.trySend(Request.Update(profile))
 
         dialog.dismiss()
     }
 
     fun requestEdit(dialog: Dialog, profile: Profile) {
-        requests.offer(Request.Edit(profile))
+        requests.trySend(Request.Edit(profile))
 
         dialog.dismiss()
     }
 
     fun requestDuplicate(dialog: Dialog, profile: Profile) {
-        requests.offer(Request.Duplicate(profile))
+        requests.trySend(Request.Duplicate(profile))
 
         dialog.dismiss()
     }
 
     fun requestDelete(dialog: Dialog, profile: Profile) {
-        requests.offer(Request.Delete(profile))
+        requests.trySend(Request.Delete(profile))
 
         dialog.dismiss()
     }