From 5db08b9bdc3fe93347c1ecc35147dbcb8f98e2be Mon Sep 17 00:00:00 2001
From: Ash Hughes <spirit.returned@googlemail.com>
Date: Mon, 13 May 2013 15:10:52 +0100
Subject: 2/2 use forked spongycastle to speed up secret key imports

---
 .../org/sufficientlysecure/keychain/helper/PgpHelper.java   | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'OpenPGP-Keychain/src')

diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpHelper.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpHelper.java
index 810f3a6f2..60450ffb8 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpHelper.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpHelper.java
@@ -480,18 +480,7 @@ public class PgpHelper {
     }
 
     public static boolean isSecretKeyPrivateEmpty(PGPSecretKey secretKey) {
-        try {
-            PBESecretKeyDecryptor keyDecryptor = new JcePBESecretKeyDecryptorBuilder()
-                    .setProvider(PgpMain.BOUNCY_CASTLE_PROVIDER_NAME).build(new char[] {});
-            PGPPrivateKey testKey = secretKey.extractPrivateKey(
-                    keyDecryptor);
-            if (testKey != null) {
-                return false;
-            }
-        } catch (PGPException e) { //exception if wrong key => not empty
-            return false; //all good if this fails, we likely didn't use the right password
-        }
-        return true;
+        return secretKey.isPrivateKeyEmpty();
     }
 
     public static boolean isSecretKeyPrivateEmpty(Context context, long keyId) {
-- 
cgit v1.2.3