From 57468ef932b7de8226d54bf7f20ef2718bc5b393 Mon Sep 17 00:00:00 2001 From: Robert Scullin Date: Sun, 25 Oct 2020 06:46:02 -0400 Subject: [PATCH] Fixes #740 - Adds Encrypted state to the Status column for P25 Phase 1 (#975) --- .../module/decode/p25/phase1/P25P1DecoderState.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1DecoderState.java b/src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1DecoderState.java index 293423b1..bd1b5941 100644 --- a/src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1DecoderState.java +++ b/src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1DecoderState.java @@ -823,15 +823,20 @@ public class P25P1DecoderState extends DecoderState implements IChannelEventList } else { + mCurrentCallEvent.setIdentifierCollection(getIdentifierCollection().copyOf()); + mCurrentCallEvent.end(timestamp); + broadcast(mCurrentCallEvent); + if(type == DecodeEventType.CALL_ENCRYPTED) { mCurrentCallEvent.setEventDescription(type.toString()); mCurrentCallEvent.setDetails(details); + broadcast(new DecoderStateEvent(this, Event.CONTINUATION, State.ENCRYPTED)); + } + else + { + broadcast(new DecoderStateEvent(this, Event.CONTINUATION, State.CALL)); } - mCurrentCallEvent.setIdentifierCollection(getIdentifierCollection().copyOf()); - mCurrentCallEvent.end(timestamp); - broadcast(mCurrentCallEvent); - broadcast(new DecoderStateEvent(this, Event.CONTINUATION, State.CALL)); } }