SagerNet/sing-box-for-android
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box-for-android.git synced 2025-04-06 21:37:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix notification

Browse source
This commit is contained in:
世界 2023-11-14 19:24:10 +08:00
parent df2cf22428
commit 8da004c024
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/io/nekohasekai/sfa/bg/BoxService.kt
View file

@ -17,7 +17,6 @@ import io.nekohasekai.libbox.BoxService
import io.nekohasekai.libbox.CommandServer import io.nekohasekai.libbox.CommandServer
import io.nekohasekai.libbox.CommandServerHandler import io.nekohasekai.libbox.CommandServerHandler
import io.nekohasekai.libbox.Libbox import io.nekohasekai.libbox.Libbox
import io.nekohasekai.libbox.PProfServer
import io.nekohasekai.libbox.PlatformInterface import io.nekohasekai.libbox.PlatformInterface
import io.nekohasekai.libbox.SystemProxyStatus import io.nekohasekai.libbox.SystemProxyStatus
import io.nekohasekai.sfa.Application import io.nekohasekai.sfa.Application
@ -89,7 +88,6 @@ class BoxService(
private val notification = ServiceNotification(status, service) private val notification = ServiceNotification(status, service)
private var boxService: BoxService? = null private var boxService: BoxService? = null
private var commandServer: CommandServer? = null private var commandServer: CommandServer? = null
private var pprofServer: PProfServer? = null
private var receiverRegistered = false private var receiverRegistered = false
private val receiver = object : BroadcastReceiver() { private val receiver = object : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {

7
app/src/main/java/io/nekohasekai/sfa/bg/ServiceNotification.kt
View file

@ -44,6 +44,7 @@ class ServiceNotification(
private val commandClient = private val commandClient =
CommandClient(GlobalScope, CommandClient.ConnectionType.Status, this) CommandClient(GlobalScope, CommandClient.ConnectionType.Status, this)
private var receiverRegistered = false
private val notificationBuilder by lazy { private val notificationBuilder by lazy {
NotificationCompat.Builder(service, notificationChannel).setShowWhen(false).setOngoing(true) NotificationCompat.Builder(service, notificationChannel).setShowWhen(false).setOngoing(true)
@ -103,6 +104,7 @@ class ServiceNotification(
addAction(Intent.ACTION_SCREEN_ON) addAction(Intent.ACTION_SCREEN_ON)
addAction(Intent.ACTION_SCREEN_OFF) addAction(Intent.ACTION_SCREEN_OFF)
}) })
receiverRegistered = true
} }
override fun updateStatus(status: StatusMessage) { override fun updateStatus(status: StatusMessage) {
@ -129,6 +131,9 @@ class ServiceNotification(
fun close() { fun close() {
commandClient.disconnect() commandClient.disconnect()
ServiceCompat.stopForeground(service, ServiceCompat.STOP_FOREGROUND_REMOVE) ServiceCompat.stopForeground(service, ServiceCompat.STOP_FOREGROUND_REMOVE)
service.unregisterReceiver(this) if (receiverRegistered) {
service.unregisterReceiver(this)
receiverRegistered = false
}
} }
} }