meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix: Update isUnmessageable based on userInput.role for older firmware (#1990)

Browse source
This commit is contained in:
James Rich 2025-05-31 10:21:22 -05:00 • committed by GitHub
parent 72900a7909
commit 569b2767b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/geeksville/mesh/ui/radioconfig/components/UserConfigItemList.kt
View file

@ -40,6 +40,7 @@ import com.geeksville.mesh.R
import com.geeksville.mesh.copy import com.geeksville.mesh.copy
import com.geeksville.mesh.deviceMetadata import com.geeksville.mesh.deviceMetadata
import com.geeksville.mesh.model.DeviceVersion import com.geeksville.mesh.model.DeviceVersion
import com.geeksville.mesh.model.isUnmessageableRole
import com.geeksville.mesh.ui.common.components.EditTextPreference import com.geeksville.mesh.ui.common.components.EditTextPreference
import com.geeksville.mesh.ui.common.components.PreferenceCategory import com.geeksville.mesh.ui.common.components.PreferenceCategory
import com.geeksville.mesh.ui.common.components.PreferenceFooter import com.geeksville.mesh.ui.common.components.PreferenceFooter
@ -140,8 +141,11 @@ fun UserConfigItemList(
SwitchPreference( SwitchPreference(
title = stringResource(R.string.unmessageable), title = stringResource(R.string.unmessageable),
summary = stringResource(R.string.unmonitored_or_infrastructure), summary = stringResource(R.string.unmonitored_or_infrastructure),
checked = userInput.isUnmessagable, checked = userInput.isUnmessagable || (
enabled = firmwareVersion >= DeviceVersion("2.6.8"), firmwareVersion < DeviceVersion("2.6.9") &&
userInput.role.isUnmessageableRole()
),
enabled = userInput.hasIsUnmessagable(),
onCheckedChange = { userInput = userInput.copy { isUnmessagable = it } } onCheckedChange = { userInput = userInput.copy { isUnmessagable = it } }
) )
} }