Fixed P25 Filtering Bug

Author: x27

src/CFT.csproj

@@ -105,6 +105,7 @@
     </Compile>
     <Compile Include="KirisunBPEncryptionRow.cs" />
     <Compile Include="KirisunKeyLengthEnum.cs" />
+    <Compile Include="P25EncryptionRow.cs" />
     <Compile Include="P25AESEncryptionRow.cs" />
     <Compile Include="P25AESEncryptionMethodForm.cs">
       <SubType>Form</SubType>

src/MainForm.cs

@@ -713,7 +713,7 @@ private ListViewItem CreateListViewRow(ProtocolEnum filter, IEncryptionRow row)
                         if (row.Protocol != ProtocolEnum.P25)
                             return null;
 
-                        var options = ((P25ADPEncryptionRow)row).ActivateOptions;
+                        var options = ((P25EncryptionRow)row).ActivateOptions;
 
                         var listViewSubItem0 = new ListViewItem.ListViewSubItem();
                         listViewSubItem0.Text = options.IsActivated(P25SelectedActivateOptionsEnum.NAC) ? options.NAC.ToString() : "-";

src/P25ADPEncryptionRow.cs

@@ -5,17 +5,12 @@ namespace CFT
 {
     [DisplayName("P25 ADP")]
     [Serializable]
-    public class P25ADPEncryptionRow : BaseEncryptionRow
+    public class P25ADPEncryptionRow : P25EncryptionRow
     {
         public const int KEY_SIZE = 5;
 
         public byte[] Key { get; set; }
 
-        public P25ActivateOptions ActivateOptions { get; set; }
-
-        [JsonIgnore]
-        public override ProtocolEnum Protocol => ProtocolEnum.P25;
-
         [JsonIgnore]
         public override string Description
         {
@@ -27,6 +22,5 @@ public override string Description
                     return $"P25 ADP";
             }
         }
-        public override bool IsFrequencyNeed => ActivateOptions == null ? true : ActivateOptions.IsActivated(P25SelectedActivateOptionsEnum.Frequency);
     }
 }

src/P25AESEncryptionRow.cs

@@ -5,17 +5,12 @@ namespace CFT
 {
     [DisplayName("P25 AES")]
     [Serializable]
-    public class P25AESEncryptionRow : BaseEncryptionRow
+    public class P25AESEncryptionRow : P25EncryptionRow
     {
         public const int KEY_SIZE = 32;
 
         public byte[] Key { get; set; }
 
-        public P25ActivateOptions ActivateOptions { get; set; }
-
-        [JsonIgnore]
-        public override ProtocolEnum Protocol => ProtocolEnum.P25;
-
         [JsonIgnore]
         public override string Description
         {
@@ -27,6 +22,5 @@ public override string Description
                     return $"P25 AES";
             }
         }
-        public override bool IsFrequencyNeed => ActivateOptions == null ? true : ActivateOptions.IsActivated(P25SelectedActivateOptionsEnum.Frequency);
     }
 }

src/P25DESEncryptionRow.cs

@@ -5,17 +5,12 @@ namespace CFT
 {
     [DisplayName("P25 DES")]
     [Serializable]
-    public class P25DESEncryptionRow : BaseEncryptionRow
+    public class P25DESEncryptionRow : P25EncryptionRow
     {
         public const int KEY_SIZE = 8;
 
         public byte[] Key { get; set; }
 
-        public P25ActivateOptions ActivateOptions { get; set; }
-
-        [JsonIgnore]
-        public override ProtocolEnum Protocol => ProtocolEnum.P25;
-
         [JsonIgnore]
         public override string Description
         {
@@ -27,6 +22,5 @@ public override string Description
                     return $"P25 DES";
             }
         }
-        public override bool IsFrequencyNeed => ActivateOptions == null ? true : ActivateOptions.IsActivated(P25SelectedActivateOptionsEnum.Frequency);
     }
 }

src/P25EncryptionRow.cs

@@ -0,0 +1,16 @@
+using Newtonsoft.Json;
+using System;
+
+namespace CFT
+{
+    [Serializable]
+    public abstract class P25EncryptionRow : BaseEncryptionRow
+    {
+        public P25ActivateOptions ActivateOptions { get; set; }
+
+        [JsonIgnore]
+        public override ProtocolEnum Protocol => ProtocolEnum.P25;
+
+        public override bool IsFrequencyNeed => ActivateOptions == null ? true : ActivateOptions.IsActivated(P25SelectedActivateOptionsEnum.Frequency);
+    }
+}

src/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.42")]
-[assembly: AssemblyFileVersion("2.0.0.42")]
+[assembly: AssemblyVersion("2.0.0.43")]
+[assembly: AssemblyFileVersion("2.0.0.43")]