aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2016-04-30 15:24:09 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2016-04-30 15:24:09 +0200
commitd72001c6907ff50890673cd91b266c34c73ec84b (patch)
tree2042e45a5997c7f0a36d7eab7803465631584bbf /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken
parent562d0016be676795bb837761db90ab8dfef3f6cf (diff)
downloadopen-keychain-d72001c6907ff50890673cd91b266c34c73ec84b.tar.gz
open-keychain-d72001c6907ff50890673cd91b266c34c73ec84b.tar.bz2
open-keychain-d72001c6907ff50890673cd91b266c34c73ec84b.zip
Fix animation in manage keys for security tokens
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/NfcTransport.java4
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java1
2 files changed, 2 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/NfcTransport.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/NfcTransport.java
index 3b2dd838d..ba36ebdf0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/NfcTransport.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/NfcTransport.java
@@ -19,7 +19,7 @@ package org.sufficientlysecure.keychain.securitytoken;
import android.nfc.Tag;
-import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenNfcActivity;
+import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenActivity;
import java.io.IOException;
@@ -83,7 +83,7 @@ public class NfcTransport implements Transport {
public void connect() throws IOException {
mIsoCard = AndroidCard.get(mTag);
if (mIsoCard == null) {
- throw new BaseSecurityTokenNfcActivity.IsoDepNotSupportedException("Tag does not support ISO-DEP (ISO 14443-4)");
+ throw new BaseSecurityTokenActivity.IsoDepNotSupportedException("Tag does not support ISO-DEP (ISO 14443-4)");
}
mIsoCard.setTimeout(TIMEOUT);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java
index 0040d6958..30893afb6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java
@@ -341,7 +341,6 @@ public class SecurityTokenHelper {
}
}
-
/**
* Puts a key on the token in the given slot.
*