aboutsummaryrefslogtreecommitdiffstats
path: root/src/org/thialfihar/android/apg/EncryptActivity.java
diff options
context:
space:
mode:
authorThialfihar <thialfihar@gmail.com>2010-05-21 02:47:40 +0000
committerThialfihar <thialfihar@gmail.com>2010-05-21 02:47:40 +0000
commit2c784554c771da4d5d37b3895e94d494418fae3d (patch)
treeaa00d87ca6d5816acf25a4878444869f3c67c47f /src/org/thialfihar/android/apg/EncryptActivity.java
parente5573973e767a87b2a70372c89775dcaddc50b36 (diff)
downloadopen-keychain-2c784554c771da4d5d37b3895e94d494418fae3d.tar.gz
open-keychain-2c784554c771da4d5d37b3895e94d494418fae3d.tar.bz2
open-keychain-2c784554c771da4d5d37b3895e94d494418fae3d.zip
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.
Diffstat (limited to 'src/org/thialfihar/android/apg/EncryptActivity.java')
-rw-r--r--src/org/thialfihar/android/apg/EncryptActivity.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/org/thialfihar/android/apg/EncryptActivity.java b/src/org/thialfihar/android/apg/EncryptActivity.java
index 073e9dc9c..d76b568a6 100644
--- a/src/org/thialfihar/android/apg/EncryptActivity.java
+++ b/src/org/thialfihar/android/apg/EncryptActivity.java
@@ -585,17 +585,17 @@ public class EncryptActivity extends BaseActivity {
data.putString("message", new String(((ByteArrayOutputStream)out).toByteArray()));
}
} catch (IOException e) {
- error = e.getMessage();
+ error = "" + e;
} catch (PGPException e) {
- error = e.getMessage();
+ error = "" + e;
} catch (NoSuchProviderException e) {
- error = e.getMessage();
+ error = "" + e;
} catch (NoSuchAlgorithmException e) {
- error = e.getMessage();
+ error = "" + e;
} catch (SignatureException e) {
- error = e.getMessage();
+ error = "" + e;
} catch (Apg.GeneralException e) {
- error = e.getMessage();
+ error = "" + e;
}
data.putInt("type", Id.message.done);