mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-18 11:37:26 -05:00
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.
This commit is contained in:
@@ -213,6 +213,13 @@ public class TalkerAliasAutoAdder implements BiConsumer<RadioIdentifier,TalkerAl
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(!ALIAS_GROUP.equals(existing.getGroup()))
|
||||||
|
{
|
||||||
|
//Only maintain aliases in the managed group. Existing user aliases must not be renamed or duplicated.
|
||||||
|
markChecked(key, value);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if(getIdentityCount(existing) > 1)
|
if(getIdentityCount(existing) > 1)
|
||||||
{
|
{
|
||||||
//The alias also identifies other radios or talkgroups - leave it alone.
|
//The alias also identifies other radios or talkgroups - leave it alone.
|
||||||
|
|||||||
@@ -693,9 +693,10 @@ public abstract class ChannelConfigurationEditor extends Editor<Channel>
|
|||||||
{
|
{
|
||||||
mAutoAddTalkerAliasesCheckBox = new CheckBox("Auto-Add Talker Aliases");
|
mAutoAddTalkerAliasesCheckBox = new CheckBox("Auto-Add Talker Aliases");
|
||||||
mAutoAddTalkerAliasesCheckBox.setDisable(true);
|
mAutoAddTalkerAliasesCheckBox.setDisable(true);
|
||||||
mAutoAddTalkerAliasesCheckBox.setTooltip(new Tooltip("Adds a radio alias for each talker alias decoded " +
|
mAutoAddTalkerAliasesCheckBox.setTooltip(new Tooltip("Adds decoded talker aliases as radio aliases in " +
|
||||||
"on this system, named with the talker alias, and renames the radio alias when its talker alias " +
|
"the Talker Alias group. Only radio aliases in that group are automatically renamed; existing " +
|
||||||
"changes. Applies when the channel is (re)started."));
|
"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));
|
mAutoAddTalkerAliasesCheckBox.setOnAction(event -> modifiedProperty().set(true));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -145,6 +145,7 @@ public class TalkerAliasAutoAdderTest
|
|||||||
{
|
{
|
||||||
Alias alias = new Alias("Portables");
|
Alias alias = new Alias("Portables");
|
||||||
alias.setAliasListName(LIST);
|
alias.setAliasListName(LIST);
|
||||||
|
alias.setGroup(TalkerAliasAutoAdder.ALIAS_GROUP);
|
||||||
alias.addAliasID(new Radio(Protocol.APCO25, 1234));
|
alias.addAliasID(new Radio(Protocol.APCO25, 1234));
|
||||||
alias.addAliasID(new Radio(Protocol.APCO25, 5678));
|
alias.addAliasID(new Radio(Protocol.APCO25, 5678));
|
||||||
mAliasModel.addAlias(alias);
|
mAliasModel.addAlias(alias);
|
||||||
@@ -156,18 +157,79 @@ public class TalkerAliasAutoAdderTest
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void userAliasForRadioIsRenamed()
|
public void userAliasOutsideManagedGroupIsPreserved()
|
||||||
{
|
{
|
||||||
Alias alias = new Alias("Old Name");
|
Alias alias = new Alias("Custom Name");
|
||||||
alias.setAliasListName(LIST);
|
alias.setAliasListName(LIST);
|
||||||
|
alias.setGroup("Apparatus");
|
||||||
alias.addAliasID(new Radio(Protocol.APCO25, 1234));
|
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);
|
mAliasModel.addAlias(alias);
|
||||||
|
|
||||||
decode(RADIO, "ENGINE 12");
|
decode(RADIO, "ENGINE 12");
|
||||||
decode(RADIO, "ENGINE 12");
|
decode(RADIO, "ENGINE 12");
|
||||||
assertEquals(1, aliases().size());
|
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("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
|
@Test
|
||||||
|
|||||||
Reference in New Issue
Block a user