From 3473150ee9d6da2681627ee0ed0834605cf5d73e Mon Sep 17 00:00:00 2001 From: GTR8000 Date: Wed, 18 Nov 2026 03:47:35 -0500 Subject: [PATCH] Preserve user radio aliases outside the Talker Alias group (#2689) Limit automatic renaming to the existing managed group. Keep exact-match user aliases outside that group unchanged without creating duplicates, while retaining confirmation and multi-identifier protections for managed aliases. Explain moving aliases out of the group in the tooltip and cover custom, ungrouped, managed and moved aliases in regression tests. --- .../dsheirer/alias/TalkerAliasAutoAdder.java | 7 ++ .../channel/ChannelConfigurationEditor.java | 7 +- .../alias/TalkerAliasAutoAdderTest.java | 68 ++++++++++++++++++- 3 files changed, 76 insertions(+), 6 deletions(-) diff --git a/src/main/java/io/github/dsheirer/alias/TalkerAliasAutoAdder.java b/src/main/java/io/github/dsheirer/alias/TalkerAliasAutoAdder.java index d7974548..58229c1b 100644 --- a/src/main/java/io/github/dsheirer/alias/TalkerAliasAutoAdder.java +++ b/src/main/java/io/github/dsheirer/alias/TalkerAliasAutoAdder.java @@ -213,6 +213,13 @@ public class TalkerAliasAutoAdder implements BiConsumer 1) { //The alias also identifies other radios or talkgroups - leave it alone. diff --git a/src/main/java/io/github/dsheirer/gui/playlist/channel/ChannelConfigurationEditor.java b/src/main/java/io/github/dsheirer/gui/playlist/channel/ChannelConfigurationEditor.java index 9deabec9..2bf6d3fc 100644 --- a/src/main/java/io/github/dsheirer/gui/playlist/channel/ChannelConfigurationEditor.java +++ b/src/main/java/io/github/dsheirer/gui/playlist/channel/ChannelConfigurationEditor.java @@ -693,9 +693,10 @@ public abstract class ChannelConfigurationEditor extends Editor { mAutoAddTalkerAliasesCheckBox = new CheckBox("Auto-Add Talker Aliases"); mAutoAddTalkerAliasesCheckBox.setDisable(true); - mAutoAddTalkerAliasesCheckBox.setTooltip(new Tooltip("Adds a radio alias for each talker alias decoded " + - "on this system, named with the talker alias, and renames the radio alias when its talker alias " + - "changes. Applies when the channel is (re)started.")); + mAutoAddTalkerAliasesCheckBox.setTooltip(new Tooltip("Adds decoded talker aliases as radio aliases in " + + "the Talker Alias group. Only radio aliases in that group are automatically renamed; existing " + + "radio aliases outside the group are left unchanged. Move an alias out of the Talker Alias group " + + "to preserve a custom name. Applies when the channel is (re)started.")); mAutoAddTalkerAliasesCheckBox.setOnAction(event -> modifiedProperty().set(true)); } diff --git a/src/test/java/io/github/dsheirer/alias/TalkerAliasAutoAdderTest.java b/src/test/java/io/github/dsheirer/alias/TalkerAliasAutoAdderTest.java index ae793963..78f7ffc0 100644 --- a/src/test/java/io/github/dsheirer/alias/TalkerAliasAutoAdderTest.java +++ b/src/test/java/io/github/dsheirer/alias/TalkerAliasAutoAdderTest.java @@ -145,6 +145,7 @@ public class TalkerAliasAutoAdderTest { Alias alias = new Alias("Portables"); alias.setAliasListName(LIST); + alias.setGroup(TalkerAliasAutoAdder.ALIAS_GROUP); alias.addAliasID(new Radio(Protocol.APCO25, 1234)); alias.addAliasID(new Radio(Protocol.APCO25, 5678)); mAliasModel.addAlias(alias); @@ -156,18 +157,79 @@ public class TalkerAliasAutoAdderTest } @Test - public void userAliasForRadioIsRenamed() + public void userAliasOutsideManagedGroupIsPreserved() { - Alias alias = new Alias("Old Name"); + Alias alias = new Alias("Custom Name"); alias.setAliasListName(LIST); + alias.setGroup("Apparatus"); alias.addAliasID(new Radio(Protocol.APCO25, 1234)); - alias.addAliasID(new io.github.dsheirer.alias.id.priority.Priority(1)); + io.github.dsheirer.alias.id.priority.Priority priority = new io.github.dsheirer.alias.id.priority.Priority(1); + alias.addAliasID(priority); mAliasModel.addAlias(alias); decode(RADIO, "ENGINE 12"); decode(RADIO, "ENGINE 12"); assertEquals(1, aliases().size()); + assertEquals(alias, alias(RADIO)); + assertEquals("Custom Name", alias.getName()); + assertEquals("Apparatus", alias.getGroup()); + assertTrue(alias.getAliasIdentifiers().contains(priority)); + } + + @Test + public void ungroupedUserAliasIsPreserved() + { + Alias alias = new Alias("Custom Name"); + alias.setAliasListName(LIST); + alias.addAliasID(new Radio(Protocol.APCO25, 1234)); + mAliasModel.addAlias(alias); + + decode(RADIO, "ENGINE 12"); + decode(RADIO, "ENGINE 12"); + assertEquals(1, aliases().size()); + assertEquals("Custom Name", alias.getName()); + assertNull(alias.getGroup()); + } + + @Test + public void managedAliasForRadioIsRenamedAndKeepsAudioSettings() + { + Alias alias = new Alias("Old Name"); + alias.setAliasListName(LIST); + alias.setGroup(TalkerAliasAutoAdder.ALIAS_GROUP); + alias.addAliasID(new Radio(Protocol.APCO25, 1234)); + io.github.dsheirer.alias.id.priority.Priority priority = new io.github.dsheirer.alias.id.priority.Priority(1); + alias.addAliasID(priority); + mAliasModel.addAlias(alias); + + decode(RADIO, "ENGINE 12"); + assertEquals("Old Name", alias.getName()); + decode(RADIO, "ENGINE 12"); + assertEquals(1, aliases().size()); assertEquals("ENGINE 12", alias.getName()); + assertEquals(TalkerAliasAutoAdder.ALIAS_GROUP, alias.getGroup()); + assertTrue(alias.getAliasIdentifiers().contains(priority)); + } + + @Test + public void movingAliasOutOfManagedGroupProtectsCustomName() + { + decode(RADIO, "ENGINE 12"); + Alias alias = alias(RADIO); + alias.setGroup("Apparatus"); + alias.setName("Custom Name"); + + decode(RADIO, "LADDER 3"); + decode(RADIO, "LADDER 3"); + assertEquals(1, aliases().size()); + assertEquals("Custom Name", alias.getName()); + assertEquals("Apparatus", alias.getGroup()); + + //Moving it back opts it into automatic maintenance again. + alias.setGroup(TalkerAliasAutoAdder.ALIAS_GROUP); + decode(RADIO, "RESCUE 5"); + decode(RADIO, "RESCUE 5"); + assertEquals("RESCUE 5", alias.getName()); } @Test