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

#1867 Event logger ensures from identifier is the radio ID and not the system transmitted radio alias. (#2050)

Browse Source 
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
Denny Sheirer
2024-10-27 09:31:51 -04:00
committed by GitHub
parent 9e01cc48a5
commit 486ac01416
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/io/github/dsheirer/module/log/DecodeEventLogger.java
View File

@@ -100,19 +100,19 @@ public class DecodeEventLogger extends EventLogger implements IDecodeEventListen
cells.add(event.getProtocol());
cells.add(event.getEventType());
List<Identifier> fromIdentifiers = event.getIdentifierCollection().getIdentifiers(Role.FROM);
if(fromIdentifiers != null && !fromIdentifiers.isEmpty())
Identifier fromIdentifier = event.getIdentifierCollection().getFromIdentifier();
if(fromIdentifier != null)
{
cells.add(fromIdentifiers.get(0));
cells.add(fromIdentifier);
}
else
{
cells.add("");
}
List<Identifier> toIdentifiers = event.getIdentifierCollection().getIdentifiers(Role.TO);
Identifier toIdentifier = event.getIdentifierCollection().getToIdentifier();
if(toIdentifiers != null && !toIdentifiers.isEmpty())
if(toIdentifier != null)
{
Identifier identifier = event.getIdentifierCollection()
.getIdentifier(IdentifierClass.CONFIGURATION,Form.ALIAS_LIST,Role.ANY);
@@ -120,9 +120,9 @@ public class DecodeEventLogger extends EventLogger implements IDecodeEventListen
if(mAliasList != null)
{
String mystring = (!mAliasList.getAliases(toIdentifiers.get(0)).isEmpty()) ?
mAliasList.getAliases(toIdentifiers.get(0)).get(0).toString() : "";
cells.add(mystring + " (" + toIdentifiers.get(0) + ")");
String mystring = (!mAliasList.getAliases(toIdentifier).isEmpty()) ?
mAliasList.getAliases(toIdentifier).toString() : "";
cells.add(mystring + " (" + toIdentifier + ")");
}
else
{