mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-05-07 14:16:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #395 from meshtastic/refactor-protos

Browse Source 
use locationShareDisabled boolean
This commit is contained in:
Andre Kirchhoff
2022-03-26 17:20:01 -03:00
committed by GitHub
parent 5273b0e8c2 291e54c275
commit 6fec76157c
4 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/com/geeksville/mesh/model/UIState.kt
View File

@@ -132,22 +132,13 @@ class UIViewModel @Inject constructor(
}
}
var locationShare: Boolean?
get() {
return radioConfig.value?.preferences?.locationShare == RadioConfigProtos.LocationSharing.LocEnabled
|| radioConfig.value?.preferences?.locationShare == RadioConfigProtos.LocationSharing.LocUnset
}
set(value) {
var locationShareDisabled: Boolean
get() = radioConfig.value?.preferences?.locationShareDisabled ?: false
set(value) {
val config = radioConfig.value
if (value != null && config != null) {
if (config != null) {
val builder = config.toBuilder()
if (value == true) {
builder.preferencesBuilder.locationShare =
RadioConfigProtos.LocationSharing.LocUnset
} else {
builder.preferencesBuilder.locationShare =
RadioConfigProtos.LocationSharing.LocDisabled
}
builder.preferencesBuilder.locationShareDisabled = value
setRadioConfig(builder.build())
}
}

2
app/src/main/java/com/geeksville/mesh/service/MeshService.kt
View File

@@ -1017,7 +1017,7 @@ class MeshService : Service(), Logging {
else
broadcastSecs * 1000L
if (prefs.locationShare == RadioConfigProtos.LocationSharing.LocDisabled) {
if (prefs.locationShareDisabled) {
info("GPS location sharing is disabled")
desiredInterval = 0
}

16
app/src/main/java/com/geeksville/mesh/ui/AdvancedSettingsFragment.kt
View File

@@ -37,24 +37,24 @@ class AdvancedSettingsFragment : ScreenFragment("Advanced Settings"), Logging {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
model.radioConfig.observe(viewLifecycleOwner, {
model.radioConfig.observe(viewLifecycleOwner) {
binding.positionBroadcastPeriodEditText.setText(model.positionBroadcastSecs.toString())
binding.lsSleepEditText.setText(model.lsSleepSecs.toString())
binding.positionBroadcastPeriodView.isEnabled = model.locationShare ?: true
binding.positionBroadcastSwitch.isChecked = model.locationShare ?: true
binding.positionBroadcastPeriodView.isEnabled = !model.locationShareDisabled
binding.positionBroadcastSwitch.isChecked = !model.locationShareDisabled
binding.lsSleepView.isEnabled = model.isPowerSaving ?: false
binding.lsSleepSwitch.isChecked = model.isPowerSaving ?: false
binding.isAlwaysPoweredSwitch.isChecked = model.isAlwaysPowered ?: false
})
}
model.isConnected.observe(viewLifecycleOwner, { connectionState ->
model.isConnected.observe(viewLifecycleOwner) { connectionState ->
val connected = connectionState == MeshService.ConnectionState.CONNECTED
binding.positionBroadcastPeriodView.isEnabled = connected && model.locationShare ?: true
binding.positionBroadcastPeriodView.isEnabled = connected && !model.locationShareDisabled
binding.lsSleepView.isEnabled = connected && model.isPowerSaving ?: false
binding.positionBroadcastSwitch.isEnabled = connected
binding.lsSleepSwitch.isEnabled = connected
binding.isAlwaysPoweredSwitch.isEnabled = connected
})
}
binding.positionBroadcastPeriodEditText.on(EditorInfo.IME_ACTION_DONE) {
val textEdit = binding.positionBroadcastPeriodEditText
@@ -83,7 +83,7 @@ class AdvancedSettingsFragment : ScreenFragment("Advanced Settings"), Logging {
binding.positionBroadcastSwitch.setOnCheckedChangeListener { view, isChecked ->
if (view.isPressed) {
model.locationShare = isChecked
model.locationShareDisabled = !isChecked
debug("User changed locationShare to $isChecked")
}
}

4
app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
View File

@@ -656,8 +656,8 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
model.radioConfig.observe(viewLifecycleOwner) {
binding.provideLocationCheckbox.isEnabled =
isGooglePlayAvailable(requireContext()) && model.locationShare ?: true
if (model.locationShare == false) {
isGooglePlayAvailable(requireContext()) && !model.locationShareDisabled
if (model.locationShareDisabled) {
model.provideLocation.value = false
binding.provideLocationCheckbox.isChecked = false
}