cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make number of secret keys imported part of ImportResult parcel

Browse Source
This commit is contained in:
Vincent Breitmoser
2014-08-20 21:51:57 +02:00
parent 9122d43d0a
commit 6c428fa6b5
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
View File

@@ -139,10 +139,10 @@ public class PgpImportExport {
// If there aren't even any keys, do nothing here.
if (entries == null || !entries.hasNext()) {
return new ImportKeyResult(
ImportKeyResult.RESULT_FAIL_NOTHING, mProviderHelper.getLog(), 0, 0, 0);
ImportKeyResult.RESULT_FAIL_NOTHING, mProviderHelper.getLog(), 0, 0, 0, 0);
}
int newKeys = 0, oldKeys = 0, badKeys = 0;
int newKeys = 0, oldKeys = 0, badKeys = 0, secret = 0;
int position = 0;
double progSteps = 100.0 / num;
@@ -177,6 +177,9 @@ public class PgpImportExport {
oldKeys += 1;
} else {
newKeys += 1;
if (key.isSecret()) {
secret += 1;
}
}
} catch (IOException e) {
@@ -213,7 +216,7 @@ public class PgpImportExport {
}
}
return new ImportKeyResult(resultType, log, newKeys, oldKeys, badKeys);
return new ImportKeyResult(resultType, log, newKeys, oldKeys, badKeys, secret);
}