From 3976eadf060a0f5f18a05587dc597f9e83466f84 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 31 May 2015 05:16:41 +0200
Subject: [PATCH] handle empty passphrases in PassphraseDialogActivity

---
 .../keychain/ui/PassphraseDialogActivity.java | 25 +++++++++++++++++++
 .../ui/base/CryptoOperationFragment.java      |  9 +++++++
 2 files changed, 34 insertions(+)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
index 4ec4e2c84..4b4e71f6e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
@@ -45,6 +45,7 @@ import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.compatibility.DialogFragmentWorkaround;
 import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey;
+import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey.SecretKeyType;
 import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKeyRing;
 import org.sufficientlysecure.keychain.pgp.KeyRing;
 import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
@@ -52,6 +53,7 @@ import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
 import org.sufficientlysecure.keychain.provider.CachedPublicKeyRing;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.provider.ProviderHelper.NotFoundException;
 import org.sufficientlysecure.keychain.remote.CryptoInputParcelCacheService;
 import org.sufficientlysecure.keychain.service.PassphraseCacheService;
 import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
@@ -102,6 +104,29 @@ public class PassphraseDialogActivity extends FragmentActivity {
                     break;
                 }
                 case PASSPHRASE: {
+
+                    // handle empty passphrases by directly returning an empty crypto input parcel
+                    try {
+                        CanonicalizedSecretKeyRing pubRing =
+                                new ProviderHelper(this).getCanonicalizedSecretKeyRing(
+                                        requiredInput.getMasterKeyId());
+                        // use empty passphrase for empty passphrase
+                        if (pubRing.getSecretKey(requiredInput.getSubKeyId()).getSecretKeyType() ==
+                                SecretKeyType.PASSPHRASE_EMPTY) {
+                            // also return passphrase back to activity
+                            Intent returnIntent = new Intent();
+                            returnIntent.putExtra(RESULT_CRYPTO_INPUT, new CryptoInputParcel(new Passphrase("")));
+                            setResult(RESULT_OK, returnIntent);
+                            finish();
+                            return;
+                        }
+                    } catch (NotFoundException e) {
+                        Log.e(Constants.TAG, "Key not found?!", e);
+                        setResult(RESULT_CANCELED);
+                        finish();
+                        return;
+                    }
+
                     keyId = requiredInput.getSubKeyId();
                     break;
                 }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java
index 3b92f7208..003ee1000 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java
@@ -24,13 +24,22 @@ import android.os.Bundle;
 import android.os.Message;
 import android.support.v4.app.Fragment;
 
+import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.operations.results.InputPendingResult;
 import org.sufficientlysecure.keychain.operations.results.OperationResult;
+import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey.SecretKeyType;
+import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKeyRing;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.provider.ProviderHelper.NotFoundException;
 import org.sufficientlysecure.keychain.service.ServiceProgressHandler;
 import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
 import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
 import org.sufficientlysecure.keychain.ui.NfcOperationActivity;
 import org.sufficientlysecure.keychain.ui.PassphraseDialogActivity;
+import org.sufficientlysecure.keychain.ui.util.Notify;
+import org.sufficientlysecure.keychain.ui.util.Notify.Style;
+import org.sufficientlysecure.keychain.util.Passphrase;
+
 
 /**
  * All fragments executing crypto operations need to extend this class.