GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 08:37:25 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#1939 Duplicate call detector enhancements and unit testing. (#1980)

Browse Source 
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
Denny Sheirer
2024-09-15 08:39:53 -04:00
committed by GitHub
parent 8bb59d581f
commit e00cd90aef
8 changed files with 524 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/io/github/dsheirer/module/decode/p25/identifier/encryption/APCO25EncryptionKey.java
View File

@@ -1,23 +1,20 @@
/*
* *****************************************************************************
* Copyright (C) 2014-2024 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.module.decode.p25.identifier.encryption;
@@ -75,4 +72,12 @@ public class APCO25EncryptionKey extends EncryptionKey
{
return new APCO25EncryptionKey(algorithm, keyId);
}
/**
* Creates a new APCO-25 encryption algorithm
*/
public static APCO25EncryptionKey create(Encryption encryption, int keyId)
{
return create(encryption.getValue(), keyId);
}
}

14
src/main/java/io/github/dsheirer/module/decode/p25/reference/Encryption.java
View File

@@ -78,6 +78,20 @@ public enum Encryption
return mLabel;
}
/**
* Encryption type value.
* @return value.
*/
public int getValue()
{
return mValue;
}
/**
* Utility method to lookup the encryption type from the value.
* @param value of the encryption type.
* @return enumeration entry or UNKNOWN.
*/
public static Encryption fromValue(int value)
{
switch(value)