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

keep track of the position the input stream for decryption, makes it possible to give accurate progress information

Browse Source
This commit is contained in:
Thialfihar
2010-05-17 14:19:36 +00:00
parent eb636fce47
commit 51866bb2b2
3 changed files with 85 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/org/thialfihar/android/apg/DecryptActivity.java
View File

@@ -436,21 +436,26 @@ public class DecryptActivity extends BaseActivity {
Message msg = new Message();
try {
InputStream in = null;
PositionAwareInputStream in = null;
OutputStream out = null;
long size = 0;
if (mDecryptTarget == Id.target.message) {
String messageData = mMessage.getText().toString();
in = new ByteArrayInputStream(messageData.getBytes());
in = new PositionAwareInputStream(new ByteArrayInputStream(messageData.getBytes()));
out = new ByteArrayOutputStream();
size = messageData.getBytes().length;
} else {
in = new FileInputStream(mInputFilename);
in = new PositionAwareInputStream(new FileInputStream(mInputFilename));
out = new FileOutputStream(mOutputFilename);
File file = new File(mInputFilename);
size = file.length();
}
if (mSignedOnly) {
data = Apg.verifyText(this, in, out, this);
} else {
data = Apg.decrypt(this, in, out, Apg.getCachedPassPhrase(getSecretKeyId()),
data = Apg.decrypt(this, in, out, size, Apg.getCachedPassPhrase(getSecretKeyId()),
this, mAssumeSymmetricEncryption);
}