aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-06-16 16:23:15 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-06-16 22:00:57 +0200
commit2f0e70587dfc21ce5c3d826f3d96b8231674f022 (patch)
treead7fcfb5935180f343333b686479561f5efafe32 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
parent109bea754207e960a22eaea7df819273df51112f (diff)
downloadopen-keychain-2f0e70587dfc21ce5c3d826f3d96b8231674f022.tar.gz
open-keychain-2f0e70587dfc21ce5c3d826f3d96b8231674f022.tar.bz2
open-keychain-2f0e70587dfc21ce5c3d826f3d96b8231674f022.zip
add more progress info from import routine
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
index e1967429a..3681d62d8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
@@ -37,6 +37,7 @@ import org.sufficientlysecure.keychain.service.OperationResultParcel.OperationLo
import org.sufficientlysecure.keychain.service.OperationResults.ImportResult;
import org.sufficientlysecure.keychain.service.OperationResults.SaveKeyringResult;
import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.util.ProgressScaler;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -130,6 +131,7 @@ public class PgpImportExport {
int newKeys = 0, oldKeys = 0, badKeys = 0;
int position = 0;
+ int progSteps = 100 / entries.size();
for (ParcelableKeyRing entry : entries) {
try {
UncachedKeyRing key = UncachedKeyRing.decodeFromData(entry.getBytes());
@@ -149,7 +151,8 @@ public class PgpImportExport {
if (key.isSecret()) {
result = mProviderHelper.saveSecretKeyRing(key);
} else {
- result = mProviderHelper.savePublicKeyRing(key);
+ result = mProviderHelper.savePublicKeyRing(key,
+ new ProgressScaler(mProgressable, position, (position+1)*progSteps, 100));
}
if (!result.success()) {
badKeys += 1;
@@ -165,7 +168,6 @@ public class PgpImportExport {
}
// update progress
position++;
- updateProgress(position / entries.size() * 100, 100);
}
OperationLog log = mProviderHelper.getLog();