diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-01 17:36:34 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-01 17:46:04 +0200 |
commit | f555447011a4d975e87d99ddc5f512c3205c2211 (patch) | |
tree | 35702ca78f4a120d12385c71a6642727370cc7a5 /OpenKeychain/src/main/java | |
parent | 827a958e123184ae70c2c5e5b10ab47f50ef1a52 (diff) | |
download | open-keychain-f555447011a4d975e87d99ddc5f512c3205c2211.tar.gz open-keychain-f555447011a4d975e87d99ddc5f512c3205c2211.tar.bz2 open-keychain-f555447011a4d975e87d99ddc5f512c3205c2211.zip |
fix dumb mistake in modifySecretKey
Diffstat (limited to 'OpenKeychain/src/main/java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java index 861f93446..19b0d81b7 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java @@ -609,7 +609,7 @@ public class PgpKeyOperation { for (int i = 0; i < saveParcel.mAddSubKeys.size(); i++) { progress(R.string.progress_modify_subkeyadd, (i-1) * (100 / saveParcel.mAddSubKeys.size())); - SaveKeyringParcel.SubkeyAdd add = saveParcel.mAddSubKeys.get(0); + SaveKeyringParcel.SubkeyAdd add = saveParcel.mAddSubKeys.get(i); log.add(LogLevel.INFO, LogType.MSG_MF_SUBKEY_NEW, indent); if (add.mExpiry != null && new Date(add.mExpiry*1000).before(new Date())) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java index 358b1c552..4a03d942b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java @@ -169,6 +169,7 @@ public class UncachedPublicKey { } @SuppressWarnings("unchecked") + // TODO make this safe public int getKeyUsage() { if(mCacheUsage == null) { mCacheUsage = 0; @@ -182,11 +183,6 @@ public class UncachedPublicKey { if (hashed != null) { mCacheUsage |= hashed.getKeyFlags(); } - - PGPSignatureSubpacketVector unhashed = sig.getUnhashedSubPackets(); - if (unhashed != null) { - mCacheUsage |= unhashed.getKeyFlags(); - } } } } |