GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 08:37:25 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#115 patch group alias - resolves issue where wildcard aliases were being matched against a temporary patch group id and removed from the alias list for the lifespan of the patch group. General cleanup of the rollup methods for the patch group alias. Adds a new method to alias list that allows alias lookup from a tgid while excluding wildcard talkgroups.

Browse Source
This commit is contained in:
Denny
2017-01-17 20:43:49 -05:00
parent 6a9e522d77
commit 95a6deaae1
3 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/module/decode/p25/P25DecoderState.java
View File

@@ -2924,8 +2924,8 @@ public class P25DecoderState extends DecoderState
{
PatchGroupAlias patchGroupAlias = null;
//Check for an existing alias for the patch talkgroup
Alias existingAlias = getAliasList().getTalkgroupAlias(patchGroupID);
//Check for an existing alias for the patch talkgroup - do not include wildcard aliases
Alias existingAlias = getAliasList().getTalkgroupAlias(patchGroupID, false);
if(existingAlias instanceof PatchGroupAlias)
{
@@ -2935,6 +2935,8 @@ public class P25DecoderState extends DecoderState
{
patchGroupAlias = new PatchGroupAlias();
patchGroupAlias.addAliasID(new TalkgroupID(patchGroupID));
if(existingAlias != null)
{
getAliasList().removeAlias(existingAlias);
@@ -2942,8 +2944,6 @@ public class P25DecoderState extends DecoderState
patchGroupAlias.setPatchGroupAlias(existingAlias);
}
patchGroupAlias.addAliasID(new TalkgroupID(patchGroupID));
getAliasList().addAlias(patchGroupAlias);
}