diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-28 21:52:45 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-02 13:47:48 +0200 |
| commit | ed8b62c32b704ce2150bfdf7d4047c67648423a1 (patch) | |
| tree | 9a99bbd2cfbe6694c56d40b2f60f7f8827eab4d1 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java | |
| parent | a53da491c09fc7db814d4c2358ffe5dc9fe888bc (diff) | |
| download | open-keychain-ed8b62c32b704ce2150bfdf7d4047c67648423a1.tar.gz open-keychain-ed8b62c32b704ce2150bfdf7d4047c67648423a1.tar.bz2 open-keychain-ed8b62c32b704ce2150bfdf7d4047c67648423a1.zip | |
wrapped-key-ring: no UncachedSecretKeyRing after all
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java index 268906037..91bb89995 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java @@ -168,7 +168,7 @@ public class PgpImportExport { status = storeKeyRingInCache(new UncachedKeyRing(newPubRing), new UncachedKeyRing(secretKeyRing)); } else { - status = storeKeyRingInCache(new UncachedKeyRing((PGPPublicKeyRing) keyring)); + status = storeKeyRingInCache(new UncachedKeyRing(keyring)); } if (status == RETURN_ERROR) { @@ -288,13 +288,13 @@ public class PgpImportExport { public int storeKeyRingInCache(UncachedKeyRing ring, UncachedKeyRing secretRing) { int status; try { - UncachedSecretKeyRing secretKeyRing = null; + UncachedKeyRing secretKeyRing = null; // see what type we have. we can either have a secret + public keyring, or just public if (secretKeyRing != null) { mProviderHelper.saveKeyRing(ring, secretRing); status = RETURN_OK; } else { - mProviderHelper.saveKeyRing(ring); + mProviderHelper.savePublicKeyRing(ring); status = RETURN_OK; } } catch (IOException e) { |