Skip to content

Fix ANR risk: offload ContentResolver and ProfileManager I/O off the main thread #3241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 2 commits into
base: master
Choose a base branch
from
+44 −20
Draft

Fix ANR risk: offload ContentResolver and ProfileManager I/O off the main thread #3241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ff5d11
Initial plan
Copilot Apr 28, 2026
2aa5d9a
Fix ANR risk: move ContentResolver openOutputStream/openInputStream t…
Copilot Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ import androidx.appcompat.widget.TooltipCompat
import androidx.core.os.bundleOf
import androidx.core.view.ViewCompat
import androidx.fragment.app.DialogFragment
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.*
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import com.github.shadowsocks.aidl.TrafficStats
import com.github.shadowsocks.bg.BaseService
import com.github.shadowsocks.database.Profile
Expand Down Expand Up @@ -457,22 +461,30 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener, Sea
private fun importOrReplaceProfiles(dataUris: List<Uri>, replace: Boolean = false) {
if (dataUris.isEmpty()) return
val activity = activity as MainActivity
try {
ProfileManager.createProfilesFromJson(dataUris.asSequence().map {
activity.contentResolver.openInputStream(it)
}.filterNotNull(), replace)
} catch (e: Exception) {
activity.snackbar(e.readableMessage).show()
lifecycleScope.launch {
try {
withContext(Dispatchers.IO) {
ProfileManager.createProfilesFromJson(dataUris.asSequence().map {
activity.contentResolver.openInputStream(it)
}.filterNotNull(), replace)
}
} catch (e: Exception) {
activity.snackbar(e.readableMessage).show()
}
}
}
private val importProfiles = registerForActivityResult(OpenJson) { importOrReplaceProfiles(it) }
private val replaceProfiles = registerForActivityResult(OpenJson) { importOrReplaceProfiles(it, true) }
private val exportProfiles = registerForActivityResult(SaveJson) { data ->
if (data != null) ProfileManager.serializeToJson()?.let { profiles ->
if (data != null) lifecycleScope.launch {
val activity = activity as MainActivity
try {
activity.contentResolver.openOutputStream(data)!!.bufferedWriter().use {
it.write(profiles.toString(2))
withContext(Dispatchers.IO) {
ProfileManager.serializeToJson()?.let { profiles ->
activity.contentResolver.openOutputStream(data)!!.bufferedWriter().use {
it.write(profiles.toString(2))
}
}
}
} catch (e: Exception) {
Timber.w(e)
Expand Down
34 changes: 23 additions & 11 deletions tv/src/main/java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ import androidx.activity.result.ActivityResultLauncher
import androidx.fragment.app.setFragmentResultListener
import androidx.fragment.app.viewModels
import androidx.leanback.preference.LeanbackPreferenceFragmentCompat
import androidx.lifecycle.lifecycleScope
import androidx.preference.*
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import com.github.shadowsocks.BootReceiver
import com.github.shadowsocks.Core
import com.github.shadowsocks.aidl.IShadowsocksService
Expand Down Expand Up @@ -228,22 +232,30 @@ class MainPreferenceFragment : LeanbackPreferenceFragmentCompat(), ShadowsocksCo
private val replaceProfiles = registerForActivityResult(OpenJson) { dataUris ->
if (dataUris.isEmpty()) return@registerForActivityResult
val context = requireContext()
try {
ProfileManager.createProfilesFromJson(dataUris.asSequence().map {
context.contentResolver.openInputStream(it)
}.filterNotNull(), true)
} catch (e: Exception) {
Timber.w(e)
Toast.makeText(context, e.readableMessage, Toast.LENGTH_SHORT).show()
lifecycleScope.launch {
try {
withContext(Dispatchers.IO) {
ProfileManager.createProfilesFromJson(dataUris.asSequence().map {
context.contentResolver.openInputStream(it)
}.filterNotNull(), true)
}
} catch (e: Exception) {
Timber.w(e)
Toast.makeText(context, e.readableMessage, Toast.LENGTH_SHORT).show()
}
populateProfiles()
}
populateProfiles()
}
private val exportProfiles = registerForActivityResult(SaveJson) { data ->
if (data != null) ProfileManager.serializeToJson()?.let { profiles ->
if (data != null) lifecycleScope.launch {
val context = requireContext()
try {
context.contentResolver.openOutputStream(data)!!.bufferedWriter().use {
it.write(profiles.toString(2))
withContext(Dispatchers.IO) {
ProfileManager.serializeToJson()?.let { profiles ->
context.contentResolver.openOutputStream(data)!!.bufferedWriter().use {
it.write(profiles.toString(2))
}
}
}
} catch (e: Exception) {
Timber.w(e)
Expand Down