diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-21 21:41:51 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-21 21:41:51 +0200 |
commit | 6d7daec37f9ac7efbdd687c97ca45f9c9ddc5602 (patch) | |
tree | e8e62537c6fbf70a0d5623e5ae0fbf24221af7fb /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui | |
parent | ab6c47a9b3642b9f7fe2e3bb45ebbd971517d7e1 (diff) | |
download | open-keychain-6d7daec37f9ac7efbdd687c97ca45f9c9ddc5602.tar.gz open-keychain-6d7daec37f9ac7efbdd687c97ca45f9c9ddc5602.tar.bz2 open-keychain-6d7daec37f9ac7efbdd687c97ca45f9c9ddc5602.zip |
wrapped-key-ring: use CachedKeyRing where possible
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java index 20223e319..cb58f8734 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java @@ -33,6 +33,7 @@ import com.beardedhen.androidbootstrap.BootstrapButton; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; +import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.remote.AccountSettings; import org.sufficientlysecure.keychain.ui.EditKeyActivity; @@ -179,9 +180,10 @@ public class AccountSettingsFragment extends Fragment implements // select newly created key try { long masterKeyId = new ProviderHelper(getActivity()) - .extractOrGetMasterKeyId(data.getData()); + .getCachedPublicKeyRing(data.getData()) + .extractOrGetMasterKeyId(); mSelectKeyFragment.selectKey(masterKeyId); - } catch (ProviderHelper.NotFoundException e) { + } catch (PgpGeneralException e) { Log.e(Constants.TAG, "key not found!", e); } } |