diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenActivity.java index e98277891..394b31318 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenActivity.java @@ -45,6 +45,7 @@ import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo; import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo.TokenType; import org.sufficientlysecure.keychain.securitytoken.Transport; import org.sufficientlysecure.keychain.securitytoken.UsbConnectionDispatcher; +import org.sufficientlysecure.keychain.securitytoken.usb.UnsupportedUsbTokenException; import org.sufficientlysecure.keychain.securitytoken.usb.UsbTransport; import org.sufficientlysecure.keychain.securitytoken.usb.UsbTransportException; import org.sufficientlysecure.keychain.service.PassphraseCacheService; @@ -232,6 +233,11 @@ public abstract class BaseSecurityTokenActivity extends BaseActivity private void handleSecurityTokenError(SecurityTokenConnection stConnection, IOException e) { Log.d(Constants.TAG, "Exception in handleSecurityTokenError", e); + if (e instanceof UnsupportedUsbTokenException) { + onSecurityTokenError(getString(R.string.security_token_not_supported)); + return; + } + if (e instanceof TagLostException) { onSecurityTokenError(getString(R.string.security_token_error_tag_lost)); return; diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index cf2ab4b5f..062f4d968 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1597,6 +1597,7 @@ "Security Token does not support the required communication standard (ISO-DEP, ISO 14443-4)" "Communication error. Most probably, the Security Token has been taken off too early." "Try again" + "This Security Token is not yet supported by OpenKeychain" Delete original file "Filenames are encrypted."