From 718668072b3a2bbe4dcb5b7ed5ee66b84e3f78be Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 12 Jan 2016 13:28:17 +0100
Subject: fix symmetric decryption (fixes #1672)

---
 .../org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain')

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 b934f3d5f..5b0dd0d57 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
@@ -200,8 +200,6 @@ public class PassphraseDialogActivity extends FragmentActivity {
                 return dialog;
             }
 
-            long subKeyId = mRequiredInput.getSubKeyId();
-
             LayoutInflater inflater = LayoutInflater.from(theme);
             mLayout = (ViewAnimator) inflater.inflate(R.layout.passphrase_dialog, null);
             alert.setView(mLayout);
@@ -232,6 +230,8 @@ public class PassphraseDialogActivity extends FragmentActivity {
                 hint = getString(R.string.label_passphrase);
             } else {
                 try {
+                    long subKeyId = mRequiredInput.getSubKeyId();
+
                     ProviderHelper helper = new ProviderHelper(activity);
                     mSecretRing = helper.getCanonicalizedSecretKeyRing(
                             KeychainContract.KeyRings.buildUnifiedKeyRingsFindBySubkeyUri(subKeyId));
-- 
cgit v1.2.3