Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Removed deprecated permission request handler
Arty Bishop7be9965352d9
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/PrefsFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/PrefsFragment.ktindex 242793fb..4e351346 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/PrefsFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/PrefsFragment.kt@@ -24,6 +24,7 @@ import android.content.pm.PackageManagerimport android.location.LocationManagerimport android.os.Bundleimport android.view.View+import androidx.activity.result.contract.ActivityResultContractsimport androidx.core.content.ContextCompatimport androidx.preference.Preferenceimport androidx.preference.PreferenceFragmentCompat@@ -38,9 +39,6 @@ import javax.inject.Inject@AndroidEntryPointclass PrefsFragment : PreferenceFragmentCompat() {- private val locPermReqCode = 1000- private val locPermString = Manifest.permission.ACCESS_FINE_LOCATION-@Injectlateinit var locationManager: LocationManager@@ -50,6 +48,15 @@ class PrefsFragment : PreferenceFragmentCompat() {@Injectlateinit var qthConverter: QthConverter+ private val requestPermissionLauncher =+ registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->+ if (isGranted) {+ setPositionFromGPS()+ } else {+ showSnack(getString(R.string.pref_pos_gps_error))+ }+ }+override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {setPreferencesFromResource(R.xml.preference, rootKey)}@@ -84,6 +91,7 @@ class PrefsFragment : PreferenceFragmentCompat() {}private fun setPositionFromGPS() {+ val locPermString = Manifest.permission.ACCESS_FINE_LOCATIONval locPermResult = ContextCompat.checkSelfPermission(requireContext(), locPermString)if (locPermResult == PackageManager.PERMISSION_GRANTED) {val location = locationManager.getLastKnownLocation(LocationManager.PASSIVE_PROVIDER)@@ -94,7 +102,7 @@ class PrefsFragment : PreferenceFragmentCompat() {prefsManager.setStationPosition(latitude, longitude, altitude)showSnack(getString(R.string.pref_pos_success))} else showSnack(getString(R.string.pref_pos_gps_null))- } else requestPermissions(arrayOf(locPermString), locPermReqCode)+ } else requestPermissionLauncher.launch(locPermString)}private fun showSnack(message: String) {@@ -102,12 +110,4 @@ class PrefsFragment : PreferenceFragmentCompat() {.setAnchorView(R.id.nav_bottom).show()}-- override fun onRequestPermissionsResult(code: Int, perms: Array<out String>, result: IntArray) {- if (code == locPermReqCode) {- if (result.isNotEmpty() && result[0] == PackageManager.PERMISSION_GRANTED) {- setPositionFromGPS()- } else showSnack(getString(R.string.pref_pos_gps_error))- }- }}