diff options
| author | Thialfihar <thialfihar@gmail.com> | 2010-06-02 15:33:40 +0000 |
|---|---|---|
| committer | Thialfihar <thialfihar@gmail.com> | 2010-06-02 15:33:40 +0000 |
| commit | 2170069d8adb6472955ec1a444da7fba36015602 (patch) | |
| tree | 545df7b410d3007064e6d3a8939bd87cf1bc5a12 | |
| parent | 7193edbba203212847dbdca575e8ae8d1ceab820 (diff) | |
| download | open-keychain-2170069d8adb6472955ec1a444da7fba36015602.tar.gz open-keychain-2170069d8adb6472955ec1a444da7fba36015602.tar.bz2 open-keychain-2170069d8adb6472955ec1a444da7fba36015602.zip | |
force message encrypt/decrypt view if the activities are called via *_AND_RETURN Intents
| -rw-r--r-- | src/org/thialfihar/android/apg/DecryptActivity.java | 19 | ||||
| -rw-r--r-- | src/org/thialfihar/android/apg/EncryptActivity.java | 17 |
2 files changed, 33 insertions, 3 deletions
diff --git a/src/org/thialfihar/android/apg/DecryptActivity.java b/src/org/thialfihar/android/apg/DecryptActivity.java index 99954d752..859bfc3eb 100644 --- a/src/org/thialfihar/android/apg/DecryptActivity.java +++ b/src/org/thialfihar/android/apg/DecryptActivity.java @@ -285,12 +285,25 @@ public class DecryptActivity extends BaseActivity { }); mReplyButton.setVisibility(View.INVISIBLE); - if (mSource.getCurrentView().getId() == R.id.sourceMessage && - mMessage.getText().length() > 0) { - mDecryptButton.performClick(); + if (mReturnResult) { + mSourcePrevious.setClickable(false); + mSourcePrevious.setEnabled(false); + mSourcePrevious.setVisibility(View.INVISIBLE); + + mSourceNext.setClickable(false); + mSourceNext.setEnabled(false); + mSourceNext.setVisibility(View.INVISIBLE); + + mSourceLabel.setClickable(false); + mSourceLabel.setEnabled(false); } updateSource(); + + if (mSource.getCurrentView().getId() == R.id.sourceMessage && + mMessage.getText().length() > 0) { + mDecryptButton.performClick(); + } } private void openFile() { diff --git a/src/org/thialfihar/android/apg/EncryptActivity.java b/src/org/thialfihar/android/apg/EncryptActivity.java index 3dae55cef..1a1ce7f13 100644 --- a/src/org/thialfihar/android/apg/EncryptActivity.java +++ b/src/org/thialfihar/android/apg/EncryptActivity.java @@ -347,6 +347,23 @@ public class EncryptActivity extends BaseActivity { updateSource(); updateMode(); + if (mReturnResult) { + mSourcePrevious.setClickable(false); + mSourcePrevious.setEnabled(false); + mSourcePrevious.setVisibility(View.INVISIBLE); + + mSourceNext.setClickable(false); + mSourceNext.setEnabled(false); + mSourceNext.setVisibility(View.INVISIBLE); + + mSourceLabel.setClickable(false); + mSourceLabel.setEnabled(false); + + mEncryptToClipboardButton.setEnabled(false); + mEncryptToClipboardButton.setVisibility(View.INVISIBLE); + mEncryptButton.setText(R.string.btn_encrypt); + } + if (mMessage.getText().length() > 0 && ((mEncryptionKeyIds != null && mEncryptionKeyIds.length > 0) || |