aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
diff options
context:
space:
mode:
authorAshley Hughes <spirit.returned@gmail.com>2014-03-02 20:34:28 +0000
committerAshley Hughes <spirit.returned@gmail.com>2014-03-02 20:34:28 +0000
commitd6b0975f9b666dc30edab36e6f2c68c0022790d1 (patch)
treecf6c023e5544401bef719c5b29f901de3b0a010d /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
parentfa533dda325b5d56db16dee2f84152ec4807a2b2 (diff)
downloadopen-keychain-d6b0975f9b666dc30edab36e6f2c68c0022790d1.tar.gz
open-keychain-d6b0975f9b666dc30edab36e6f2c68c0022790d1.tar.bz2
open-keychain-d6b0975f9b666dc30edab36e6f2c68c0022790d1.zip
begin adding parcel for save intent
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java')
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
index a6ff60442..a52f247c6 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
@@ -29,6 +29,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.Iterator;
+import java.util.List;
import java.util.TimeZone;
import org.spongycastle.bcpg.CompressionAlgorithmTags;
@@ -490,11 +491,14 @@ public class PgpKeyOperation {
masterKeyPair, mainUserId, sha1Calc, hashedPacketsGen.generate(),
unhashedPacketsGen.generate(), certificationSignerBuilder, keyEncryptor);
- //updating master is slightly different to updating the others
- if (modded_keys[0]) {
+ for (int i = 0; i < keys.size(); ++i) {
+ updateProgress(40 + 50 * (i - 1) / (keys.size() - 1), 100);
+ if (new_keys[i]) {
- }
+ } else {
+ }
+ }
updateProgress(R.string.progress_adding_sub_keys, 40, 100);
for (int i = 1; i < keys.size(); ++i) {