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

Make linter happy

Browse source
This commit is contained in:
世界 2024-03-16 21:34:19 +08:00
parent 78dd252b78
commit 75a35d3c97
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
23 changed files with 53 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/io/nekohasekai/sfa/Application.kt
View file

@ -31,6 +31,7 @@ class Application : Application() {
Seq.setContext(this) Seq.setContext(this)
@Suppress("OPT_IN_USAGE")
GlobalScope.launch(Dispatchers.IO) { GlobalScope.launch(Dispatchers.IO) {
UpdateProfileWork.reconfigureUpdater() UpdateProfileWork.reconfigureUpdater()
} }

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

@ -15,10 +15,10 @@ class AppChangeReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
Log.d(TAG, "onReceive: ${intent.action}") Log.d(TAG, "onReceive: ${intent.action}")
checkUpdate(context, intent) checkUpdate(intent)
} }
private fun checkUpdate(context: Context, intent: Intent) { private fun checkUpdate(intent: Intent) {
if (!Settings.perAppProxyEnabled) { if (!Settings.perAppProxyEnabled) {
Log.d(TAG, "per app proxy disabled") Log.d(TAG, "per app proxy disabled")
return return

2
app/src/main/java/io/nekohasekai/sfa/bg/BootReceiver.kt
View file

@ -4,6 +4,7 @@ import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import io.nekohasekai.sfa.database.Settings import io.nekohasekai.sfa.database.Settings
import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@ -11,6 +12,7 @@ import kotlinx.coroutines.withContext
class BootReceiver : BroadcastReceiver() { class BootReceiver : BroadcastReceiver() {
@OptIn(DelicateCoroutinesApi::class)
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
when (intent.action) { when (intent.action) {
Intent.ACTION_BOOT_COMPLETED, Intent.ACTION_MY_PACKAGE_REPLACED -> { Intent.ACTION_BOOT_COMPLETED, Intent.ACTION_MY_PACKAGE_REPLACED -> {

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

@ -27,6 +27,7 @@ import io.nekohasekai.sfa.constant.Status
import io.nekohasekai.sfa.database.ProfileManager import io.nekohasekai.sfa.database.ProfileManager
import io.nekohasekai.sfa.database.Settings import io.nekohasekai.sfa.database.Settings
import io.nekohasekai.sfa.ktx.hasPermission import io.nekohasekai.sfa.ktx.hasPermission
import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
@ -243,6 +244,7 @@ class BoxService(
} }
} }
@OptIn(DelicateCoroutinesApi::class)
private fun stopService() { private fun stopService() {
if (status.value != Status.Started) return if (status.value != Status.Started) return
status.value = Status.Stopping status.value = Status.Stopping
@ -298,7 +300,9 @@ class BoxService(
} }
} }
fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { @OptIn(DelicateCoroutinesApi::class)
@Suppress("SameReturnValue")
internal fun onStartCommand(): Int {
if (status.value != Status.Stopped) return Service.START_NOT_STICKY if (status.value != Status.Stopped) return Service.START_NOT_STICKY
status.value = Status.Starting status.value = Status.Starting
@ -327,19 +331,19 @@ class BoxService(
return Service.START_NOT_STICKY return Service.START_NOT_STICKY
} }
fun onBind(intent: Intent): IBinder { internal fun onBind(): IBinder {
return binder return binder
} }
fun onDestroy() { internal fun onDestroy() {
binder.close() binder.close()
} }
fun onRevoke() { internal fun onRevoke() {
stopService() stopService()
} }
fun writeLog(message: String) { internal fun writeLog(message: String) {
binder.broadcast { binder.broadcast {
it.onServiceWriteLog(message) it.onServiceWriteLog(message)
} }

3
app/src/main/java/io/nekohasekai/sfa/bg/DefaultNetworkListener.kt
View file

@ -30,8 +30,10 @@ import android.os.Handler
import android.os.Looper import android.os.Looper
import io.nekohasekai.sfa.Application import io.nekohasekai.sfa.Application
import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.CompletableDeferred
import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.ObsoleteCoroutinesApi
import kotlinx.coroutines.channels.actor import kotlinx.coroutines.channels.actor
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
@ -49,6 +51,7 @@ object DefaultNetworkListener {
class Lost(val network: Network) : NetworkMessage() class Lost(val network: Network) : NetworkMessage()
} }
@OptIn(DelicateCoroutinesApi::class, ObsoleteCoroutinesApi::class)
private val networkActor = GlobalScope.actor<NetworkMessage>(Dispatchers.Unconfined) { private val networkActor = GlobalScope.actor<NetworkMessage>(Dispatchers.Unconfined) {
val listeners = mutableMapOf<Any, (Network?) -> Unit>() val listeners = mutableMapOf<Any, (Network?) -> Unit>()
var network: Network? = null var network: Network? = null

1
app/src/main/java/io/nekohasekai/sfa/bg/PlatformInterfaceWrapper.kt
View file

@ -103,6 +103,7 @@ interface PlatformInterfaceWrapper : PlatformInterface {
} }
override fun readWIFIState(): WIFIState? { override fun readWIFIState(): WIFIState? {
@Suppress("DEPRECATION")
val wifiInfo = Application.wifiManager.connectionInfo ?: return null val wifiInfo = Application.wifiManager.connectionInfo ?: return null
var ssid = wifiInfo.ssid var ssid = wifiInfo.ssid
if (ssid.startsWith("\"") && ssid.endsWith("\"")) { if (ssid.startsWith("\"") && ssid.endsWith("\"")) {

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

@ -8,9 +8,9 @@ class ProxyService : Service(), PlatformInterfaceWrapper {
private val service = BoxService(this, this) private val service = BoxService(this, this)
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int) = override fun onStartCommand(intent: Intent?, flags: Int, startId: Int) =
service.onStartCommand(intent, flags, startId) service.onStartCommand()
override fun onBind(intent: Intent) = service.onBind(intent) override fun onBind(intent: Intent) = service.onBind()
override fun onDestroy() = service.onDestroy() override fun onDestroy() = service.onDestroy()
override fun writeLog(message: String) = service.writeLog(message) override fun writeLog(message: String) = service.writeLog(message)

2
app/src/main/java/io/nekohasekai/sfa/bg/ServiceBinder.kt
View file

@ -5,6 +5,7 @@ import androidx.lifecycle.MutableLiveData
import io.nekohasekai.sfa.aidl.IService import io.nekohasekai.sfa.aidl.IService
import io.nekohasekai.sfa.aidl.IServiceCallback import io.nekohasekai.sfa.aidl.IServiceCallback
import io.nekohasekai.sfa.constant.Status import io.nekohasekai.sfa.constant.Status
import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@ -23,6 +24,7 @@ class ServiceBinder(private val status: MutableLiveData<Status>) : IService.Stub
} }
} }
@OptIn(DelicateCoroutinesApi::class)
fun broadcast(work: (IServiceCallback) -> Unit) { fun broadcast(work: (IServiceCallback) -> Unit) {
GlobalScope.launch(Dispatchers.Main) { GlobalScope.launch(Dispatchers.Main) {
broadcastLock.withLock { broadcastLock.withLock {

2
app/src/main/java/io/nekohasekai/sfa/bg/ServiceNotification.kt
View file

@ -22,6 +22,7 @@ import io.nekohasekai.sfa.constant.Status
import io.nekohasekai.sfa.database.Settings import io.nekohasekai.sfa.database.Settings
import io.nekohasekai.sfa.ui.MainActivity import io.nekohasekai.sfa.ui.MainActivity
import io.nekohasekai.sfa.utils.CommandClient import io.nekohasekai.sfa.utils.CommandClient
import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
@ -43,6 +44,7 @@ class ServiceNotification(
} }
} }
@OptIn(DelicateCoroutinesApi::class)
private val commandClient = private val commandClient =
CommandClient(GlobalScope, CommandClient.ConnectionType.Status, this) CommandClient(GlobalScope, CommandClient.ConnectionType.Status, this)
private var receiverRegistered = false private var receiverRegistered = false

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

@ -22,14 +22,14 @@ class VPNService : VpnService(), PlatformInterfaceWrapper {
private val service = BoxService(this, this) private val service = BoxService(this, this)
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int) = override fun onStartCommand(intent: Intent?, flags: Int, startId: Int) =
service.onStartCommand(intent, flags, startId) service.onStartCommand()
override fun onBind(intent: Intent): IBinder { override fun onBind(intent: Intent): IBinder {
val binder = super.onBind(intent) val binder = super.onBind(intent)
if (binder != null) { if (binder != null) {
return binder return binder
} }
return service.onBind(intent) return service.onBind()
} }
override fun onDestroy() { override fun onDestroy() {

2
app/src/main/java/io/nekohasekai/sfa/database/ProfileManager.kt
View file

@ -3,6 +3,7 @@ package io.nekohasekai.sfa.database
import androidx.room.Room import androidx.room.Room
import io.nekohasekai.sfa.Application import io.nekohasekai.sfa.Application
import io.nekohasekai.sfa.constant.Path import io.nekohasekai.sfa.constant.Path
import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@ -19,6 +20,7 @@ object ProfileManager {
callbacks.remove(callback) callbacks.remove(callback)
} }
@OptIn(DelicateCoroutinesApi::class)
private val instance by lazy { private val instance by lazy {
Application.application.getDatabasePath(Path.PROFILES_DATABASE_PATH).parentFile?.mkdirs() Application.application.getDatabasePath(Path.PROFILES_DATABASE_PATH).parentFile?.mkdirs()
Room Room

2
app/src/main/java/io/nekohasekai/sfa/database/Settings.kt
View file

@ -14,6 +14,7 @@ import io.nekohasekai.sfa.ktx.int
import io.nekohasekai.sfa.ktx.long import io.nekohasekai.sfa.ktx.long
import io.nekohasekai.sfa.ktx.string import io.nekohasekai.sfa.ktx.string
import io.nekohasekai.sfa.ktx.stringSet import io.nekohasekai.sfa.ktx.stringSet
import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.json.JSONObject import org.json.JSONObject
@ -21,6 +22,7 @@ import java.io.File
object Settings { object Settings {
@OptIn(DelicateCoroutinesApi::class)
private val instance by lazy { private val instance by lazy {
Application.application.getDatabasePath(Path.SETTINGS_DATABASE_PATH).parentFile?.mkdirs() Application.application.getDatabasePath(Path.SETTINGS_DATABASE_PATH).parentFile?.mkdirs()
Room.databaseBuilder( Room.databaseBuilder(

2
app/src/main/java/io/nekohasekai/sfa/ktx/Shares.kt
View file

@ -52,7 +52,7 @@ suspend fun Context.shareProfile(profile: Profile) {
} }
} }
suspend fun FragmentActivity.shareProfileURL(profile: Profile) { fun FragmentActivity.shareProfileURL(profile: Profile) {
val link = Libbox.generateRemoteProfileImportLink( val link = Libbox.generateRemoteProfileImportLink(
profile.name, profile.name,
profile.typed.remoteURL profile.typed.remoteURL

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

@ -103,12 +103,12 @@ class MainActivity : AbstractActivity<ActivityMainBinding>(),
return navController.navigateUp(appBarConfiguration) return navController.navigateUp(appBarConfiguration)
} }
@Suppress("UNUSED_PARAMETER")
private fun onDestinationChanged( private fun onDestinationChanged(
navController: NavController, navController: NavController,
navDestination: NavDestination, navDestination: NavDestination,
bundle: Bundle? bundle: Bundle?
) { ) {
val binding = binding ?: return
val destinationId = navDestination.id val destinationId = navDestination.id
binding.dashboardTabContainer.isVisible = destinationId == R.id.navigation_dashboard binding.dashboardTabContainer.isVisible = destinationId == R.id.navigation_dashboard
} }

4
app/src/main/java/io/nekohasekai/sfa/ui/dashboard/GroupsFragment.kt
View file

@ -29,6 +29,7 @@ import io.nekohasekai.sfa.ktx.errorDialogBuilder
import io.nekohasekai.sfa.ktx.text import io.nekohasekai.sfa.ktx.text
import io.nekohasekai.sfa.ui.MainActivity import io.nekohasekai.sfa.ui.MainActivity
import io.nekohasekai.sfa.utils.CommandClient import io.nekohasekai.sfa.utils.CommandClient
import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@ -152,6 +153,7 @@ class GroupsFragment : Fragment(), CommandClient.Handler {
private lateinit var adapter: ItemAdapter private lateinit var adapter: ItemAdapter
private lateinit var textWatcher: TextWatcher private lateinit var textWatcher: TextWatcher
@OptIn(DelicateCoroutinesApi::class)
@SuppressLint("NotifyDataSetChanged") @SuppressLint("NotifyDataSetChanged")
fun bind(group: OutboundGroup) { fun bind(group: OutboundGroup) {
this.group = group this.group = group
@ -185,6 +187,7 @@ class GroupsFragment : Fragment(), CommandClient.Handler {
updateExpand() updateExpand()
} }
@OptIn(DelicateCoroutinesApi::class)
private fun updateExpand(isExpand: Boolean? = null) { private fun updateExpand(isExpand: Boolean? = null) {
val newExpandStatus = isExpand ?: group.isExpand val newExpandStatus = isExpand ?: group.isExpand
if (isExpand != null) { if (isExpand != null) {
@ -280,6 +283,7 @@ class GroupsFragment : Fragment(), CommandClient.Handler {
private class ItemGroupView(val binding: ViewDashboardGroupItemBinding) : private class ItemGroupView(val binding: ViewDashboardGroupItemBinding) :
RecyclerView.ViewHolder(binding.root) { RecyclerView.ViewHolder(binding.root) {
@OptIn(DelicateCoroutinesApi::class)
fun bind(groupView: GroupView, group: OutboundGroup, item: OutboundGroupItem) { fun bind(groupView: GroupView, group: OutboundGroup, item: OutboundGroupItem) {
if (group.selectable) { if (group.selectable) {
binding.itemCard.setOnClickListener { binding.itemCard.setOnClickListener {

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

@ -28,6 +28,7 @@ import io.nekohasekai.sfa.ktx.getAttrColor
import io.nekohasekai.sfa.ui.MainActivity import io.nekohasekai.sfa.ui.MainActivity
import io.nekohasekai.sfa.utils.CommandClient import io.nekohasekai.sfa.utils.CommandClient
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
@ -224,6 +225,7 @@ class OverviewFragment : Fragment() {
private inner class ClashModeItemView(val binding: ViewClashModeButtonBinding) : private inner class ClashModeItemView(val binding: ViewClashModeButtonBinding) :
RecyclerView.ViewHolder(binding.root) { RecyclerView.ViewHolder(binding.root) {
@OptIn(DelicateCoroutinesApi::class)
fun bind(item: String, selected: String) { fun bind(item: String, selected: String) {
binding.clashModeButtonText.text = item binding.clashModeButtonText.text = item
if (item != selected) { if (item != selected) {

1
app/src/main/java/io/nekohasekai/sfa/ui/debug/VPNScanActivity.kt
View file

@ -114,7 +114,6 @@ class VPNScanActivity : AbstractActivity<ActivityVpnScanBinding>() {
private suspend fun scanVPN() { private suspend fun scanVPN() {
val adapter = adapter ?: return val adapter = adapter ?: return
val binding = binding ?: return
val flag = val flag =
PackageManager.GET_SERVICES or if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { PackageManager.GET_SERVICES or if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
PackageManager.MATCH_UNINSTALLED_PACKAGES PackageManager.MATCH_UNINSTALLED_PACKAGES

8
app/src/main/java/io/nekohasekai/sfa/ui/main/ConfigurationFragment.kt
View file

@ -9,7 +9,6 @@ import android.view.ViewGroup
import androidx.appcompat.widget.PopupMenu import androidx.appcompat.widget.PopupMenu
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.ItemTouchHelper
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
@ -29,10 +28,12 @@ import io.nekohasekai.sfa.ui.MainActivity
import io.nekohasekai.sfa.ui.profile.EditProfileActivity import io.nekohasekai.sfa.ui.profile.EditProfileActivity
import io.nekohasekai.sfa.ui.profile.NewProfileActivity import io.nekohasekai.sfa.ui.profile.NewProfileActivity
import io.nekohasekai.sfa.ui.profile.QRScanActivity import io.nekohasekai.sfa.ui.profile.QRScanActivity
import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import java.text.DateFormat
import java.util.Collections import java.util.Collections
class ConfigurationFragment : Fragment() { class ConfigurationFragment : Fragment() {
@ -126,7 +127,7 @@ class ConfigurationFragment : Fragment() {
internal var items: MutableList<Profile> = mutableListOf() internal var items: MutableList<Profile> = mutableListOf()
internal val scope = lifecycleScope internal val scope = lifecycleScope
internal val fragmentActivity = requireActivity() as FragmentActivity internal val fragmentActivity = requireActivity()
@SuppressLint("NotifyDataSetChanged") @SuppressLint("NotifyDataSetChanged")
internal fun reload() { internal fun reload() {
@ -160,6 +161,7 @@ class ConfigurationFragment : Fragment() {
return true return true
} }
@OptIn(DelicateCoroutinesApi::class)
internal fun updateUserOrder() { internal fun updateUserOrder() {
items.forEachIndexed { index, profile -> items.forEachIndexed { index, profile ->
profile.userOrder = index.toLong() profile.userOrder = index.toLong()
@ -199,7 +201,7 @@ class ConfigurationFragment : Fragment() {
binding.profileLastUpdated.isVisible = true binding.profileLastUpdated.isVisible = true
binding.profileLastUpdated.text = binding.root.context.getString( binding.profileLastUpdated.text = binding.root.context.getString(
R.string.profile_item_last_updated, R.string.profile_item_last_updated,
profile.typed.lastUpdated.toLocaleString() DateFormat.getDateTimeInstance().format(profile.typed.lastUpdated)
) )
} else { } else {
binding.profileLastUpdated.isVisible = false binding.profileLastUpdated.isVisible = false

8
app/src/main/java/io/nekohasekai/sfa/ui/main/DashboardFragment.kt
View file

@ -100,14 +100,14 @@ class DashboardFragment : Fragment(R.layout.fragment_dashboard) {
private fun enablePager() { private fun enablePager() {
val activity = activity ?: return val activity = activity ?: return
val binding = binding ?: return val binding = binding ?: return
activity.binding?.dashboardTabLayout?.isVisible = true activity.binding.dashboardTabLayout.isVisible = true
binding.dashboardPager.isUserInputEnabled = true binding.dashboardPager.isUserInputEnabled = true
} }
private fun disablePager() { private fun disablePager() {
val activity = activity ?: return val activity = activity ?: return
val binding = binding ?: return val binding = binding ?: return
activity.binding?.dashboardTabLayout?.isVisible = false activity.binding.dashboardTabLayout.isVisible = false
binding.dashboardPager.isUserInputEnabled = false binding.dashboardPager.isUserInputEnabled = false
binding.dashboardPager.setCurrentItem(0, false) binding.dashboardPager.setCurrentItem(0, false)
} }
@ -119,11 +119,11 @@ class DashboardFragment : Fragment(R.layout.fragment_dashboard) {
class Adapter(parent: Fragment) : FragmentStateAdapter(parent) { class Adapter(parent: Fragment) : FragmentStateAdapter(parent) {
override fun getItemCount(): Int { override fun getItemCount(): Int {
return Page.values().size return Page.entries.size
} }
override fun createFragment(position: Int): Fragment { override fun createFragment(position: Int): Fragment {
return Page.values()[position].fragmentClass.newInstance() return Page.entries[position].fragmentClass.getConstructor().newInstance()
} }
} }

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

@ -110,7 +110,6 @@ class EditProfileActivity : AbstractActivity<ActivityEditProfileBinding>() {
} }
private fun updateAutoUpdate(newValue: String) { private fun updateAutoUpdate(newValue: String) {
val binding = binding ?: return
val boolValue = EnabledType.valueOf(newValue).boolValue val boolValue = EnabledType.valueOf(newValue).boolValue
if (profile.typed.autoUpdate == boolValue) { if (profile.typed.autoUpdate == boolValue) {
return return
@ -126,7 +125,6 @@ class EditProfileActivity : AbstractActivity<ActivityEditProfileBinding>() {
} }
private fun updateAutoUpdateInterval(newValue: String) { private fun updateAutoUpdateInterval(newValue: String) {
val binding = binding ?: return
if (newValue.isBlank()) { if (newValue.isBlank()) {
binding.autoUpdateInterval.error = getString(R.string.profile_input_required) binding.autoUpdateInterval.error = getString(R.string.profile_input_required)
return return
@ -148,7 +146,6 @@ class EditProfileActivity : AbstractActivity<ActivityEditProfileBinding>() {
} }
private fun updateProfile() { private fun updateProfile() {
val binding = binding ?: return
binding.progressView.isVisible = true binding.progressView.isVisible = true
lifecycleScope.launch(Dispatchers.IO) { lifecycleScope.launch(Dispatchers.IO) {
delay(200L) delay(200L)
@ -165,8 +162,8 @@ class EditProfileActivity : AbstractActivity<ActivityEditProfileBinding>() {
} }
} }
@Suppress("UNUSED_PARAMETER")
private fun updateProfile(view: View) { private fun updateProfile(view: View) {
val binding = binding ?: return
binding.progressView.isVisible = true binding.progressView.isVisible = true
lifecycleScope.launch(Dispatchers.IO) { lifecycleScope.launch(Dispatchers.IO) {
try { try {

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

@ -52,7 +52,6 @@ class EditProfileContentActivity : AbstractActivity<ActivityEditProfileContentBi
} }
override fun onOptionsItemSelected(item: MenuItem): Boolean { override fun onOptionsItemSelected(item: MenuItem): Boolean {
val binding = binding ?: return false
when (item.itemId) { when (item.itemId) {
R.id.action_undo -> { R.id.action_undo -> {
if (binding.editor.canUndo()) binding.editor.undo() if (binding.editor.canUndo()) binding.editor.undo()
@ -104,7 +103,6 @@ class EditProfileContentActivity : AbstractActivity<ActivityEditProfileContentBi
} }
private suspend fun loadConfiguration0() { private suspend fun loadConfiguration0() {
val binding = binding ?: return
delay(200L) delay(200L)
val profileId = intent.getLongExtra("profile_id", -1L) val profileId = intent.getLongExtra("profile_id", -1L)

6
app/src/main/java/io/nekohasekai/sfa/ui/profile/NewProfileActivity.kt
View file

@ -36,7 +36,6 @@ class NewProfileActivity : AbstractActivity<ActivityAddProfileBinding>() {
private val importFile = private val importFile =
registerForActivityResult(ActivityResultContracts.GetContent()) { fileURI -> registerForActivityResult(ActivityResultContracts.GetContent()) { fileURI ->
val binding = binding ?: return@registerForActivityResult
if (fileURI != null) { if (fileURI != null) {
binding.sourceURL.editText?.setText(fileURI.toString()) binding.sourceURL.editText?.setText(fileURI.toString())
} }
@ -95,8 +94,7 @@ class NewProfileActivity : AbstractActivity<ActivityAddProfileBinding>() {
binding.autoUpdateInterval.addTextChangedListener(this::updateAutoUpdateInterval) binding.autoUpdateInterval.addTextChangedListener(this::updateAutoUpdateInterval)
} }
private fun createProfile(view: View) { private fun createProfile(@Suppress("UNUSED_PARAMETER") view: View) {
val binding = binding ?: return
if (binding.name.showErrorIfEmpty()) { if (binding.name.showErrorIfEmpty()) {
return return
} }
@ -131,7 +129,6 @@ class NewProfileActivity : AbstractActivity<ActivityAddProfileBinding>() {
} }
private suspend fun createProfile0() { private suspend fun createProfile0() {
val binding = binding ?: return
val typedProfile = TypedProfile() val typedProfile = TypedProfile()
val profile = Profile(name = binding.name.text, typed = typedProfile) val profile = Profile(name = binding.name.text, typed = typedProfile)
profile.userOrder = ProfileManager.nextOrder() profile.userOrder = ProfileManager.nextOrder()
@ -190,7 +187,6 @@ class NewProfileActivity : AbstractActivity<ActivityAddProfileBinding>() {
} }
private fun updateAutoUpdateInterval(newValue: String) { private fun updateAutoUpdateInterval(newValue: String) {
val binding = binding ?: return
if (newValue.isBlank()) { if (newValue.isBlank()) {
binding.autoUpdateInterval.error = getString(R.string.profile_input_required) binding.autoUpdateInterval.error = getString(R.string.profile_input_required)
return return

6
app/src/main/java/io/nekohasekai/sfa/ui/profileoverride/PerAppProxyActivity.kt
View file

@ -112,7 +112,8 @@ class PerAppProxyActivity : AbstractActivity<ActivityPerAppProxyBinding>() {
val packageManagerFlags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { val packageManagerFlags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
PackageManager.GET_PERMISSIONS or PackageManager.MATCH_UNINSTALLED_PACKAGES PackageManager.GET_PERMISSIONS or PackageManager.MATCH_UNINSTALLED_PACKAGES
} else { } else {
@Suppress("DEPRECATION") PackageManager.GET_PERMISSIONS or PackageManager.GET_UNINSTALLED_PACKAGES @Suppress("DEPRECATION")
PackageManager.GET_PERMISSIONS or PackageManager.GET_UNINSTALLED_PACKAGES
} }
val installedPackages = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { val installedPackages = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
packageManager.getInstalledPackages( packageManager.getInstalledPackages(
@ -669,7 +670,8 @@ class PerAppProxyActivity : AbstractActivity<ActivityPerAppProxyBinding>() {
val packageManagerFlags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { val packageManagerFlags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
PackageManager.MATCH_UNINSTALLED_PACKAGES or PackageManager.GET_ACTIVITIES or PackageManager.GET_SERVICES or PackageManager.GET_RECEIVERS or PackageManager.GET_PROVIDERS PackageManager.MATCH_UNINSTALLED_PACKAGES or PackageManager.GET_ACTIVITIES or PackageManager.GET_SERVICES or PackageManager.GET_RECEIVERS or PackageManager.GET_PROVIDERS
} else { } else {
@Suppress("DEPRECATION") PackageManager.GET_UNINSTALLED_PACKAGES or PackageManager.GET_ACTIVITIES or PackageManager.GET_SERVICES or PackageManager.GET_RECEIVERS or PackageManager.GET_PROVIDERS @Suppress("DEPRECATION")
PackageManager.GET_UNINSTALLED_PACKAGES or PackageManager.GET_ACTIVITIES or PackageManager.GET_SERVICES or PackageManager.GET_RECEIVERS or PackageManager.GET_PROVIDERS
} }
if (packageName.matches(chinaAppRegex)) { if (packageName.matches(chinaAppRegex)) {
Log.d("PerAppProxyActivity", "Match package name: $packageName") Log.d("PerAppProxyActivity", "Match package name: $packageName")