remove check for unsupported usb devices
This commit is contained in:
parent
8c2c131be6
commit
1f7c7f49d4
|
@ -1018,10 +1018,6 @@ public class SecurityTokenConnection {
|
||||||
SecurityTokenInfo info = SecurityTokenInfo
|
SecurityTokenInfo info = SecurityTokenInfo
|
||||||
.create(transportType, tokenType, fingerprints, aid, userId, url, pwInfo[4], pwInfo[6], hasLifeCycleManagement);
|
.create(transportType, tokenType, fingerprints, aid, userId, url, pwInfo[4], pwInfo[6], hasLifeCycleManagement);
|
||||||
|
|
||||||
if (! info.isSecurityTokenSupported()) {
|
|
||||||
throw new UnsupportedSecurityTokenException();
|
|
||||||
}
|
|
||||||
|
|
||||||
return info;
|
return info;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,15 +0,0 @@
|
||||||
package org.sufficientlysecure.keychain.securitytoken;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
public class UnsupportedSecurityTokenException extends IOException {
|
|
||||||
|
|
||||||
UnsupportedSecurityTokenException() {
|
|
||||||
super();
|
|
||||||
}
|
|
||||||
|
|
||||||
UnsupportedSecurityTokenException(String detailMessage) {
|
|
||||||
super(detailMessage);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -47,7 +47,6 @@ import org.sufficientlysecure.keychain.securitytoken.SecurityTokenConnection;
|
||||||
import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo;
|
import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo;
|
||||||
import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo.TokenType;
|
import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo.TokenType;
|
||||||
import org.sufficientlysecure.keychain.securitytoken.Transport;
|
import org.sufficientlysecure.keychain.securitytoken.Transport;
|
||||||
import org.sufficientlysecure.keychain.securitytoken.UnsupportedSecurityTokenException;
|
|
||||||
import org.sufficientlysecure.keychain.securitytoken.UsbConnectionDispatcher;
|
import org.sufficientlysecure.keychain.securitytoken.UsbConnectionDispatcher;
|
||||||
import org.sufficientlysecure.keychain.securitytoken.usb.UsbTransport;
|
import org.sufficientlysecure.keychain.securitytoken.usb.UsbTransport;
|
||||||
import org.sufficientlysecure.keychain.securitytoken.usb.UsbTransportException;
|
import org.sufficientlysecure.keychain.securitytoken.usb.UsbTransportException;
|
||||||
|
@ -251,11 +250,6 @@ public abstract class BaseSecurityTokenActivity extends BaseActivity
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (e instanceof UnsupportedSecurityTokenException) {
|
|
||||||
onSecurityTokenError(getString(R.string.security_token_not_supported));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (e instanceof CardException) {
|
if (e instanceof CardException) {
|
||||||
short status = ((CardException) e).getResponseCode();
|
short status = ((CardException) e).getResponseCode();
|
||||||
|
|
||||||
|
|
|
@ -1596,7 +1596,6 @@
|
||||||
<string name="security_token_error_tag_lost">"Security Token has been taken off too early. Keep the Security Token at the back until the operation finishes."</string>
|
<string name="security_token_error_tag_lost">"Security Token has been taken off too early. Keep the Security Token at the back until the operation finishes."</string>
|
||||||
<string name="security_token_error_iso_dep_not_supported">"Security Token does not support the required communication standard (ISO-DEP, ISO 14443-4)"</string>
|
<string name="security_token_error_iso_dep_not_supported">"Security Token does not support the required communication standard (ISO-DEP, ISO 14443-4)"</string>
|
||||||
<string name="security_token_error_generic">"Communication error. Most probably, the Security Token has been taken off too early."</string>
|
<string name="security_token_error_generic">"Communication error. Most probably, the Security Token has been taken off too early."</string>
|
||||||
<string name="security_token_not_supported">"This Security Token is not supported by OpenKeychain."</string>
|
|
||||||
<string name="security_token_error_try_again">"Try again"</string>
|
<string name="security_token_error_try_again">"Try again"</string>
|
||||||
<string name="btn_delete_original">Delete original file</string>
|
<string name="btn_delete_original">Delete original file</string>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue