icybear/sing-box-for-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add workaround for bulkBarrierPreWrite: unaligned arguments panic

Browse Source
This commit is contained in:
世界
2024-12-10 13:10:12 +08:00
parent 72e3014ee6
commit 1c494b56a3
4 changed files with 12 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/VPNService.kt
View File

@@ -77,7 +77,7 @@ class VPNService : VpnService(), PlatformInterfaceWrapper {
} }
if (options.autoRoute) { if (options.autoRoute) {
builder.addDnsServer(options.dnsServerAddress) builder.addDnsServer(options.dnsServerAddress.value)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
val inet4RouteAddress = options.inet4RouteAddress val inet4RouteAddress = options.inet4RouteAddress

7
app/src/main/java/io/nekohasekai/sfa/ktx/Wrappers.kt
View File

@@ -4,9 +4,16 @@ import android.net.IpPrefix
import android.os.Build import android.os.Build
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import io.nekohasekai.libbox.RoutePrefix import io.nekohasekai.libbox.RoutePrefix
import io.nekohasekai.libbox.StringBox
import io.nekohasekai.libbox.StringIterator import io.nekohasekai.libbox.StringIterator
import java.net.InetAddress import java.net.InetAddress
val StringBox?.unwrap: String
get() {
if (this == null) return ""
return value
}
fun Iterable<String>.toStringIterator(): StringIterator { fun Iterable<String>.toStringIterator(): StringIterator {
return object : StringIterator { return object : StringIterator {
val iterator = iterator() val iterator = iterator()

3
app/src/main/java/io/nekohasekai/sfa/ui/profile/EditProfileContentActivity.kt
View File

@@ -14,6 +14,7 @@ import io.nekohasekai.sfa.database.Profile
import io.nekohasekai.sfa.database.ProfileManager import io.nekohasekai.sfa.database.ProfileManager
import io.nekohasekai.sfa.databinding.ActivityEditProfileContentBinding import io.nekohasekai.sfa.databinding.ActivityEditProfileContentBinding
import io.nekohasekai.sfa.ktx.errorDialogBuilder import io.nekohasekai.sfa.ktx.errorDialogBuilder
import io.nekohasekai.sfa.ktx.unwrap
import io.nekohasekai.sfa.ui.shared.AbstractActivity import io.nekohasekai.sfa.ui.shared.AbstractActivity
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
@@ -84,7 +85,7 @@ class EditProfileContentActivity : AbstractActivity<ActivityEditProfileContentBi
R.id.action_format -> { R.id.action_format -> {
lifecycleScope.launch(Dispatchers.IO) { lifecycleScope.launch(Dispatchers.IO) {
runCatching { runCatching {
val content = Libbox.formatConfig(binding.editor.text.toString()) val content = Libbox.formatConfig(binding.editor.text.toString()).unwrap
if (binding.editor.text.toString() != content) { if (binding.editor.text.toString() != content) {
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
binding.editor.setTextContent(content) binding.editor.setTextContent(content)

3
app/src/main/java/io/nekohasekai/sfa/utils/HTTPClient.kt
View File

@@ -2,6 +2,7 @@ package io.nekohasekai.sfa.utils
import io.nekohasekai.libbox.Libbox import io.nekohasekai.libbox.Libbox
import io.nekohasekai.sfa.BuildConfig import io.nekohasekai.sfa.BuildConfig
import io.nekohasekai.sfa.ktx.unwrap
import java.io.Closeable import java.io.Closeable
class HTTPClient : Closeable { class HTTPClient : Closeable {
@@ -30,7 +31,7 @@ class HTTPClient : Closeable {
request.setUserAgent(userAgent) request.setUserAgent(userAgent)
request.setURL(url) request.setURL(url)
val response = request.execute() val response = request.execute()
return response.contentString return response.content.unwrap
} }
override fun close() { override fun close() {