purgatory/ClashMetaForAndroid
1
0
Fork 0
mirror of https://github.com/MetaCubeX/ClashMetaForAndroid.git synced 2025-03-25 17:43:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix frequent RemoteManager crash

Browse Source
This commit is contained in:
Steve Johnson 2023-11-02 12:01:36 +08:00
parent 546378b9c4
commit 6caa238298
3 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ import android.content.Intent
import com.github.kr328.clash.ApkBrokenActivity import com.github.kr328.clash.ApkBrokenActivity
import com.github.kr328.clash.AppCrashedActivity import com.github.kr328.clash.AppCrashedActivity
import com.github.kr328.clash.common.Global import com.github.kr328.clash.common.Global
import com.github.kr328.clash.common.log.Log
import com.github.kr328.clash.common.util.intent import com.github.kr328.clash.common.util.intent
import com.github.kr328.clash.store.AppStore import com.github.kr328.clash.store.AppStore
import com.github.kr328.clash.util.ApplicationObserver import com.github.kr328.clash.util.ApplicationObserver
@ -29,14 +30,25 @@ object Remote {
fun launch() { fun launch() {
ApplicationObserver.attach(Global.application) ApplicationObserver.attach(Global.application)
ApplicationObserver.onVisibleChanged { visible.trySend(it) } ApplicationObserver.onVisibleChanged {
if(it) {
Log.d("App becomes visible")
service.bind()
broadcasts.register()
}
else {
Log.d("App becomes invisible")
service.unbind()
broadcasts.unregister()
}
}
Global.launch(Dispatchers.IO) { Global.launch(Dispatchers.IO) {
run() verifyApp()
} }
} }
private suspend fun run() { private suspend fun verifyApp() {
val context = Global.application val context = Global.application
val store = AppStore(context) val store = AppStore(context)
val updatedAt = getLastUpdated(context) val updatedAt = getLastUpdated(context)
@ -53,16 +65,6 @@ object Remote {
store.updatedAt = updatedAt store.updatedAt = updatedAt
} }
} }
while (true) {
if (visible.receive()) {
service.bind()
broadcasts.register()
} else {
service.unbind()
broadcasts.unregister()
}
}
} }
private fun getLastUpdated(context: Context): Long { private fun getLastUpdated(context: Context): Long {

3
app/src/main/java/com/github/kr328/clash/remote/Service.kt
View File

@ -33,8 +33,7 @@ class Service(private val context: Application, val crashed: () -> Unit) {
} }
lastCrashed = System.currentTimeMillis() lastCrashed = System.currentTimeMillis()
Log.w("RemoteService killed or crashed")
Log.w("RemoteManager crashed")
} }
} }

27
app/src/main/java/com/github/kr328/clash/util/Application.kt
View File

@ -9,7 +9,8 @@ import java.io.File
import java.util.zip.ZipFile import java.util.zip.ZipFile
object ApplicationObserver { object ApplicationObserver {
private val activities: MutableSet<Activity> = mutableSetOf() private val _createdActivities: MutableSet<Activity> = mutableSetOf()
private val _visibleActivities: MutableSet<Activity> = mutableSetOf()
private var visibleChanged: (Boolean) -> Unit = {} private var visibleChanged: (Boolean) -> Unit = {}
@ -23,25 +24,31 @@ object ApplicationObserver {
} }
val createdActivities: Set<Activity> val createdActivities: Set<Activity>
get() = activities get() = _createdActivities
private val activityObserver = object : Application.ActivityLifecycleCallbacks { private val activityObserver = object : Application.ActivityLifecycleCallbacks {
@Synchronized @Synchronized
override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) { override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
activities.add(activity) _createdActivities.add(activity)
appVisible = true
} }
@Synchronized @Synchronized
override fun onActivityDestroyed(activity: Activity) { override fun onActivityDestroyed(activity: Activity) {
activities.remove(activity) _createdActivities.remove(activity)
_visibleActivities.remove(activity)
appVisible = activities.isNotEmpty() appVisible = _visibleActivities.isNotEmpty()
}
override fun onActivityStarted(activity: Activity) {
_visibleActivities.add(activity)
appVisible = true
}
override fun onActivityStopped(activity: Activity) {
_visibleActivities.remove(activity)
appVisible = _visibleActivities.isNotEmpty()
} }
override fun onActivityStarted(activity: Activity) {}
override fun onActivityStopped(activity: Activity) {}
override fun onActivityPaused(activity: Activity) {} override fun onActivityPaused(activity: Activity) {}
override fun onActivityResumed(activity: Activity) {} override fun onActivityResumed(activity: Activity) {}
override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {} override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}