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

Apply Spotless formatting to Java and Kotlin files

Browse Source
This commit is contained in:
世界
2026-01-17 16:58:26 +08:00
parent 3c9ab19466
commit 9c820a3400
170 changed files with 4496 additions and 5318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/minApi23/java/io/nekohasekai/sfa/compat/LazyItemModifiers.kt
View File

@@ -5,6 +5,4 @@ import androidx.compose.foundation.lazy.LazyItemScope
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.IntOffset
fun LazyItemScope.animateItemCompat(
placementSpec: FiniteAnimationSpec<IntOffset>,
): Modifier = Modifier.animateItem(placementSpec = placementSpec)
fun LazyItemScope.animateItemCompat(placementSpec: FiniteAnimationSpec<IntOffset>): Modifier = Modifier.animateItem(placementSpec = placementSpec)

65
app/src/minApi23/java/io/nekohasekai/sfa/vendor/PackageQueryManager.kt vendored
View File

@@ -32,8 +32,7 @@ object PackageQueryManager {
val rootAvailable: StateFlow<Boolean?> get() = RootClient.rootAvailable
val rootServiceConnected: StateFlow<Boolean> get() = RootClient.serviceConnected
fun isShizukuAvailable(): Boolean =
ShizukuPackageManager.isAvailable() && ShizukuPackageManager.checkPermission()
fun isShizukuAvailable(): Boolean = ShizukuPackageManager.isAvailable() && ShizukuPackageManager.checkPermission()
fun registerListeners() {
ShizukuPackageManager.registerListeners()
@@ -52,48 +51,42 @@ object PackageQueryManager {
ShizukuPackageManager.refresh()
}
suspend fun checkRootAvailable(): Boolean {
return RootClient.checkRootAvailable()
}
suspend fun checkRootAvailable(): Boolean = RootClient.checkRootAvailable()
fun setQueryMode(mode: String) {
_queryMode.value = mode
}
suspend fun getInstalledPackages(flags: Int, retryFlags: Int): List<PackageInfo> {
return when (val s = strategy) {
is PackageQueryStrategy.ForcedRoot -> {
val userId = android.os.Process.myUserHandle().hashCode()
HookStatusClient.getInstalledPackages(Application.application, flags.toLong(), userId)
?: RootClient.getInstalledPackages(flags)
}
is PackageQueryStrategy.UserSelected -> when (s.mode) {
Settings.PACKAGE_QUERY_MODE_ROOT -> RootClient.getInstalledPackages(flags)
else -> ShizukuPackageManager.getInstalledPackages(flags)
}
is PackageQueryStrategy.Direct -> getPackagesViaPackageManager(flags, retryFlags)
suspend fun getInstalledPackages(flags: Int, retryFlags: Int): List<PackageInfo> = when (val s = strategy) {
is PackageQueryStrategy.ForcedRoot -> {
val userId = android.os.Process.myUserHandle().hashCode()
HookStatusClient.getInstalledPackages(Application.application, flags.toLong(), userId)
?: RootClient.getInstalledPackages(flags)
}
is PackageQueryStrategy.UserSelected -> when (s.mode) {
Settings.PACKAGE_QUERY_MODE_ROOT -> RootClient.getInstalledPackages(flags)
else -> ShizukuPackageManager.getInstalledPackages(flags)
}
is PackageQueryStrategy.Direct -> getPackagesViaPackageManager(flags, retryFlags)
}
private fun getPackagesViaPackageManager(flags: Int, retryFlags: Int): List<PackageInfo> {
return try {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
Application.packageManager.getInstalledPackages(
PackageManager.PackageInfoFlags.of(flags.toLong())
)
} else {
@Suppress("DEPRECATION")
Application.packageManager.getInstalledPackages(flags)
}
} catch (_: RuntimeException) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
Application.packageManager.getInstalledPackages(
PackageManager.PackageInfoFlags.of(retryFlags.toLong())
)
} else {
@Suppress("DEPRECATION")
Application.packageManager.getInstalledPackages(retryFlags)
}
private fun getPackagesViaPackageManager(flags: Int, retryFlags: Int): List<PackageInfo> = try {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
Application.packageManager.getInstalledPackages(
PackageManager.PackageInfoFlags.of(flags.toLong()),
)
} else {
@Suppress("DEPRECATION")
Application.packageManager.getInstalledPackages(flags)
}
} catch (_: RuntimeException) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
Application.packageManager.getInstalledPackages(
PackageManager.PackageInfoFlags.of(retryFlags.toLong()),
)
} else {
@Suppress("DEPRECATION")
Application.packageManager.getInstalledPackages(retryFlags)
}
}
}

34
app/src/minApi23/java/io/nekohasekai/sfa/vendor/ShizukuInstaller.kt vendored
View File

@@ -12,24 +12,20 @@ object ShizukuInstaller {
private const val SHIZUKU_PERMISSION_REQUEST_CODE = 1001
fun isAvailable(): Boolean {
return try {
Shizuku.pingBinder()
} catch (e: Exception) {
false
}
fun isAvailable(): Boolean = try {
Shizuku.pingBinder()
} catch (e: Exception) {
false
}
fun checkPermission(): Boolean {
return try {
if (Shizuku.isPreV11()) {
false
} else {
Shizuku.checkSelfPermission() == PackageManager.PERMISSION_GRANTED
}
} catch (e: Exception) {
fun checkPermission(): Boolean = try {
if (Shizuku.isPreV11()) {
false
} else {
Shizuku.checkSelfPermission() == PackageManager.PERMISSION_GRANTED
}
} catch (e: Exception) {
false
}
fun requestPermission() {
@@ -38,12 +34,10 @@ object ShizukuInstaller {
}
}
private fun isRunningAsRoot(): Boolean {
return try {
Shizuku.getUid() == 0
} catch (e: Exception) {
false
}
private fun isRunningAsRoot(): Boolean = try {
Shizuku.getUid() == 0
} catch (e: Exception) {
false
}
suspend fun install(apkFile: File) = withContext(Dispatchers.IO) {

14
app/src/minApi23/java/io/nekohasekai/sfa/vendor/ShizukuPackageManager.kt vendored
View File

@@ -4,9 +4,9 @@ import android.content.pm.PackageInfo
import android.content.pm.PackageManager
import android.os.Process
import io.nekohasekai.sfa.Application
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import rikka.shizuku.Shizuku
@@ -46,13 +46,11 @@ object ShizukuPackageManager {
refresh()
}
fun isShizukuInstalled(): Boolean {
return try {
Application.packageManager.getPackageInfo(SHIZUKU_PACKAGE, 0)
true
} catch (e: PackageManager.NameNotFoundException) {
false
}
fun isShizukuInstalled(): Boolean = try {
Application.packageManager.getPackageInfo(SHIZUKU_PACKAGE, 0)
true
} catch (e: PackageManager.NameNotFoundException) {
false
}
fun unregisterListeners() {

2
app/src/minApi23/java/io/nekohasekai/sfa/vendor/ShizukuPrivilegedServiceClient.kt vendored
View File

@@ -22,7 +22,7 @@ object ShizukuPrivilegedServiceClient {
private var connection: ServiceConnection? = null
private val args = Shizuku.UserServiceArgs(
ComponentName(Application.application, ShizukuPrivilegedService::class.java)
ComponentName(Application.application, ShizukuPrivilegedService::class.java),
)
.tag("sfa-privileged")
.processNameSuffix("privileged")