Kr328/ClashForAndroid
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use ServiceStatusProvider instead of requery database

Browse Source
This commit is contained in:
Kr328 committed 2020-04-08 02:05:05 +08:00
1 parent 2b63997b22
commit b648d21068
2 files changed
+5 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

service/src/main/java/com/github/kr328/clash/service/clash/module/DynamicNotificationModule.kt
+3 -4
View File
@@ -11,6 +11,7 @@ import com.github.kr328.clash.common.ids.NotificationIds
import com.github.kr328.clash.core.Clash
import com.github.kr328.clash.core.utils.asBytesString
import com.github.kr328.clash.service.R
import com.github.kr328.clash.service.ServiceStatusProvider
import com.github.kr328.clash.service.data.ClashDatabase
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
@@ -93,9 +94,7 @@ class DynamicNotificationModule(private val service: Service) : Module() {
}
}
private suspend fun reload() {
val active =
ClashDatabase.getInstance(service).openClashProfileDao().queryActiveProfile()
currentProfile = active?.name ?: "Not selected"
private fun reload() {
currentProfile = ServiceStatusProvider.currentProfile ?: "Not selected"
}
}
service/src/main/java/com/github/kr328/clash/service/clash/module/StaticNotificationModule.kt
+2 -3
View File
@@ -12,6 +12,7 @@ import com.github.kr328.clash.common.ids.Intents
import com.github.kr328.clash.common.ids.NotificationChannels
import com.github.kr328.clash.common.ids.NotificationIds
import com.github.kr328.clash.service.R
import com.github.kr328.clash.service.ServiceStatusProvider
import com.github.kr328.clash.service.data.ClashDatabase
class StaticNotificationModule(private val service: Service) : Module() {
@@ -51,9 +52,7 @@ class StaticNotificationModule(private val service: Service) : Module() {
}
private suspend fun update() {
val database = ClashDatabase.getInstance(service).openClashProfileDao()
val profileName = database.queryActiveProfile()?.name ?: "Not selected"
val profileName = ServiceStatusProvider.currentProfile ?: "Not selected"
val notification = builder
.setContentTitle(profileName)