aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenImportResetFragment.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2016-02-09 17:57:55 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2016-02-09 17:57:55 +0100
commit43e795695903eb600798a22c21e4bd07484d09c5 (patch)
tree5176e541b8b574f98fb4af3f5a42fa77732e5b0d /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenImportResetFragment.java
parent2c7e5ab8df69f461758c112f0e0e8d44f479b7e8 (diff)
parent08393bc5c32f774f8d8c65a22c1f033fa0a884df (diff)
downloadopen-keychain-43e795695903eb600798a22c21e4bd07484d09c5.tar.gz
open-keychain-43e795695903eb600798a22c21e4bd07484d09c5.tar.bz2
open-keychain-43e795695903eb600798a22c21e4bd07484d09c5.zip
Merge pull request #1715 from open-keychain/bouncy
Switch to Bouncy Castle
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenImportResetFragment.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenImportResetFragment.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenImportResetFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenImportResetFragment.java
index 81f782149..631848a67 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenImportResetFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenImportResetFragment.java
@@ -34,7 +34,7 @@ import android.widget.CompoundButton;
import android.widget.RadioButton;
import android.widget.TextView;
-import org.spongycastle.util.encoders.Hex;
+import org.bouncycastle.util.encoders.Hex;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
import org.sufficientlysecure.keychain.operations.results.ImportKeyResult;