diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-22 11:30:43 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-22 11:30:43 +0200 |
| commit | 90324fc10efd015259c6f95c405dd91504c6c129 (patch) | |
| tree | c1e51a13da2e197dfdefe35223d49d1a7bf68550 /OpenKeychain/src/main/java/org/sufficientlysecure | |
| parent | 30207ee11ffb05fdc1fcbcb02f5fe438be0d59d5 (diff) | |
| parent | 9cdb2ec4e270a572520d5bcdbee55867e3c37003 (diff) | |
| download | open-keychain-90324fc10efd015259c6f95c405dd91504c6c129.tar.gz open-keychain-90324fc10efd015259c6f95c405dd91504c6c129.tar.bz2 open-keychain-90324fc10efd015259c6f95c405dd91504c6c129.zip | |
Merge commit '9cdb2ec4e270a572520d5bcdbee55867e3c37003'
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure')
| -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()) }); |