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

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

View File

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