Skip to content

fix(canned-messages): stop showing/writing deprecated enabled field (#2021) #2112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bruschill wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(canned-messages): stop showing/writing deprecated enabled field (#2021) #2112

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6ce496
fix(canned-messages): stop showing/writing deprecated enabled field (…
bruschill Jul 18, 2026
18a83af
docs(canned-messages): clarify deprecated enabled persistence contract
bruschill Jul 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Meshtastic/Model/ConfigModels.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ final class BluetoothConfigEntity {

@Model
final class CannedMessageConfigEntity {
/// Deprecated (no successor, removed from active use — #2021). Retained to
/// preserve the SwiftData schema; no longer surfaced, written, or persisted.
var enabled: Bool = false
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
var inputbrokerEventCcw: Int32 = 0
var inputbrokerEventCw: Int32 = 0
Expand Down
2 changes: 1 addition & 1 deletion Meshtastic/Persistence/CoreDataMigrationService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ private extension CoreDataMigrationService {
nodeMap: nodeMap
) { obj -> CannedMessageConfigEntity in
let sd = CannedMessageConfigEntity()
sd.enabled = (obj.value(forKey: "enabled") as? Bool) ?? false
// enabled is deprecated (no successor) and no longer persisted — not migrated. (#2021)
sd.inputbrokerEventCcw = (obj.value(forKey: "inputbrokerEventCcw") as? Int32) ?? 0
sd.inputbrokerEventCw = (obj.value(forKey: "inputbrokerEventCw") as? Int32) ?? 0
sd.inputbrokerEventPress = (obj.value(forKey: "inputbrokerEventPress") as? Int32) ?? 0
Expand Down
5 changes: 3 additions & 2 deletions Meshtastic/Persistence/UpdateSwiftData.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1251,7 +1251,8 @@ extension MeshPackets {
if fetchedNode[0].cannedMessageConfig == nil {
let newCannedMessageConfig = CannedMessageConfigEntity()
modelContext.insert(newCannedMessageConfig)
newCannedMessageConfig.enabled = config.enabled
// config.enabled is deprecated (no successor, removed from active use);
// tolerated on read but intentionally not persisted. (#2021)
newCannedMessageConfig.sendBell = config.sendBell
newCannedMessageConfig.rotary1Enabled = config.rotary1Enabled
newCannedMessageConfig.updown1Enabled = config.updown1Enabled
Expand All @@ -1263,7 +1264,7 @@ extension MeshPackets {
newCannedMessageConfig.inputbrokerEventPress = Int32(config.inputbrokerEventPress.rawValue)
fetchedNode[0].cannedMessageConfig = newCannedMessageConfig
} else {
fetchedNode[0].cannedMessageConfig?.enabled = config.enabled
// config.enabled is deprecated (see above); not persisted. (#2021)
fetchedNode[0].cannedMessageConfig?.sendBell = config.sendBell
fetchedNode[0].cannedMessageConfig?.rotary1Enabled = config.rotary1Enabled
fetchedNode[0].cannedMessageConfig?.updown1Enabled = config.updown1Enabled
Expand Down
14 changes: 2 additions & 12 deletions Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ struct CannedMessagesConfig: View {
@State var hasChanges = false
@State var hasMessagesChanges = false
@State var configPreset = 0
@State var enabled = false
/// CannedMessageModule will sends a bell character with the messages.
@State var sendBell: Bool = false
/// Enable the rotary encoder #1. This is a 'dumb' encoder sending pulses on both A and B pins while rotating.
Expand All @@ -43,12 +42,6 @@ struct CannedMessagesConfig: View {

Section(header: Text("Options")) {

Toggle(isOn: $enabled) {

Label("Enabled", systemImage: "list.bullet.rectangle.fill")
}
.tint(.accentColor)

Toggle(isOn: $sendBell) {

Label("Send Bell", systemImage: "bell")
Expand Down Expand Up @@ -184,7 +177,8 @@ struct CannedMessagesConfig: View {
dismiss: goBack
) { fromUser, toUser in
var cmc = ModuleConfig.CannedMessageConfig()
cmc.enabled = enabled
// enabled is deprecated with no successor and removed from active
// use — intentionally not written. (#2021)
cmc.sendBell = sendBell
cmc.rotary1Enabled = rotary1Enabled
cmc.updown1Enabled = updown1Enabled
Expand Down Expand Up @@ -265,9 +259,6 @@ struct CannedMessagesConfig: View {

hasChanges = true
}
.onChange(of: enabled) { _, newEnabled in
if newEnabled != node?.cannedMessageConfig?.enabled { hasChanges = true }
}
.onChange(of: sendBell) { _, newSendBell in
if newSendBell != node?.cannedMessageConfig?.sendBell { hasChanges = true }
}
Expand Down Expand Up @@ -297,7 +288,6 @@ struct CannedMessagesConfig: View {
}
}
func setCannedMessagesValues() {
self.enabled = node?.cannedMessageConfig?.enabled ?? false
self.sendBell = node?.cannedMessageConfig?.sendBell ?? false
self.rotary1Enabled = node?.cannedMessageConfig?.rotary1Enabled ?? false
self.updown1Enabled = node?.cannedMessageConfig?.updown1Enabled ?? false
Expand Down
Loading