diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-01 17:54:53 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-01 17:54:53 +0200 |
commit | 0bfac9989f801aa93d8bc336307d60b817995688 (patch) | |
tree | 862660bd27a28a14db7d9fa2a52bebaf41b6f57e /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java | |
parent | e10cbc54c606563b2d06f083bca17119ca585127 (diff) | |
parent | f72a07690c257fefb28aed6645ad898fded63a78 (diff) | |
download | open-keychain-0bfac9989f801aa93d8bc336307d60b817995688.tar.gz open-keychain-0bfac9989f801aa93d8bc336307d60b817995688.tar.bz2 open-keychain-0bfac9989f801aa93d8bc336307d60b817995688.zip |
Merge branch 'master' into yubikey
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java | 2 |
1 files changed, 1 insertions, 1 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())) { |