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

Fix service reload

Browse source
This commit is contained in:
世界 2023-10-10 08:00:00 +08:00
parent 141eff8841
commit cb06973881
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
4 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,6 +28,7 @@ import io.nekohasekai.sfa.database.ProfileManager
import io.nekohasekai.sfa.database.Settings import io.nekohasekai.sfa.database.Settings
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
@ -117,7 +118,7 @@ class BoxService(
this.commandServer = commandServer this.commandServer = commandServer
} }
private suspend fun startService() { private suspend fun startService(delayStart: Boolean = false) {
try { try {
val selectedProfileId = Settings.selectedProfile val selectedProfileId = Settings.selectedProfile
if (selectedProfileId == -1L) { if (selectedProfileId == -1L) {
@ -154,6 +155,10 @@ class BoxService(
return return
} }
if (delayStart) {
delay(200L)
}
newService.start() newService.start()
boxService = newService boxService = newService
commandServer?.setService(boxService) commandServer?.setService(boxService)
@ -182,7 +187,7 @@ class BoxService(
Seq.destroyRef(refnum) Seq.destroyRef(refnum)
} }
boxService = null boxService = null
startService() startService(true)
} }
} }

2
app/src/main/java/io/nekohasekai/sfa/ui/dashboard/OverviewFragment.kt
View file

@ -338,7 +338,7 @@ class OverviewFragment : Fragment() {
if (restart) { if (restart) {
mainActivity.reconnect() mainActivity.reconnect()
BoxService.stop() BoxService.stop()
delay(200) delay(200L)
mainActivity.startService() mainActivity.startService()
return return
} }

4
app/src/main/java/io/nekohasekai/sfa/ui/profile/EditProfileActivity.kt
View file

@ -171,7 +171,7 @@ class EditProfileActivity : AbstractActivity() {
val binding = binding ?: return val binding = binding ?: return
binding.progressView.isVisible = true binding.progressView.isVisible = true
lifecycleScope.launch(Dispatchers.IO) { lifecycleScope.launch(Dispatchers.IO) {
delay(200) delay(200L)
try { try {
ProfileManager.update(profile) ProfileManager.update(profile)
} catch (e: Exception) { } catch (e: Exception) {
@ -212,7 +212,7 @@ class EditProfileActivity : AbstractActivity() {
val binding = binding ?: return val binding = binding ?: return
binding.progressView.isVisible = true binding.progressView.isVisible = true
lifecycleScope.launch(Dispatchers.IO) { lifecycleScope.launch(Dispatchers.IO) {
delay(200) delay(200L)
try { try {
Libbox.checkConfig(File(profile.typed.path).readText()) Libbox.checkConfig(File(profile.typed.path).readText())
} catch (e: Exception) { } catch (e: Exception) {

2
app/src/main/java/io/nekohasekai/sfa/ui/profile/EditProfileContentActivity.kt
View file

@ -138,7 +138,7 @@ class EditProfileContentActivity : AbstractActivity() {
} }
} }
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
delay(200) delay(200L)
binding.progressView.isInvisible = true binding.progressView.isInvisible = true
} }
} }