#1607 WIP Harris P25 Regrouping Action Messages and Patch Group manag…

…ement updates.

src/main/java/io/github/dsheirer/alias/AliasList.java

@@ -388,35 +388,52 @@ public List<Alias> getAliases(Identifier identifier)
                     }
                     break;
                 case PATCH_GROUP:
+                    List<Alias> aliases = new ArrayList<>();
+
                     PatchGroupIdentifier patchGroupIdentifier = (PatchGroupIdentifier)identifier;
                     PatchGroup patchGroup = patchGroupIdentifier.getValue();
 
                     TalkgroupAliasList patchGroupAliasList = mTalkgroupProtocolMap.get(patchGroupIdentifier.getProtocol());
 
                     if(patchGroupAliasList != null)
                     {
-                        List<Alias> aliases = new ArrayList<>();
-
                         Alias alias = patchGroupAliasList.getAlias(patchGroup.getPatchGroup());
 
                         if(alias != null)
                         {
                             aliases.add(alias);
                         }
 
-                        for(TalkgroupIdentifier patchedGroup: patchGroup.getPatchedGroupIdentifiers())
+                        for(TalkgroupIdentifier patchedTalkgroup: patchGroup.getPatchedTalkgroupIdentifiers())
                         {
-                            Alias patchedAlias = patchGroupAliasList.getAlias(patchedGroup);
+                            Alias patchedTalkgroupAlias = patchGroupAliasList.getAlias(patchedTalkgroup);
 
-                            if(patchedAlias != null && !aliases.contains(patchedAlias))
+                            if(patchedTalkgroupAlias != null && !aliases.contains(patchedTalkgroupAlias))
                             {
-                                aliases.add(patchedAlias);
+                                aliases.add(patchedTalkgroupAlias);
                             }
                         }
+                    }
+
+                    if(patchGroup.hasPatchedRadios())
+                    {
+                        RadioAliasList radioAliasList = mRadioProtocolMap.get(patchGroupIdentifier.getProtocol());
+
+                        if(radioAliasList != null)
+                        {
+                            for(RadioIdentifier patchedRadio: patchGroup.getPatchedRadioIdentifiers())
+                            {
+                                Alias patchedRadioAlias = radioAliasList.getAlias(patchedRadio);
 
-                        return aliases;
+                                if(patchedRadioAlias != null && !aliases.contains(patchedRadioAlias))
+                                {
+                                    aliases.add(patchedRadioAlias);
+                                }
+                            }
+                        }
                     }
-                    break;
+
+                    return aliases;
                 case RADIO:
                     RadioIdentifier radio = (RadioIdentifier)identifier;
 
@@ -483,9 +500,7 @@ private static List<Alias> toList(Alias alias)
     {
         if(alias != null)
         {
-            List<Alias> aliases = new ArrayList<>();
-            aliases.add(alias);
-            return aliases;
+            return Collections.singletonList(alias);
         }
 
         return Collections.emptyList();

src/main/java/io/github/dsheirer/audio/broadcast/broadcastify/BroadcastifyCallBroadcaster.java

@@ -48,7 +48,6 @@
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.time.Duration;
-import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.LinkedTransferQueue;
@@ -475,7 +474,7 @@ public static String format(PatchGroupIdentifier patchGroupIdentifier)
 
         StringBuilder sb = new StringBuilder();
         sb.append(patchGroup.getPatchGroup().getValue().toString());
-        for(TalkgroupIdentifier patched: patchGroup.getPatchedGroupIdentifiers())
+        for(TalkgroupIdentifier patched: patchGroup.getPatchedTalkgroupIdentifiers())
         {
             sb.append(",").append(patched.getValue());
         }

src/main/java/io/github/dsheirer/audio/broadcast/rdioscanner/RdioScannerBroadcaster.java

@@ -20,7 +20,6 @@
 package io.github.dsheirer.audio.broadcast.rdioscanner;
 
 import com.google.common.net.HttpHeaders;
-import com.google.common.base.Joiner;
 import io.github.dsheirer.alias.Alias;
 import io.github.dsheirer.alias.AliasList;
 import io.github.dsheirer.alias.AliasModel;
@@ -34,7 +33,6 @@
 import io.github.dsheirer.identifier.Form;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.identifier.IdentifierClass;
-import io.github.dsheirer.identifier.MutableIdentifierCollection;
 import io.github.dsheirer.identifier.Role;
 import io.github.dsheirer.identifier.configuration.ConfigurationLongIdentifier;
 import io.github.dsheirer.identifier.patch.PatchGroup;
@@ -45,18 +43,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
 import java.nio.file.Files;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
 import java.net.URI;
-import java.net.URL;
-import java.net.URLConnection;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
@@ -525,7 +514,7 @@ public static String getPatches(AudioRecording audioRecording)
 
             sb.append(patchGroup.getPatchGroup().getValue().toString());
 
-            for(TalkgroupIdentifier patched: patchGroup.getPatchedGroupIdentifiers())
+            for(TalkgroupIdentifier patched: patchGroup.getPatchedTalkgroupIdentifiers())
             {
                 sb.append(",").append(patched.getValue());
             }

src/main/java/io/github/dsheirer/identifier/patch/PatchGroup.java

@@ -22,48 +22,122 @@
 
 package io.github.dsheirer.identifier.patch;
 
+import io.github.dsheirer.identifier.radio.RadioIdentifier;
 import io.github.dsheirer.identifier.talkgroup.TalkgroupIdentifier;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+/**
+ * Temporary grouping or regrouping of talkgroups or individual radios.
+ */
 public class PatchGroup
 {
-//    private final static Logger mLog = LoggerFactory.getLogger(PatchGroup.class);
-
     private TalkgroupIdentifier mPatchGroupIdentifier;
-    private List<TalkgroupIdentifier> mPatchedGroupIdentifiers = new ArrayList<>();
+    private List<TalkgroupIdentifier> mPatchedTalkgroupIdentifiers = new ArrayList<>();
+    private List<RadioIdentifier> mPatchedRadioIdentifiers = new ArrayList<>();
 
+    /**
+     * Constructs an instance
+     * @param patchGroupIdentifier that is the overall identifier for this temporary grouping.
+     */
     public PatchGroup(TalkgroupIdentifier patchGroupIdentifier)
     {
         mPatchGroupIdentifier = patchGroupIdentifier;
     }
 
+    /**
+     * Patch group identifier.
+     * @return identifier
+     */
     public TalkgroupIdentifier getPatchGroup()
     {
         return mPatchGroupIdentifier;
     }
 
-    public void addPatchedGroup(TalkgroupIdentifier patchedGroupIdentifier)
+    /**
+     * Indicates if this patch group contains any patched talkgroups.
+     * @return true if there are patched talkgroups.
+     */
+    public boolean hasPatchedTalkgroups()
+    {
+        return !getPatchedTalkgroupIdentifiers().isEmpty();
+    }
+
+    /**
+     * Indicates if this patch group contains any patched radio identifiers.
+     * @return true if there are patched radios.
+     */
+    public boolean hasPatchedRadios()
+    {
+        return !getPatchedRadioIdentifiers().isEmpty();
+    }
+
+    /**
+     * Adds the talkgroup identifier to this patched group.
+     * @param patchedGroupIdentifier to add
+     */
+    public void addPatchedTalkgroup(TalkgroupIdentifier patchedGroupIdentifier)
     {
-        if(!mPatchedGroupIdentifiers.contains(patchedGroupIdentifier))
+        if(!mPatchedTalkgroupIdentifiers.contains(patchedGroupIdentifier))
         {
-            mPatchedGroupIdentifiers.add(patchedGroupIdentifier);
+            mPatchedTalkgroupIdentifiers.add(patchedGroupIdentifier);
         }
     }
 
-    public void addPatchedGroups(List<TalkgroupIdentifier> patchedGroupIdentifiers)
+    /**
+     * Adds a list of talkgroup identifiers to this patched group.
+     * @param patchedGroupIdentifiers to add
+     */
+    public void addPatchedTalkgroups(List<TalkgroupIdentifier> patchedGroupIdentifiers)
     {
         for(TalkgroupIdentifier identifier : patchedGroupIdentifiers)
         {
-            addPatchedGroup(identifier);
+            addPatchedTalkgroup(identifier);
+        }
+    }
+
+    /**
+     * List of patched group identifiers that are part of this patch group.
+     * @return patched talkgroups.
+     */
+    public List<TalkgroupIdentifier> getPatchedTalkgroupIdentifiers()
+    {
+        return mPatchedTalkgroupIdentifiers;
+    }
+
+    /**
+     * Adds the radio identifier to this patched group.
+     * @param patchedRadioIdentifier to add
+     */
+    public void addPatchedRadio(RadioIdentifier patchedRadioIdentifier)
+    {
+        if(!mPatchedRadioIdentifiers.contains(patchedRadioIdentifier))
+        {
+            mPatchedRadioIdentifiers.add(patchedRadioIdentifier);
+        }
+    }
+
+    /**
+     * Adds a list of radio identifiers to this patched group.
+     * @param patchedRadioIdentifiers to add
+     */
+    public void addPatchedRadios(List<RadioIdentifier> patchedRadioIdentifiers)
+    {
+        for(RadioIdentifier identifier : patchedRadioIdentifiers)
+        {
+            addPatchedRadio(identifier);
         }
     }
 
-    public List<TalkgroupIdentifier> getPatchedGroupIdentifiers()
+    /**
+     * List of patched radio identifiers that are part of this patch group.
+     * @return patched radios.
+     */
+    public List<RadioIdentifier> getPatchedRadioIdentifiers()
     {
-        return mPatchedGroupIdentifiers;
+        return mPatchedRadioIdentifiers;
     }
 
     @Override
@@ -72,9 +146,14 @@ public String toString()
         StringBuilder sb = new StringBuilder();
         sb.append("P:").append(getPatchGroup());
 
-        if(!getPatchedGroupIdentifiers().isEmpty())
+        if(hasPatchedTalkgroups())
+        {
+            sb.append(" TG").append(getPatchedTalkgroupIdentifiers());
+        }
+
+        if(hasPatchedRadios())
         {
-            sb.append(" ").append(getPatchedGroupIdentifiers());
+            sb.append(" RA").append(getPatchedRadioIdentifiers());
         }
 
         return sb.toString();

src/main/java/io/github/dsheirer/identifier/patch/PatchGroupManager.java

@@ -77,7 +77,7 @@ public synchronized void addPatchGroup(PatchGroupIdentifier patchGroupIdentifier
             if(mPatchGroupMap.containsKey(update.getPatchGroup().getValue()))
             {
                 PatchGroup current = mPatchGroupMap.get(update.getPatchGroup().getValue()).getValue();
-                current.addPatchedGroups(update.getPatchedGroupIdentifiers());
+                current.addPatchedTalkgroups(update.getPatchedTalkgroupIdentifiers());
             }
             else
             {

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/lc/motorola/LCMotorolaPatchGroupAdd.java

@@ -66,7 +66,7 @@ public Identifier getPatchGroup()
         if(mPatchGroup == null)
         {
             PatchGroup patchGroup = new PatchGroup(APCO25Talkgroup.create(getMessage().getInt(PATCH_GROUP)));
-            patchGroup.addPatchedGroups(getPatchedGroups());
+            patchGroup.addPatchedTalkgroups(getPatchedGroups());
             mPatchGroup = APCO25PatchGroup.create(patchGroup);
         }
 

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/lc/motorola/LCMotorolaPatchGroupDelete.java

@@ -66,7 +66,7 @@ public Identifier getPatchGroup()
         if(mPatchGroup == null)
         {
             PatchGroup patchGroup = new PatchGroup(APCO25Talkgroup.create(getMessage().getInt(PATCH_GROUP)));
-            patchGroup.addPatchedGroups(getPatchedGroups());
+            patchGroup.addPatchedTalkgroups(getPatchedGroups());
             mPatchGroup = APCO25PatchGroup.create(patchGroup);
         }
 

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/Opcode.java

@@ -180,7 +180,7 @@ public enum Opcode
     HARRIS_ISP_UNKNOWN(-1, "HARRIS ISP UNKNOWN OPCODE", "HARRIS ISP UNKNOWN OPCODE"),
 
     //Vendor: harris, Outbound Service Packet (OSP)
-    HARRIS_OSP_TDMA_SYNC(48, "HARRIS TDMA SYNC", "HARRIS TDMA SYNC BROADCAST"),
+    HARRIS_OSP_GRG_EXENC_CMD(48, "HARRIS GROUP REGROUP EXPLICIT ENCRYPTION COMMAND", "HARRIS GROUP REGROUP ENC"),
     HARRIS_OSP_UNKNOWN(-1, "HARRIS OSP UNKNOWN OPCODE", "HARRIS OSP UNKNOWN OPCODE"),
 
     //Vendor: unknown, Inbound Service Packet (ISP)
@@ -294,7 +294,7 @@ public enum Opcode
     /**
      * Harris opcodes
      */
-    public static final EnumSet<Opcode> HARRIS = EnumSet.of(HARRIS_ISP_UNKNOWN, HARRIS_OSP_TDMA_SYNC,
+    public static final EnumSet<Opcode> HARRIS = EnumSet.of(HARRIS_ISP_UNKNOWN, HARRIS_OSP_GRG_EXENC_CMD,
             HARRIS_OSP_UNKNOWN);
 
     /**
@@ -425,7 +425,7 @@ public static Opcode fromValue(int value, Direction direction, Vendor vendor)
                     switch(value)
                     {
                         case 48:
-                            return HARRIS_OSP_TDMA_SYNC;
+                            return HARRIS_OSP_GRG_EXENC_CMD;
                         default:
                             return HARRIS_OSP_UNKNOWN;
                     }

src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/TSBKMessageFactory.java

@@ -27,7 +27,7 @@
 import io.github.dsheirer.module.decode.p25.phase1.P25P1DataUnitID;
 import io.github.dsheirer.module.decode.p25.phase1.P25P1Interleave;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.harris.isp.UnknownHarrisISPMessage;
-import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.harris.osp.HarrisTDMASyncBroadcast;
+import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.harris.osp.HarrisGroupRegroupExplicitEncryptionCommand;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.harris.osp.UnknownHarrisOSPMessage;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.motorola.isp.UnknownMotorolaISPMessage;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.motorola.osp.ChannelLoading;
@@ -298,8 +298,8 @@ public static TSBKMessage create(Direction direction, P25P1DataUnitID dataUnitID
 
             case HARRIS_ISP_UNKNOWN:
                 return new UnknownHarrisISPMessage(dataUnitID, message, nac, timestamp);
-            case HARRIS_OSP_TDMA_SYNC:
-                return new HarrisTDMASyncBroadcast(dataUnitID, message, nac, timestamp);
+            case HARRIS_OSP_GRG_EXENC_CMD:
+                return new HarrisGroupRegroupExplicitEncryptionCommand(dataUnitID, message, nac, timestamp);
             case HARRIS_OSP_UNKNOWN:
                 return new UnknownHarrisOSPMessage(dataUnitID, message, nac, timestamp);