cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix symmetric decryption (fixes #1672)

Browse Source
This commit is contained in:
Vincent Breitmoser
2016-01-12 13:28:17 +01:00
parent 2c4bf2fb51
commit 718668072b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
View File

@@ -200,8 +200,6 @@ public class PassphraseDialogActivity extends FragmentActivity {
return dialog; return dialog;
} }
long subKeyId = mRequiredInput.getSubKeyId();
LayoutInflater inflater = LayoutInflater.from(theme); LayoutInflater inflater = LayoutInflater.from(theme);
mLayout = (ViewAnimator) inflater.inflate(R.layout.passphrase_dialog, null); mLayout = (ViewAnimator) inflater.inflate(R.layout.passphrase_dialog, null);
alert.setView(mLayout); alert.setView(mLayout);
@@ -232,6 +230,8 @@ public class PassphraseDialogActivity extends FragmentActivity {
hint = getString(R.string.label_passphrase); hint = getString(R.string.label_passphrase);
} else { } else {
try { try {
long subKeyId = mRequiredInput.getSubKeyId();
ProviderHelper helper = new ProviderHelper(activity); ProviderHelper helper = new ProviderHelper(activity);
mSecretRing = helper.getCanonicalizedSecretKeyRing( mSecretRing = helper.getCanonicalizedSecretKeyRing(
KeychainContract.KeyRings.buildUnifiedKeyRingsFindBySubkeyUri(subKeyId)); KeychainContract.KeyRings.buildUnifiedKeyRingsFindBySubkeyUri(subKeyId));