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

fixed symmetric decrypting, stream didn't support .reset(), I guess, so now creating fresh streams where needed, and changed exception string to "" + e, rather than getMessage(), as that still can be null... annoying.

Browse Source
This commit is contained in:
Thialfihar
2010-05-21 02:47:40 +00:00
parent e5573973e7
commit 2c784554c7
7 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -373,9 +373,9 @@ public class DecryptActivity extends BaseActivity {
// look at the file/message again to check whether there's
// symmetric encryption data in there
if (mDecryptTarget == Id.target.file) {
((FileInputStream) in).reset();
in = new FileInputStream(mInputFilename);
} else {
((ByteArrayInputStream) in).reset();
in = new ByteArrayInputStream(mMessage.getText().toString().getBytes());
}
if (!Apg.hasSymmetricEncryption(this, in)) {
throw new Apg.GeneralException(getString(R.string.error_noKnownEncryptionFound));
@@ -396,9 +396,9 @@ public class DecryptActivity extends BaseActivity {
} catch (FileNotFoundException e) {
error = getString(R.string.error_fileNotFound);
} catch (IOException e) {
error = e.getLocalizedMessage();
error = "" + e;
} catch (Apg.GeneralException e) {
error = e.getLocalizedMessage();
error = "" + e;
}
if (error != null) {
Toast.makeText(this, getString(R.string.errorMessage, error),
@@ -479,14 +479,13 @@ public class DecryptActivity extends BaseActivity {
out).toByteArray()));
}
} catch (PGPException e) {
error = e.getMessage();
error = "" + e;
} catch (IOException e) {
error = e.getMessage();
error = "" + e;
} catch (SignatureException e) {
error = e.getMessage();
e.printStackTrace();
error = "" + e;
} catch (Apg.GeneralException e) {
error = e.getMessage();
error = "" + e;
}
data.putInt("type", Id.message.done);