averello/kdeconnect-android-mirror
1
0
Fork 0
mirror of https://invent.kde.org/network/kdeconnect-android.git synced 2025-12-12 20:35:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Settings: Replace startActivityForResult with registerForActivityResult

Browse Source 
We have to do this everywhere eventually, since startActivityForResult and
onActivityResult are deprecated.
This commit is contained in:
Albert Vaca Cintora
2025-12-07 21:32:16 +01:00
parent 6a812e087c
commit 52e73ae476
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/org/kde/kdeconnect/UserInterface/SettingsFragment.kt
View File

@@ -22,6 +22,7 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.EditText import android.widget.EditText
import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.contract.ActivityResultContracts
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.preference.EditTextPreference import androidx.preference.EditTextPreference
import androidx.preference.ListPreference import androidx.preference.ListPreference
@@ -168,21 +169,26 @@ class SettingsFragment : PreferenceFragmentCompat() {
} }
} }
val activityLauncherWithDevicesByIpRefresh = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
updateDevicesByIpSummary()
}
private fun trustedNetworkPref(context: Context) = Preference(context).apply { private fun trustedNetworkPref(context: Context) = Preference(context).apply {
isPersistent = false isPersistent = false
setTitle(R.string.trusted_networks) setTitle(R.string.trusted_networks)
setSummary(R.string.trusted_networks_desc) setSummary(R.string.trusted_networks_desc)
onPreferenceClickListener = Preference.OnPreferenceClickListener { onPreferenceClickListener = Preference.OnPreferenceClickListener {
startActivityForResult(Intent(context, TrustedNetworksActivity::class.java), REQUEST_REFRESH_NETWORKS) activityLauncherWithNetworkRefresh.launch(Intent(context, TrustedNetworksActivity::class.java))
true true
} }
} }
private val REQUEST_REFRESH_DEVICES_BY_IP = 1
private val REQUEST_REFRESH_NETWORKS = 2
private lateinit var devicesByIpPref : Preference private lateinit var devicesByIpPref : Preference
val activityLauncherWithNetworkRefresh = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
BackgroundService.instance?.onNetworkChange(null)
}
/** Opens activity to configure device by IP when clicked */ /** Opens activity to configure device by IP when clicked */
private fun devicesByIpPref(context: Context) = Preference(context).apply { private fun devicesByIpPref(context: Context) = Preference(context).apply {
devicesByIpPref = this devicesByIpPref = this
@@ -190,19 +196,11 @@ class SettingsFragment : PreferenceFragmentCompat() {
setTitle(R.string.custom_device_list) setTitle(R.string.custom_device_list)
updateDevicesByIpSummary() updateDevicesByIpSummary()
onPreferenceClickListener = Preference.OnPreferenceClickListener { onPreferenceClickListener = Preference.OnPreferenceClickListener {
startActivityForResult(Intent(context, CustomDevicesActivity::class.java), REQUEST_REFRESH_DEVICES_BY_IP) activityLauncherWithDevicesByIpRefresh.launch(Intent(context, CustomDevicesActivity::class.java))
true true
} }
} }
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
when (requestCode) {
REQUEST_REFRESH_DEVICES_BY_IP -> updateDevicesByIpSummary()
REQUEST_REFRESH_NETWORKS -> BackgroundService.instance?.onNetworkChange(null)
else -> super.onActivityResult(requestCode, resultCode, data)
}
}
private fun updateDevicesByIpSummary() { private fun updateDevicesByIpSummary() {
devicesByIpPref.setSummary(getString( devicesByIpPref.setSummary(getString(
R.string.custom_devices_settings_summary, R.string.custom_devices_settings_summary,