PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

give decryption a moving progress bar for a data of unknown size

Browse source
This commit is contained in:
Thialfihar 2010-05-04 15:20:30 +00:00
parent 6b52878056
commit f34fcaabf3
1 changed files with 35 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/org/thialfihar/android/apg/Apg.java
View file

@ -1484,7 +1484,8 @@ public class Apg {
Object o = pgpF.nextObject(); Object o = pgpF.nextObject();
long signatureKeyId = 0; long signatureKeyId = 0;
progress.setProgress("reading data...", 0, 100); int currentProgress = 0;
progress.setProgress("reading data...", currentProgress, 100);
if (o instanceof PGPEncryptedDataList) { if (o instanceof PGPEncryptedDataList) {
enc = (PGPEncryptedDataList) o; enc = (PGPEncryptedDataList) o;
@ -1499,6 +1500,8 @@ public class Apg {
InputStream clear = null; InputStream clear = null;
PGPEncryptedData encryptedData = null; PGPEncryptedData encryptedData = null;
currentProgress += 5;
// TODO: currently we always only look at the first known key or symmetric encryption, // TODO: currently we always only look at the first known key or symmetric encryption,
// there might be more... // there might be more...
if (assumeSymmetric) { if (assumeSymmetric) {
@ -1517,11 +1520,12 @@ public class Apg {
throw new GeneralException("couldn't find a packet with symmetric encryption"); throw new GeneralException("couldn't find a packet with symmetric encryption");
} }
progress.setProgress("preparing streams...", 20, 100); progress.setProgress("preparing stream...", currentProgress, 100);
clear = pbe.getDataStream(passPhrase.toCharArray(), new BouncyCastleProvider()); clear = pbe.getDataStream(passPhrase.toCharArray(), new BouncyCastleProvider());
encryptedData = pbe; encryptedData = pbe;
currentProgress += 5;
} else { } else {
progress.setProgress("finding key...", 10, 100); progress.setProgress("finding key...", currentProgress, 100);
PGPPublicKeyEncryptedData pbe = null; PGPPublicKeyEncryptedData pbe = null;
PGPSecretKey secretKey = null; PGPSecretKey secretKey = null;
Iterator it = enc.getEncryptedDataObjects(); Iterator it = enc.getEncryptedDataObjects();
@ -1542,7 +1546,8 @@ public class Apg {
throw new GeneralException("couldn't find a secret key to decrypt"); throw new GeneralException("couldn't find a secret key to decrypt");
} }
progress.setProgress("extracting key...", 20, 100); currentProgress += 5;
progress.setProgress("extracting key...", currentProgress, 100);
PGPPrivateKey privateKey = null; PGPPrivateKey privateKey = null;
try { try {
privateKey = secretKey.extractPrivateKey(passPhrase.toCharArray(), privateKey = secretKey.extractPrivateKey(passPhrase.toCharArray(),
@ -1550,10 +1555,11 @@ public class Apg {
} catch (PGPException e) { } catch (PGPException e) {
throw new PGPException("wrong pass phrase"); throw new PGPException("wrong pass phrase");
} }
currentProgress += 5;
progress.setProgress("preparing streams...", 30, 100); progress.setProgress("preparing stream...", currentProgress, 100);
clear = pbe.getDataStream(privateKey, new BouncyCastleProvider()); clear = pbe.getDataStream(privateKey, new BouncyCastleProvider());
encryptedData = pbe; encryptedData = pbe;
currentProgress += 5;
} }
PGPObjectFactory plainFact = new PGPObjectFactory(clear); PGPObjectFactory plainFact = new PGPObjectFactory(clear);
@ -1563,15 +1569,16 @@ public class Apg {
int signatureIndex = -1; int signatureIndex = -1;
if (dataChunk instanceof PGPCompressedData) { if (dataChunk instanceof PGPCompressedData) {
progress.setProgress("decompressing data...", 50, 100); progress.setProgress("decompressing data...", currentProgress, 100);
PGPObjectFactory fact = PGPObjectFactory fact =
new PGPObjectFactory(((PGPCompressedData) dataChunk).getDataStream()); new PGPObjectFactory(((PGPCompressedData) dataChunk).getDataStream());
dataChunk = fact.nextObject(); dataChunk = fact.nextObject();
plainFact = fact; plainFact = fact;
currentProgress += 10;
} }
if (dataChunk instanceof PGPOnePassSignatureList) { if (dataChunk instanceof PGPOnePassSignatureList) {
progress.setProgress("processing signature...", 60, 100); progress.setProgress("processing signature...", currentProgress, 100);
returnData.putBoolean("signature", true); returnData.putBoolean("signature", true);
PGPOnePassSignatureList sigList = (PGPOnePassSignatureList) dataChunk; PGPOnePassSignatureList sigList = (PGPOnePassSignatureList) dataChunk;
for (int i = 0; i < sigList.size(); ++i) { for (int i = 0; i < sigList.size(); ++i) {
@ -1604,31 +1611,44 @@ public class Apg {
} }
dataChunk = plainFact.nextObject(); dataChunk = plainFact.nextObject();
currentProgress += 10;
} }
if (dataChunk instanceof PGPLiteralData) { if (dataChunk instanceof PGPLiteralData) {
progress.setProgress("decrypting data...", 70, 100); progress.setProgress("decrypting data...", currentProgress, 100);
PGPLiteralData literalData = (PGPLiteralData) dataChunk; PGPLiteralData literalData = (PGPLiteralData) dataChunk;
OutputStream out = outStream; OutputStream out = outStream;
byte[] buffer = new byte[1 << 16]; byte[] buffer = new byte[1 << 16];
InputStream dataIn = literalData.getInputStream(); InputStream dataIn = literalData.getInputStream();
int bytesRead = 0; int startProgress = currentProgress;
while ((bytesRead = dataIn.read(buffer)) > 0) { int endProgress = 100;
out.write(buffer, 0, bytesRead); if (signature != null) {
endProgress = 90;
} else if (encryptedData.isIntegrityProtected()) {
endProgress = 95;
}
int n = 0;
int done = 0;
while ((n = dataIn.read(buffer)) > 0) {
out.write(buffer, 0, n);
done += n;
if (signature != null) { if (signature != null) {
try { try {
signature.update(buffer, 0, bytesRead); signature.update(buffer, 0, n);
} catch (SignatureException e) { } catch (SignatureException e) {
returnData.putBoolean("signatureSuccess", false); returnData.putBoolean("signatureSuccess", false);
signature = null; signature = null;
} }
} }
// unknown size, but try to at least have a moving, slowing down progress bar
currentProgress = startProgress + (endProgress - startProgress) * done / (done + 100000);
progress.setProgress(currentProgress, 100);
} }
if (signature != null) { if (signature != null) {
progress.setProgress("verifying signature...", 80, 100); progress.setProgress("verifying signature...", 90, 100);
PGPSignatureList signatureList = (PGPSignatureList) plainFact.nextObject(); PGPSignatureList signatureList = (PGPSignatureList) plainFact.nextObject();
PGPSignature messageSignature = (PGPSignature) signatureList.get(signatureIndex); PGPSignature messageSignature = (PGPSignature) signatureList.get(signatureIndex);
if (signature.verify(messageSignature)) { if (signature.verify(messageSignature)) {
@ -1641,7 +1661,7 @@ public class Apg {
// TODO: add integrity somewhere // TODO: add integrity somewhere
if (encryptedData.isIntegrityProtected()) { if (encryptedData.isIntegrityProtected()) {
progress.setProgress("verifying integrity...", 90, 100); progress.setProgress("verifying integrity...", 95, 100);
if (encryptedData.verify()) { if (encryptedData.verify()) {
// passed // passed
} else { } else {