diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-18 10:00:21 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-18 10:00:21 +0200 |
commit | 1e45e5cd9ad4e38bcff347bc7d3b8f422a636519 (patch) | |
tree | e0e1e7d5fb28ae5156eda41e6cce3d477b58ac52 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | |
parent | d8b0015d25b12f1b82e1a044fb3b130844141fda (diff) | |
download | open-keychain-1e45e5cd9ad4e38bcff347bc7d3b8f422a636519.tar.gz open-keychain-1e45e5cd9ad4e38bcff347bc7d3b8f422a636519.tar.bz2 open-keychain-1e45e5cd9ad4e38bcff347bc7d3b8f422a636519.zip |
code cleanup in ProviderHelper and UncachedKeyRing
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java index cbdf6a64b..248d15ba6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -68,7 +68,7 @@ import java.util.Set; * name, it is not only a helper but actually the main interface for all * synchronous database operations. * - * Operations in this class write logs (TODO). These can be obtained from the + * Operations in this class write logs. These can be obtained from the * OperationResultParcel return values directly, but are also accumulated over * the lifetime of the executing ProviderHelper object unless the resetLog() * method is called to start a new one specifically. @@ -284,16 +284,8 @@ public class ProviderHelper { new String[]{ PgpKeyHelper.convertKeyIdToHex(masterKeyId) }); mIndent += 1; - try { - WrappedPublicKeyRing ring = getWrappedPublicKeyRing(KeyRings.buildUnifiedKeyRingUri(masterKeyId)); - // ring.get - - } catch(NotFoundException e) { - // no biggie - } - // Canonicalize this key, to assert a number of assumptions made about it. - keyRing = keyRing.canonicalizePublic(mLog, mIndent); + keyRing = keyRing.canonicalize(mLog, mIndent); if (keyRing == null) { return SaveKeyringResult.RESULT_ERROR; } |