moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-15 13:25:06 -05:00
Code Issues Releases Wiki Activity

fix comments and some warnings in PgpDecryptVerify

Browse Source
This commit is contained in:
Vincent Breitmoser 2015-02-17 18:43:43 +01:00
parent 260ffdf588
commit bb30cb5401
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
View File

@ -160,9 +160,6 @@ public class PgpDecryptVerify extends BaseOperation {
/** /**
* If detachedSignature != null, it will be used exclusively to verify the signature * If detachedSignature != null, it will be used exclusively to verify the signature
*
* @param detachedSignature
* @return
*/ */
public Builder setDetachedSignature(byte[] detachedSignature) { public Builder setDetachedSignature(byte[] detachedSignature) {
mDetachedSignature = detachedSignature; mDetachedSignature = detachedSignature;
@ -540,7 +537,7 @@ public class PgpDecryptVerify extends BaseOperation {
PGPLiteralData literalData = (PGPLiteralData) dataChunk; PGPLiteralData literalData = (PGPLiteralData) dataChunk;
// this is the encrypted size so if we enable compression this value is wrong! // reported size may be null if partial packets are involved (highly unlikely though)
Long originalSize = literalData.getDataLengthIfAvailable(); Long originalSize = literalData.getDataLengthIfAvailable();
String originalFilename = literalData.getFileName(); String originalFilename = literalData.getFileName();
@ -571,7 +568,7 @@ public class PgpDecryptVerify extends BaseOperation {
literalData.getModificationTime().getTime(), literalData.getModificationTime().getTime(),
originalSize == null ? 0 : originalSize); originalSize == null ? 0 : originalSize);
if (!originalFilename.equals("")) { if (!"".equals(originalFilename)) {
log.add(LogType.MSG_DC_CLEAR_META_FILE, indent + 1, originalFilename); log.add(LogType.MSG_DC_CLEAR_META_FILE, indent + 1, originalFilename);
} }
log.add(LogType.MSG_DC_CLEAR_META_MIME, indent + 1, log.add(LogType.MSG_DC_CLEAR_META_MIME, indent + 1,
@ -631,9 +628,8 @@ public class PgpDecryptVerify extends BaseOperation {
progress = 100; progress = 100;
} }
progressScaler.setProgress((int) progress, 100); progressScaler.setProgress((int) progress, 100);
} else {
// TODO: slow annealing to fake a progress?
} }
// TODO: slow annealing to fake a progress?
} }
if (signature != null) { if (signature != null) {
@ -849,9 +845,8 @@ public class PgpDecryptVerify extends BaseOperation {
progress = 100; progress = 100;
} }
progressScaler.setProgress((int) progress, 100); progressScaler.setProgress((int) progress, 100);
} else {
// TODO: slow annealing to fake a progress?
} }
// TODO: slow annealing to fake a progress?
} }
updateProgress(R.string.progress_verifying_signature, 90, 100); updateProgress(R.string.progress_verifying_signature, 90, 100);