diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-22 11:38:45 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-22 11:38:45 +0200 |
| commit | e76a8aaedfa001447cef3cceb3d0bcdc0aa55fc4 (patch) | |
| tree | 14cd6c8085c6ac797f19a89874046d2ee264f0d7 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider | |
| parent | 4469b84e2c2e87947354b1566f7fc5aa808d0f39 (diff) | |
| parent | 90324fc10efd015259c6f95c405dd91504c6c129 (diff) | |
| download | open-keychain-e76a8aaedfa001447cef3cceb3d0bcdc0aa55fc4.tar.gz open-keychain-e76a8aaedfa001447cef3cceb3d0bcdc0aa55fc4.tar.bz2 open-keychain-e76a8aaedfa001447cef3cceb3d0bcdc0aa55fc4.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | 3 |
1 files changed, 2 insertions, 1 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 099ed8c1f..214a9988c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -404,8 +404,9 @@ public class ProviderHelper { values.put(Keys.HAS_SECRET, 1); // then, mark exactly the keys we have available for (PGPSecretKey sub : new IterableIterator<PGPSecretKey>(keyRing.getSecretKeys())) { + S2K s2k = sub.getS2K(); // Set to 1, except if the encryption type is GNU_DUMMY_S2K - if(sub.getS2K().getType() != S2K.GNU_DUMMY_S2K) { + if(s2k == null || s2k.getType() != S2K.GNU_DUMMY_S2K) { mContentResolver.update(uri, values, Keys.KEY_ID + " = ?", new String[]{ Long.toString(sub.getKeyID()) }); |