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

#1966 P25 aliases not correctly matching when radio system is using fully qualified talkgroup/radio values. (#1967)

Browse Source 
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
Denny Sheirer
2024-09-02 08:05:17 -04:00
committed by GitHub
parent 298d9d7016
commit 5d8d3e4a41
4 changed files with 333 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/io/github/dsheirer/alias/AliasList.java
View File

@@ -666,10 +666,15 @@ public class AliasList
//Attempt to do a fully qualified identifier match first.
if(identifier instanceof FullyQualifiedTalkgroupIdentifier fqti)
{
return mFullyQualifiedTalkgroupAliasMap.get(fqti.getFullyQualifiedTalkgroupAddress());
Alias fullyQualifiedAlias = mFullyQualifiedTalkgroupAliasMap.get(fqti.getFullyQualifiedTalkgroupAddress());
if(fullyQualifiedAlias != null)
{
return fullyQualifiedAlias;
}
}
//Then try to match it by it's locally assigned (temporary) address.
//Next, attempt to match against the locally assigned (temporary) address
int value = identifier.getValue();
Alias mapValue = mTalkgroupAliasMap.get(value);
@@ -786,10 +791,15 @@ public class AliasList
//Attempt to do a fully qualified identifier match first.
if(identifier instanceof FullyQualifiedRadioIdentifier fqri)
{
return mFullyQualifiedRadioAliasMap.get(fqri.getFullyQualifiedRadioAddress());
Alias fullyQualifiedRadioAlias = mFullyQualifiedRadioAliasMap.get(fqri.getFullyQualifiedRadioAddress());
if(fullyQualifiedRadioAlias != null)
{
return fullyQualifiedRadioAlias;
}
}
//Then match against the locally assigned (temporary) address
//Next, attempt to match against the locally assigned (temporary) address
int value = identifier.getValue();
Alias mapValue = mRadioAliasMap.get(value);