Add decode event type to other DecoderStates to support filtering.

src/main/java/io/github/dsheirer/channel/metadata/NowPlayingPanel.java

@@ -25,19 +25,24 @@
 import io.github.dsheirer.icon.IconModel;
 import io.github.dsheirer.module.decode.event.DecodeEventPanel;
 import io.github.dsheirer.module.decode.event.MessageActivityPanel;
+import io.github.dsheirer.module.decode.event.filter.lastheard.LastHeardPanel;
+import io.github.dsheirer.module.decode.event.filter.lastseen.LastSeenPanel;
 import io.github.dsheirer.playlist.PlaylistManager;
 import io.github.dsheirer.preference.UserPreferences;
 import io.github.dsheirer.settings.SettingsManager;
 import java.awt.Color;
 import net.miginfocom.swing.MigLayout;
 
 import javax.swing.JPanel;
+import java.awt.Color;
 
 public class NowPlayingPanel extends JPanel
 {
     private ChannelMetadataPanel mChannelMetadataPanel;
     private ChannelDetailPanel mChannelDetailPanel;
     private DecodeEventPanel mDecodeEventPanel;
+    private LastSeenPanel mLastSeenPanel;
+    private LastHeardPanel mLastHeardPanel;
     private MessageActivityPanel mMessageActivityPanel;
     private ChannelPowerPanel mChannelPowerPanel;
 
@@ -50,6 +55,8 @@ public NowPlayingPanel(PlaylistManager playlistManager, IconModel iconModel, Use
     {
         mChannelDetailPanel = new ChannelDetailPanel(playlistManager.getChannelProcessingManager());
         mDecodeEventPanel = new DecodeEventPanel(iconModel, userPreferences, playlistManager.getAliasModel());
+        mLastSeenPanel = new LastSeenPanel(iconModel, userPreferences, playlistManager.getAliasModel());
+        mLastHeardPanel = new LastHeardPanel(iconModel, userPreferences, playlistManager.getAliasModel());
         mMessageActivityPanel = new MessageActivityPanel(userPreferences);
         mChannelMetadataPanel = new ChannelMetadataPanel(playlistManager, iconModel, userPreferences);
         mChannelPowerPanel = new ChannelPowerPanel(playlistManager, settingsManager);
@@ -64,6 +71,8 @@ private void init()
         JideTabbedPane tabbedPane = new JideTabbedPane();
         tabbedPane.addTab("Details", mChannelDetailPanel);
         tabbedPane.addTab("Events", mDecodeEventPanel);
+        tabbedPane.addTab("Last Seen", mLastSeenPanel);
+        tabbedPane.addTab("Last Heard", mLastHeardPanel);
         tabbedPane.addTab("Messages", mMessageActivityPanel);
         tabbedPane.addTab("Channel", mChannelPowerPanel);
         tabbedPane.setFont(this.getFont());
@@ -81,6 +90,8 @@ private void init()
 
         mChannelMetadataPanel.addProcessingChainSelectionListener(mChannelDetailPanel);
         mChannelMetadataPanel.addProcessingChainSelectionListener(mDecodeEventPanel);
+        mChannelMetadataPanel.addProcessingChainSelectionListener(mLastSeenPanel);
+        mChannelMetadataPanel.addProcessingChainSelectionListener(mLastHeardPanel);
         mChannelMetadataPanel.addProcessingChainSelectionListener(mMessageActivityPanel);
         mChannelMetadataPanel.addProcessingChainSelectionListener(mChannelPowerPanel);
     }

src/main/java/io/github/dsheirer/module/decode/dmr/DMRTrafficChannelManager.java

@@ -326,12 +326,14 @@ public void processChannelGrant(DMRChannel channel, IdentifierCollection identif
         int lsn = channel.getLogicalSlotNumber();
 
         DMRChannelGrantEvent event = mLSNGrantEventMap.get(lsn);
+        DecodeEventType decodeEventType = getEventType(opcode, identifierCollection, encrypted);
 
         if(isStale(event, timestamp, identifierCollection)) //Create new event
         {
             event = DMRChannelGrantEvent.channelGrantBuilder(timestamp)
                 .channel(channel)
-                .eventDescription(getEventType(opcode, identifierCollection, encrypted).toString())
+                .eventType(decodeEventType)
+                .eventDescription(decodeEventType.toString())
                 .details("CHANNEL GRANT" + (encrypted ? " ENCRYPTED" : ""))
                 .identifiers(identifierCollection)
                 .build();
@@ -352,7 +354,8 @@ public void processChannelGrant(DMRChannel channel, IdentifierCollection identif
 
                     event = DMRChannelGrantEvent.channelGrantBuilder(timestamp)
                         .channel(channel)
-                        .eventDescription(getEventType(opcode, identifierCollection, encrypted).toString() + " - Continue")
+                        .eventType(decodeEventType)
+                        .eventDescription(decodeEventType.toString() + " - Continue")
                         .details("CHANNEL GRANT" + (encrypted ? " ENCRYPTED" : ""))
                         .identifiers(identifierCollection)
                         .build();
@@ -392,7 +395,7 @@ else if(!event.getDetails().endsWith(NO_FREQUENCY))
             {
                 if(event.getEventDescription() == null)
                 {
-                    event.setEventDescription(getEventType(opcode, identifierCollection, encrypted) + IGNORED);
+                    event.setEventDescription(decodeEventType + IGNORED);
                 }
                 else if(!event.getEventDescription().endsWith(IGNORED))
                 {

src/main/java/io/github/dsheirer/module/decode/dmr/event/DMRChannelGrantEvent.java

@@ -21,6 +21,7 @@
 
 import io.github.dsheirer.identifier.IdentifierCollection;
 import io.github.dsheirer.module.decode.dmr.channel.DMRChannel;
+import io.github.dsheirer.module.decode.event.DecodeEventType;
 
 /**
  * DMR Channel Grant Event.
@@ -74,6 +75,7 @@ public static class DMRChannelGrantDecodeEventBuilder
     {
         protected long mTimeStart;
         protected long mDuration;
+        protected DecodeEventType mDecodeEventType;
         protected String mEventDescription;
         protected IdentifierCollection mIdentifierCollection;
         protected DMRChannel mChannel;
@@ -121,14 +123,23 @@ public DMRChannelGrantDecodeEventBuilder end(long timestamp)
 
         /**
          * Sets the channel descriptor for this event
-         * @param channelDescriptor
+         * @param channel
          */
         public DMRChannelGrantDecodeEventBuilder channel(DMRChannel channel)
         {
             mChannel = channel;
             return this;
         }
 
+        /**
+         * Sets the Decode Event type for this event.
+         * @param eventType
+         */
+        public DMRChannelGrantDecodeEventBuilder eventType(DecodeEventType eventType) {
+            mDecodeEventType = eventType;
+            return this;
+        }
+
         /**
          * Sets the event description text
          * @param description of the event
@@ -170,6 +181,7 @@ public DMRChannelGrantEvent build()
             decodeEvent.setTimeslot(mChannel.getTimeslot());
             decodeEvent.setDetails(mDetails);
             decodeEvent.setDuration(mDuration);
+            decodeEvent.setEventType(mDecodeEventType);
             decodeEvent.setEventDescription(mEventDescription);
             decodeEvent.setIdentifierCollection(mIdentifierCollection);
             return decodeEvent;

src/main/java/io/github/dsheirer/module/decode/event/DecodeEvent.java

@@ -313,6 +313,10 @@ public DecodeEventBuilder channel(IChannelDescriptor channelDescriptor)
             return this;
         }
 
+        /**
+         * Sets the Decode Event type for this event.
+         * @param eventType
+         */
         public DecodeEventBuilder eventType(DecodeEventType eventType) {
             mDecodeEventType = eventType;
             return this;
@@ -374,6 +378,7 @@ public DecodeEvent build()
             decodeEvent.setChannelDescriptor(mChannelDescriptor);
             decodeEvent.setDetails(mDetails);
             decodeEvent.setDuration(mDuration);
+            decodeEvent.setEventType(mDecodeEventType);
             decodeEvent.setEventDescription(mEventDescription);
             decodeEvent.setIdentifierCollection(mIdentifierCollection);
             decodeEvent.setProtocol(mProtocol);

src/main/java/io/github/dsheirer/module/decode/event/DecodeEventModel.java

@@ -146,12 +146,10 @@ public void setMaxMessageCount(int count)
      */
     public void receive(final IDecodeEvent event)
     {
-        //Disabled until #1368 decode event is fully implemented
-//        if (!mEventFilterSet.passes(event))
-//        {
-//            return;
-//        }
-
+        if (!mEventFilterSet.passes(event))
+        {
+            return;
+        }
         if(!mEvents.contains(event))
         {
             mEvents.add(0, event);

src/main/java/io/github/dsheirer/module/decode/event/DecodeEventPanel.java

@@ -59,6 +59,14 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.table.DefaultTableCellRenderer;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.EventQueue;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
 
 public class DecodeEventPanel extends JPanel implements Listener<ProcessingChain>
 {
@@ -97,8 +105,7 @@ public DecodeEventPanel(IconModel iconModel, UserPreferences userPreferences, Al
         mTableColumnWidthMonitor = new JTableColumnWidthMonitor(mUserPreferences, mTable, TABLE_PREFERENCE_KEY);
         updateCellRenderers();
 
-        //Disabled until #1368 decode event is fully implemented
-//        add(mEventManagementPanel, "span,growx");
+        add(mEventManagementPanel, "span,growx");
 
         mEmptyScroller = new JScrollPane(mTable);
         add(mEmptyScroller);

src/main/java/io/github/dsheirer/module/decode/event/DecodeEventType.java

@@ -24,6 +24,7 @@ public enum DecodeEventType
 {
     AFFILIATE("Affiliate"),
     ANNOUNCEMENT("Announcement"),
+    ACKNOWLEDGE("Acknowledge"),
     AUTOMATIC_REGISTRATION_SERVICE("Motorola ARS"),
     CALL("Call"),
     CALL_ENCRYPTED("Encrypted Call"),
@@ -33,6 +34,7 @@ public enum DecodeEventType
     CALL_PATCH_GROUP_ENCRYPTED("Encrypted Patch Call"),
     CALL_ALERT("Call Alert"),
     CALL_DETECT("Call Detect"),
+    CALL_IN_PROGRESS("Call In Progress"),
     CALL_DO_NOT_MONITOR("Call-Do Not Monitor"),
     CALL_END("Call End"),
     CALL_INTERCONNECT("Telephone Call"),

src/main/java/io/github/dsheirer/module/decode/event/PlottableDecodeEvent.java

@@ -103,6 +103,7 @@ public static class PlottableDecodeEventBuilder
         private long mTimeStart;
         private long mDuration;
         private String mEventDescription;
+        private DecodeEventType mDecodeEventType;
         private IdentifierCollection mIdentifierCollection;
         private IChannelDescriptor mChannelDescriptor;
         private String mDetails;
@@ -190,6 +191,15 @@ public PlottableDecodeEventBuilder protocol(Protocol protocol)
             return this;
         }
 
+        /**
+         * Sets the Decode Event type for this event.
+         * @param eventType
+         */
+        public PlottableDecodeEventBuilder eventType(DecodeEventType eventType) {
+            mDecodeEventType = eventType;
+            return this;
+        }
+
         /**
          * Sets the location for the plottable event
          */
@@ -226,6 +236,7 @@ public PlottableDecodeEvent build()
             decodeEvent.setChannelDescriptor(mChannelDescriptor);
             decodeEvent.setDetails(mDetails);
             decodeEvent.setDuration(mDuration);
+            decodeEvent.setEventType(mDecodeEventType);
             decodeEvent.setEventDescription(mEventDescription);
             decodeEvent.setIdentifierCollection(mIdentifierCollection);
             decodeEvent.setProtocol(mProtocol);

src/main/java/io/github/dsheirer/module/decode/event/filter/DecodedCallEventFilter.java

@@ -10,14 +10,19 @@ public DecodedCallEventFilter()
     {
         super("Voice Calls", Arrays.asList(
                 DecodeEventType.CALL_GROUP,
+                DecodeEventType.CALL_ENCRYPTED,
+                DecodeEventType.CALL_GROUP_ENCRYPTED,
                 DecodeEventType.CALL_PATCH_GROUP,
+                DecodeEventType.CALL_PATCH_GROUP_ENCRYPTED,
                 DecodeEventType.CALL_ALERT,
                 DecodeEventType.CALL_DETECT,
                 DecodeEventType.CALL_DO_NOT_MONITOR,
                 DecodeEventType.CALL_END,
                 DecodeEventType.CALL_INTERCONNECT,
+                DecodeEventType.CALL_INTERCONNECT_ENCRYPTED,
                 DecodeEventType.CALL_UNIQUE_ID,
                 DecodeEventType.CALL_UNIT_TO_UNIT,
+                DecodeEventType.CALL_UNIT_TO_UNIT_ENCRYPTED,
                 DecodeEventType.CALL_NO_TUNER,
                 DecodeEventType.CALL_TIMEOUT
         ));

src/main/java/io/github/dsheirer/module/decode/event/filter/DecodedCommandEventFilter.java

@@ -10,6 +10,7 @@ public DecodedCommandEventFilter()
     {
         super("Commands", Arrays.asList(
                 DecodeEventType.ANNOUNCEMENT,
+                DecodeEventType.ACKNOWLEDGE,
                 DecodeEventType.STATION_ID,
                 DecodeEventType.PAGE,
                 DecodeEventType.QUERY,

src/main/java/io/github/dsheirer/module/decode/event/filter/DecodedRegistrationEventFilter.java

@@ -16,7 +16,8 @@ public DecodedRegistrationEventFilter()
                 DecodeEventType.DEREGISTER,
                 DecodeEventType.REQUEST,
                 DecodeEventType.RESPONSE,
-                DecodeEventType.RESPONSE_PACKET
+                DecodeEventType.RESPONSE_PACKET,
+                DecodeEventType.STATION_ID
         ));
     }
 }

src/main/java/io/github/dsheirer/module/decode/event/filter/lastheard/LastHeardFilterSet.java

@@ -0,0 +1,17 @@
+package io.github.dsheirer.module.decode.event.filter.lastheard;
+
+import io.github.dsheirer.alias.AliasModel;
+import io.github.dsheirer.filter.FilterSet;
+import io.github.dsheirer.icon.IconModel;
+import io.github.dsheirer.module.decode.event.IDecodeEvent;
+
+public class LastHeardFilterSet extends FilterSet<IDecodeEvent>
+{
+
+    public LastHeardFilterSet(AliasModel aliasModel, IconModel iconModel)
+    {
+        super("Last Heard To Channel");
+
+        addFilter(new LastHeardIconFilter("Icon", aliasModel, iconModel));
+    }
+}

src/main/java/io/github/dsheirer/module/decode/event/filter/lastheard/LastHeardHistory.java

@@ -0,0 +1,77 @@
+/*
+ * *****************************************************************************
+ *  Copyright (C) 2014-2020 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.module.decode.event.filter.lastheard;
+
+import com.google.common.eventbus.Subscribe;
+import io.github.dsheirer.module.HistoryModule;
+import io.github.dsheirer.module.decode.event.DecodeEventHistoryPreloadData;
+import io.github.dsheirer.module.decode.event.IDecodeEvent;
+import io.github.dsheirer.module.decode.event.IDecodeEventListener;
+import io.github.dsheirer.sample.Listener;
+
+/**
+ * Decode event history module.  Maintains a history of decode events and constrains the total history size.
+ */
+public class LastHeardHistory extends HistoryModule<IDecodeEvent> implements IDecodeEventListener
+{
+    /**
+     * Constructs an instance
+     */
+    public LastHeardHistory(int historySize)
+    {
+        super(historySize);
+    }
+
+    /**
+     * Implements the IDecodeEventListener interface - delegates to receive(event) method.
+     */
+    @Override
+    public Listener<IDecodeEvent> getDecodeEventListener()
+    {
+        return this;
+    }
+
+    /**
+     * Process preload data
+     */
+    @Subscribe
+    public void process(DecodeEventHistoryPreloadData preloadData)
+    {
+        for(IDecodeEvent decodeEvent: preloadData.getData())
+        {
+            receive(decodeEvent);
+        }
+    }
+
+    /**
+     * Processes a request for decode event history and posts the response back
+     * to the processing chain event bus so that any of the modules can receive that history.
+     *
+     * Note: this is principally used by the DMR decoder for Capacity+ REST channel rotation to transfer the decode
+     * event history from a traffic channel conversion to the new rest channel.
+     *
+     * @param request for decode event history
+     */
+    @Subscribe
+    public void process(LastHeardHistoryRequest request)
+    {
+        getInterModuleEventBus().post(new LastHeardHistoryResponse(this));
+    }
+}