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 service restart

Browse source
This commit is contained in:
世界 2023-11-03 01:59:15 +08:00
parent 446ffa4a4d
commit fe5c4b5268
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -156,7 +156,7 @@ class BoxService(
} }
if (delayStart) { if (delayStart) {
delay(200L) delay(1000L)
} }
newService.start() newService.start()
@ -171,7 +171,7 @@ class BoxService(
override fun serviceReload() { override fun serviceReload() {
status.postValue(Status.Starting) status.postValue(Status.Starting)
GlobalScope.launch(Dispatchers.IO) { runBlocking {
val pfd = fileDescriptor val pfd = fileDescriptor
if (pfd != null) { if (pfd != null) {
pfd.close() pfd.close()

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

@ -98,11 +98,11 @@ class OverviewFragment : Fragment() {
val status = Libbox.newStandaloneCommandClient().systemProxyStatus val status = Libbox.newStandaloneCommandClient().systemProxyStatus
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
binding.systemProxyCard.isVisible = status.available binding.systemProxyCard.isVisible = status.available
binding.systemProxyCard.isEnabled = true
binding.systemProxySwitch.setOnClickListener(null) binding.systemProxySwitch.setOnClickListener(null)
binding.systemProxySwitch.isChecked = status.enabled binding.systemProxySwitch.isChecked = status.enabled
binding.systemProxySwitch.isEnabled = true
binding.systemProxySwitch.setOnCheckedChangeListener { buttonView, isChecked -> binding.systemProxySwitch.setOnCheckedChangeListener { buttonView, isChecked ->
binding.systemProxyCard.isEnabled = false binding.systemProxySwitch.isEnabled = false
lifecycleScope.launch(Dispatchers.IO) { lifecycleScope.launch(Dispatchers.IO) {
Settings.systemProxyEnabled = isChecked Settings.systemProxyEnabled = isChecked
runCatching { runCatching {
@ -247,7 +247,7 @@ class OverviewFragment : Fragment() {
class Adapter( class Adapter(
internal val scope: CoroutineScope, internal val scope: CoroutineScope,
private val parent: FragmentDashboardOverviewBinding internal val parent: FragmentDashboardOverviewBinding
) : ) :
RecyclerView.Adapter<Holder>() { RecyclerView.Adapter<Holder>() {
@ -312,6 +312,7 @@ class OverviewFragment : Fragment() {
binding.profileSelected.isChecked = profile.id == adapter.selectedProfileID binding.profileSelected.isChecked = profile.id == adapter.selectedProfileID
binding.profileSelected.setOnCheckedChangeListener { _, isChecked -> binding.profileSelected.setOnCheckedChangeListener { _, isChecked ->
if (isChecked) { if (isChecked) {
adapter.parent.profileList.isClickable = false
adapter.selectedProfileID = profile.id adapter.selectedProfileID = profile.id
adapter.lastSelectedIndex?.let { index -> adapter.lastSelectedIndex?.let { index ->
adapter.notifyItemChanged(index) adapter.notifyItemChanged(index)
@ -319,6 +320,9 @@ class OverviewFragment : Fragment() {
adapter.lastSelectedIndex = adapterPosition adapter.lastSelectedIndex = adapterPosition
adapter.scope.launch(Dispatchers.IO) { adapter.scope.launch(Dispatchers.IO) {
switchProfile(profile) switchProfile(profile)
withContext(Dispatchers.Main) {
adapter.parent.profileList.isEnabled = true
}
} }
} }
} }
@ -338,7 +342,7 @@ class OverviewFragment : Fragment() {
if (restart) { if (restart) {
mainActivity.reconnect() mainActivity.reconnect()
BoxService.stop() BoxService.stop()
delay(200L) delay(1000L)
mainActivity.startService() mainActivity.startService()
return return
} }