diff options
| author | Thialfihar <thialfihar@gmail.com> | 2010-09-26 17:46:13 +0000 |
|---|---|---|
| committer | Thialfihar <thialfihar@gmail.com> | 2010-09-26 17:46:13 +0000 |
| commit | f55d4d55a5da8e2fd8595f138401890f59994c8f (patch) | |
| tree | d5ac820f23f7af2bf3bc300b9a826127845da283 /src | |
| parent | 9c251b6809fca6e990479e3aac7ba027c8c553aa (diff) | |
| download | open-keychain-f55d4d55a5da8e2fd8595f138401890f59994c8f.tar.gz open-keychain-f55d4d55a5da8e2fd8595f138401890f59994c8f.tar.bz2 open-keychain-f55d4d55a5da8e2fd8595f138401890f59994c8f.zip | |
start encryption/decryption for ENCRYPT_AND_RETURN/DECRYPT_AND_RETURN if MESSAGE_DATA is used rather than MESSAGE_TEXT
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/thialfihar/android/apg/DecryptActivity.java | 2 | ||||
| -rw-r--r-- | src/org/thialfihar/android/apg/EncryptActivity.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/org/thialfihar/android/apg/DecryptActivity.java b/src/org/thialfihar/android/apg/DecryptActivity.java index 02ab2f348..e126a4c12 100644 --- a/src/org/thialfihar/android/apg/DecryptActivity.java +++ b/src/org/thialfihar/android/apg/DecryptActivity.java @@ -328,7 +328,7 @@ public class DecryptActivity extends BaseActivity { updateSource(); if (mSource.getCurrentView().getId() == R.id.sourceMessage && - mMessage.getText().length() > 0) { + (mMessage.getText().length() > 0 || mData != null)) { mDecryptButton.performClick(); } } diff --git a/src/org/thialfihar/android/apg/EncryptActivity.java b/src/org/thialfihar/android/apg/EncryptActivity.java index 48f5c9f54..ac9550788 100644 --- a/src/org/thialfihar/android/apg/EncryptActivity.java +++ b/src/org/thialfihar/android/apg/EncryptActivity.java @@ -381,7 +381,7 @@ public class EncryptActivity extends BaseActivity { updateButtons(); if (mReturnResult && - mMessage.getText().length() > 0 && + (mMessage.getText().length() > 0 || mData != null) && ((mEncryptionKeyIds != null && mEncryptionKeyIds.length > 0) || getSecretKeyId() != 0)) { |