cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge SUPPORTED_PUT_KEY and SUPPORTED_RESET

Browse Source
This commit is contained in:
Dominik Schürmann
2017-11-05 22:59:11 +01:00
parent da186ca49f
commit 221eb194d9
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenInfo.java
View File

@@ -110,14 +110,7 @@ public abstract class SecurityTokenInfo implements Parcelable {
TokenType.GNUK_1_25_AND_NEWER TokenType.GNUK_1_25_AND_NEWER
)); ));
private static final HashSet<TokenType> SUPPORTED_USB_RESET = new HashSet<>(Arrays.asList( private static final HashSet<TokenType> SUPPORTED_USB_SETUP = new HashSet<>(Arrays.asList(
TokenType.YUBIKEY_NEO,
TokenType.YUBIKEY_4,
TokenType.NITROKEY_PRO,
TokenType.GNUK_1_25_AND_NEWER
));
private static final HashSet<TokenType> SUPPORTED_USB_PUT_KEY = new HashSet<>(Arrays.asList(
TokenType.YUBIKEY_NEO, TokenType.YUBIKEY_NEO,
TokenType.YUBIKEY_4, // Not clear, will be tested: https://github.com/open-keychain/open-keychain/issues/2069 TokenType.YUBIKEY_4, // Not clear, will be tested: https://github.com/open-keychain/open-keychain/issues/2069
TokenType.NITROKEY_PRO, TokenType.NITROKEY_PRO,
@@ -132,14 +125,14 @@ public abstract class SecurityTokenInfo implements Parcelable {
} }
public boolean isPutKeySupported() { public boolean isPutKeySupported() {
boolean isKnownSupported = SUPPORTED_USB_PUT_KEY.contains(getTokenType()); boolean isKnownSupported = SUPPORTED_USB_SETUP.contains(getTokenType());
boolean isNfcTransport = getTransportType() == TransportType.NFC; boolean isNfcTransport = getTransportType() == TransportType.NFC;
return isKnownSupported || isNfcTransport; return isKnownSupported || isNfcTransport;
} }
public boolean isResetSupported() { public boolean isResetSupported() {
boolean isKnownSupported = SUPPORTED_USB_RESET.contains(getTokenType()); boolean isKnownSupported = SUPPORTED_USB_SETUP.contains(getTokenType());
boolean isNfcTransport = getTransportType() == TransportType.NFC; boolean isNfcTransport = getTransportType() == TransportType.NFC;
boolean hasLifeCycleManagement = hasLifeCycleManagement(); boolean hasLifeCycleManagement = hasLifeCycleManagement();