mirror
/
meshtastic-android
kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

fix provideLocationCheckbox logic

pull/336/head
andrekir 2022-01-04 10:33:09 -03:00
rodzic 2441e1bada
commit f6914de76e
1 zmienionych plików z 7 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
Wyświetl plik

@ -650,9 +650,9 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
binding.provideLocationCheckbox.isEnabled = isGooglePlayAvailable(requireContext())
binding.provideLocationCheckbox.setOnCheckedChangeListener { view, isChecked ->
if (view.isPressed) { // We want to ignore changes caused by code (as opposed to the user)
if (view.isChecked) {
debug("User changed location tracking to $isChecked")
if (view.isChecked) {
if (view.isPressed) { // We want to ignore changes caused by code (as opposed to the user)
val hasLocationPermission = myActivity.hasLocationPermission()
val hasBackgroundPermission = myActivity.hasBackgroundPermission()
@ -677,9 +677,10 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
model.provideLocation.value = isChecked
model.meshService?.setupProvideLocation()
}
else {
model.meshService?.stopProvideLocation()
}
}
else {
model.provideLocation.value = isChecked
model.meshService?.stopProvideLocation()
}
}
@ -993,7 +994,7 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
scanModel.startScan()
// system permissions might have changed while we were away
binding.provideLocationCheckbox.isChecked = myActivity.hasBackgroundPermission() && (model.provideLocation.value ?: false) && isGooglePlayAvailable(requireContext())
binding.provideLocationCheckbox.isChecked = myActivity.hasLocationPermission() && myActivity.hasBackgroundPermission() && (model.provideLocation.value ?: false) && isGooglePlayAvailable(requireContext())
myActivity.registerReceiver(updateProgressReceiver, updateProgressFilter)