aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2016-01-12 13:28:17 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2016-01-12 13:28:27 +0100
commit718668072b3a2bbe4dcb5b7ed5ee66b84e3f78be (patch)
tree0d281b7d656da7d9017f4926b738504428fb35ea /OpenKeychain/src/main/java/org
parent2c4bf2fb5129feb248bd89017051ed8eecc9e337 (diff)
downloadopen-keychain-718668072b3a2bbe4dcb5b7ed5ee66b84e3f78be.tar.gz
open-keychain-718668072b3a2bbe4dcb5b7ed5ee66b84e3f78be.tar.bz2
open-keychain-718668072b3a2bbe4dcb5b7ed5ee66b84e3f78be.zip
fix symmetric decryption (fixes #1672)
Diffstat (limited to 'OpenKeychain/src/main/java/org')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java4
1 files changed, 2 insertions, 2 deletions
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));