From 1f7c7f49d481efd8e59e08b3d23023e2fc92cf75 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Wed, 22 Nov 2017 16:19:26 +0100
Subject: [PATCH] remove check for unsupported usb devices

---
 .../securitytoken/SecurityTokenConnection.java    |  4 ----
 .../UnsupportedSecurityTokenException.java        | 15 ---------------
 .../ui/base/BaseSecurityTokenActivity.java        |  6 ------
 OpenKeychain/src/main/res/values/strings.xml      |  1 -
 4 files changed, 26 deletions(-)
 delete mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/UnsupportedSecurityTokenException.java

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnection.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnection.java
index b82103320..1556cb259 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnection.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnection.java
@@ -1018,10 +1018,6 @@ public class SecurityTokenConnection {
         SecurityTokenInfo info = SecurityTokenInfo
                 .create(transportType, tokenType, fingerprints, aid, userId, url, pwInfo[4], pwInfo[6], hasLifeCycleManagement);
 
-        if (! info.isSecurityTokenSupported()) {
-            throw new UnsupportedSecurityTokenException();
-        }
-
         return info;
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/UnsupportedSecurityTokenException.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/UnsupportedSecurityTokenException.java
deleted file mode 100644
index 184f7296a..000000000
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/UnsupportedSecurityTokenException.java
+++ /dev/null
@@ -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);
-    }
-
-}
\ No newline at end of file
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 117dba444..0818f1570 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
@@ -47,7 +47,6 @@ import org.sufficientlysecure.keychain.securitytoken.SecurityTokenConnection;
 import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo;
 import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo.TokenType;
 import org.sufficientlysecure.keychain.securitytoken.Transport;
-import org.sufficientlysecure.keychain.securitytoken.UnsupportedSecurityTokenException;
 import org.sufficientlysecure.keychain.securitytoken.UsbConnectionDispatcher;
 import org.sufficientlysecure.keychain.securitytoken.usb.UsbTransport;
 import org.sufficientlysecure.keychain.securitytoken.usb.UsbTransportException;
@@ -251,11 +250,6 @@ public abstract class BaseSecurityTokenActivity extends BaseActivity
             return;
         }
 
-        if (e instanceof UnsupportedSecurityTokenException) {
-            onSecurityTokenError(getString(R.string.security_token_not_supported));
-            return;
-        }
-
         if (e instanceof CardException) {
             short status = ((CardException) e).getResponseCode();
 
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 7c094f61d..4e124c3dd 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -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_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_not_supported">"This Security Token is not supported by OpenKeychain."</string>
     <string name="security_token_error_try_again">"Try again"</string>
     <string name="btn_delete_original">Delete original file</string>