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

Fix start ANR

Browse source
This commit is contained in:
世界 2024-01-11 15:19:45 +08:00
parent f129c4351d
commit 923a3789d0
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,6 +21,7 @@ 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
import io.nekohasekai.sfa.BuildConfig import io.nekohasekai.sfa.BuildConfig
import io.nekohasekai.sfa.R
import io.nekohasekai.sfa.constant.Action import io.nekohasekai.sfa.constant.Action
import io.nekohasekai.sfa.constant.Alert import io.nekohasekai.sfa.constant.Alert
import io.nekohasekai.sfa.constant.Status import io.nekohasekai.sfa.constant.Status
@ -122,6 +123,10 @@ class BoxService(
private var lastProfileName = "" private var lastProfileName = ""
private suspend fun startService(delayStart: Boolean = false) { private suspend fun startService(delayStart: Boolean = false) {
try { try {
withContext(Dispatchers.Main) {
notification.show(lastProfileName, R.string.status_starting)
}
val selectedProfileId = Settings.selectedProfile val selectedProfileId = Settings.selectedProfile
if (selectedProfileId == -1L) { if (selectedProfileId == -1L) {
stopAndAlert(Alert.EmptyConfiguration) stopAndAlert(Alert.EmptyConfiguration)
@ -142,6 +147,7 @@ class BoxService(
lastProfileName = profile.name lastProfileName = profile.name
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
notification.show(lastProfileName, R.string.status_starting)
binder.broadcast { binder.broadcast {
it.onServiceResetLogs(listOf()) it.onServiceResetLogs(listOf())
} }
@ -166,10 +172,10 @@ class BoxService(
boxService = newService boxService = newService
commandServer?.setService(boxService) commandServer?.setService(boxService)
status.postValue(Status.Started) status.postValue(Status.Started)
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
notification.show(lastProfileName) notification.show(lastProfileName, R.string.status_started)
} }
notification.start()
} catch (e: Exception) { } catch (e: Exception) {
stopAndAlert(Alert.StartService, e.message) stopAndAlert(Alert.StartService, e.message)
return return

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

@ -9,6 +9,7 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.IntentFilter import android.content.IntentFilter
import android.os.Build import android.os.Build
import androidx.annotation.StringRes
import androidx.core.app.NotificationCompat import androidx.core.app.NotificationCompat
import androidx.core.app.ServiceCompat import androidx.core.app.ServiceCompat
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
@ -76,7 +77,7 @@ class ServiceNotification(
} }
} }
suspend fun show(lastProfileName: String) { fun show(lastProfileName: String, @StringRes contentTextId: Int) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
Application.notification.createNotificationChannel( Application.notification.createNotificationChannel(
NotificationChannel( NotificationChannel(
@ -87,14 +88,15 @@ class ServiceNotification(
service.startForeground( service.startForeground(
notificationId, notificationBuilder notificationId, notificationBuilder
.setContentTitle(lastProfileName.takeIf { it.isNotBlank() } ?: "sing-box") .setContentTitle(lastProfileName.takeIf { it.isNotBlank() } ?: "sing-box")
.setContentText("service started").build() .setContentText(service.getString(contentTextId)).build()
) )
withContext(Dispatchers.IO) { }
if (Settings.dynamicNotification) {
commandClient.connect() suspend fun start() {
withContext(Dispatchers.Main) { if (Settings.dynamicNotification) {
registerReceiver() commandClient.connect()
} withContext(Dispatchers.Main) {
registerReceiver()
} }
} }
} }