From 63b0aaaa7fdc71ae198c2bdf39e1c7af3eddf0ef Mon Sep 17 00:00:00 2001 From: Denny Sheirer Date: Thu, 3 Sep 2020 04:21:28 -0400 Subject: [PATCH] Resolves #909 MPT1327 call events don't show talkgroup aliases. (#920) Co-authored-by: Denny --- .../dsheirer/module/decode/mpt1327/MPT1327DecoderState.java | 5 ++++- .../module/decode/mpt1327/MPT1327TrafficChannelManager.java | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/github/dsheirer/module/decode/mpt1327/MPT1327DecoderState.java b/src/main/java/io/github/dsheirer/module/decode/mpt1327/MPT1327DecoderState.java index 76fc5ffd..064bfc4f 100644 --- a/src/main/java/io/github/dsheirer/module/decode/mpt1327/MPT1327DecoderState.java +++ b/src/main/java/io/github/dsheirer/module/decode/mpt1327/MPT1327DecoderState.java @@ -205,7 +205,10 @@ public class MPT1327DecoderState extends DecoderState case GTC: if(mMPT1327TrafficChannelManager != null) { - mMPT1327TrafficChannelManager.processChannelGrant(mpt); + MutableIdentifierCollection ic = new MutableIdentifierCollection(getIdentifierCollection().getIdentifiers()); + ic.remove(IdentifierClass.USER); + ic.update(mpt.getIdentifiers()); + mMPT1327TrafficChannelManager.processChannelGrant(mpt, ic); } else { diff --git a/src/main/java/io/github/dsheirer/module/decode/mpt1327/MPT1327TrafficChannelManager.java b/src/main/java/io/github/dsheirer/module/decode/mpt1327/MPT1327TrafficChannelManager.java index 347e6c69..1c01fdc5 100644 --- a/src/main/java/io/github/dsheirer/module/decode/mpt1327/MPT1327TrafficChannelManager.java +++ b/src/main/java/io/github/dsheirer/module/decode/mpt1327/MPT1327TrafficChannelManager.java @@ -81,11 +81,10 @@ public class MPT1327TrafficChannelManager extends Module implements IDecodeEvent * Processes channel grants to allocate traffic channels and track overall channel usage. Generates * decode events for each new channel that is allocated. */ - public void processChannelGrant(MPT1327Message mpt1327Message) + public void processChannelGrant(MPT1327Message mpt1327Message, IdentifierCollection identifierCollection) { if(mpt1327Message.getMessageType() == MPT1327Message.MPTMessageType.GTC) { - IdentifierCollection identifierCollection = new IdentifierCollection(mpt1327Message.getIdentifiers()); MPT1327Channel mpt1327Channel = MPT1327Channel.create(mpt1327Message.getChannel()); mpt1327Channel.setChannelMap(mChannelMap);