diff options
| author | grait <grandhiajit9@gmail.com> | 2014-03-08 03:24:16 +0530 |
|---|---|---|
| committer | grait <grandhiajit9@gmail.com> | 2014-03-08 03:27:22 +0530 |
| commit | 3fbda4245cf34d2f8e150e6a26ad4048cdb6b204 (patch) | |
| tree | 2d5c05e03bb82f235fba66c28ee70ff5ebf12554 /OpenPGP-Keychain/src | |
| parent | 2737aedca7e72f1f18d7b0f5418edbf52ab7fcaf (diff) | |
| download | open-keychain-3fbda4245cf34d2f8e150e6a26ad4048cdb6b204.tar.gz open-keychain-3fbda4245cf34d2f8e150e6a26ad4048cdb6b204.tar.bz2 open-keychain-3fbda4245cf34d2f8e150e6a26ad4048cdb6b204.zip | |
progress is shown when creating the default key based on number of keys created so far
Diffstat (limited to 'OpenPGP-Keychain/src')
2 files changed, 8 insertions, 1 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java index 313655766..be9d126b3 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -596,13 +596,20 @@ public class KeychainIntentService extends IntentService implements ProgressDial String passphrase = data.getString(GENERATE_KEY_SYMMETRIC_PASSPHRASE); /* Operation */ + int keysTotal = 2; + int keysCreated =0; + this.setProgress(keysCreated, keysTotal); PgpKeyOperation keyOperations = new PgpKeyOperation(this, this); PGPSecretKey masterKey = keyOperations.createKey(Id.choice.algorithm.rsa, 4096, passphrase, true); + keysCreated++; + setProgress(keysCreated, keysTotal); PGPSecretKey subKey = keyOperations.createKey(Id.choice.algorithm.rsa, 4096, passphrase, false); + keysCreated++; + setProgress(keysCreated, keysTotal ); // TODO: default to one master for cert, one sub for encrypt and one sub // for sign diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java index 898b0e67a..2507a77b1 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java @@ -187,7 +187,7 @@ public class EditKeyActivity extends ActionBarActivity { // Message is received after generating is done in ApgService KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler( - this, R.string.progress_generating, ProgressDialog.STYLE_SPINNER, true, + this, R.string.progress_generating, ProgressDialog.STYLE_HORIZONTAL, true, new DialogInterface.OnCancelListener() { @Override |