#1607 Add support for L3Harris dynamic regroup/patch messages and eve…

…nts. Updates patch group manager to include support for patch groups of individual radios. Includes parsing for L3Harris unknown opcodes 10, 42 and 43.

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

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * Copyright (C) 2014-2023 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
@@ -38,22 +38,20 @@
 import io.github.dsheirer.identifier.radio.RadioIdentifier;
 import io.github.dsheirer.identifier.talkgroup.TalkgroupIdentifier;
 import io.github.dsheirer.util.ThreadPool;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URI;
 import java.net.http.HttpClient;
 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;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Audio broadcaster to push completed audio recordings to the Broadcastify call push API.
@@ -475,7 +473,11 @@ 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());
+        }
+        for(RadioIdentifier patched: patchGroup.getPatchedRadioIdentifiers())
         {
             sb.append(",").append(patched.getValue());
         }

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

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * Copyright (C) 2014-2023 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
@@ -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,39 +33,28 @@
 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;
 import io.github.dsheirer.identifier.patch.PatchGroupIdentifier;
 import io.github.dsheirer.identifier.radio.RadioIdentifier;
 import io.github.dsheirer.identifier.talkgroup.TalkgroupIdentifier;
 import io.github.dsheirer.util.ThreadPool;
-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;
+import java.nio.file.Files;
 import java.time.Duration;
 import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.LinkedTransferQueue;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -525,7 +513,12 @@ 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());
+            }
+
+            for(RadioIdentifier patched: patchGroup.getPatchedRadioIdentifiers())
             {
                 sb.append(",").append(patched.getValue());
             }

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

@@ -1,69 +1,161 @@
 /*
+ * *****************************************************************************
+ * Copyright (C) 2014-2023 Dennis Sheirer
  *
- *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 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/>
- *  * *****************************************************************************
+ * 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.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<>();
+    private int mVersion;
 
-    public PatchGroup(TalkgroupIdentifier patchGroupIdentifier)
+    /**
+     * Constructs an instance
+     * @param patchGroupIdentifier for the patch group
+     * @param version for this patch group identifier.  Note: if the patch group identifier is frequently reused, a
+     * new version number will indicate a new instance of the patch group.
+     */
+    public PatchGroup(TalkgroupIdentifier patchGroupIdentifier, int version)
     {
         mPatchGroupIdentifier = patchGroupIdentifier;
+        mVersion = version;
     }
 
+    /**
+     * Constructs an instance
+     * @param patchGroupIdentifier that is the overall identifier for this temporary grouping.
+     */
+    public PatchGroup(TalkgroupIdentifier patchGroupIdentifier)
+    {
+        this(patchGroupIdentifier, 0);
+    }
+
+    /**
+     * Version number for this patch group used to differentiate frequently reused patch group identifiers.
+     * @return version number (aka super group sequence number).
+     */
+    public int getVersion()
+    {
+        return mVersion;
+    }
+
+    /**
+     * 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);
         }
     }
 
-    public List<TalkgroupIdentifier> getPatchedGroupIdentifiers()
+    /**
+     * List of patched group identifiers that are part of this patch group.
+     * @return patched talkgroups.
+     */
+    public List<TalkgroupIdentifier> getPatchedTalkgroupIdentifiers()
     {
-        return mPatchedGroupIdentifiers;
+        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);
+        }
+    }
+
+    /**
+     * List of patched radio identifiers that are part of this patch group.
+     * @return patched radios.
+     */
+    public List<RadioIdentifier> getPatchedRadioIdentifiers()
+    {
+        return mPatchedRadioIdentifiers;
     }
 
     @Override
@@ -72,9 +164,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();