GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-14 01:27:34 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Resolves #909 MPT1327 call events don't show talkgroup aliases. (#920)

Browse Source 
Co-authored-by: Denny <denny@denny-desktop>
This commit is contained in:
Denny Sheirer
2020-09-03 04:21:28 -04:00
committed by GitHub
parent d20dd1af8c
commit 63b0aaaa7f
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/io/github/dsheirer/module/decode/mpt1327/MPT1327DecoderState.java
View File

@@ -205,7 +205,10 @@ public class MPT1327DecoderState extends DecoderState
case GTC: case GTC:
if(mMPT1327TrafficChannelManager != null) 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 else
{ {

3
src/main/java/io/github/dsheirer/module/decode/mpt1327/MPT1327TrafficChannelManager.java
View File

@@ -81,11 +81,10 @@ public class MPT1327TrafficChannelManager extends Module implements IDecodeEvent
* Processes channel grants to allocate traffic channels and track overall channel usage. Generates * Processes channel grants to allocate traffic channels and track overall channel usage. Generates
* decode events for each new channel that is allocated. * 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) if(mpt1327Message.getMessageType() == MPT1327Message.MPTMessageType.GTC)
{ {
IdentifierCollection identifierCollection = new IdentifierCollection(mpt1327Message.getIdentifiers());
MPT1327Channel mpt1327Channel = MPT1327Channel.create(mpt1327Message.getChannel()); MPT1327Channel mpt1327Channel = MPT1327Channel.create(mpt1327Message.getChannel());
mpt1327Channel.setChannelMap(mChannelMap); mpt1327Channel.setChannelMap(mChannelMap);