From 313b4ac7d34b7d958e9880d0d47e78f319e91140 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Sat, 30 May 2015 00:20:11 +0200 Subject: rewrite data flow in EncryptFileFragment preserve state correctly --- .../keychain/ui/EncryptModeAsymmetricFragment.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java index 3b4db6c08..258a9b3dc 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java @@ -85,11 +85,9 @@ public class EncryptModeAsymmetricFragment extends EncryptModeFragment { mProviderHelper = new ProviderHelper(getActivity()); // preselect keys given, from state or arguments - long signatureKeyId, encryptionKeyIds[]; - if (savedInstanceState == null) { - signatureKeyId = getArguments().getLong(ARG_SINGATURE_KEY_ID); - encryptionKeyIds = getArguments().getLongArray(ARG_ENCRYPTION_KEY_IDS); + Long signatureKeyId = getArguments().getLong(ARG_SINGATURE_KEY_ID); + long[] encryptionKeyIds = getArguments().getLongArray(ARG_ENCRYPTION_KEY_IDS); preselectKeys(signatureKeyId, encryptionKeyIds); } @@ -98,8 +96,8 @@ public class EncryptModeAsymmetricFragment extends EncryptModeFragment { /** * If an Intent gives a signatureMasterKeyId and/or encryptionMasterKeyIds, preselect those! */ - private void preselectKeys(long signatureKeyId, long[] encryptionKeyIds) { - if (signatureKeyId != Constants.key.none) { + private void preselectKeys(Long signatureKeyId, long[] encryptionKeyIds) { + if (signatureKeyId != null) { try { CachedPublicKeyRing keyring = mProviderHelper.getCachedPublicKeyRing( KeyRings.buildUnifiedKeyRingUri(signatureKeyId)); -- cgit v1.2.3