moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 11:12:15 -05:00
Code Issues Releases Wiki Activity

force message encrypt/decrypt view if the activities are called via *_AND_RETURN Intents

Browse Source
This commit is contained in:
Thialfihar 2010-06-02 15:33:40 +00:00
parent 7193edbba2
commit 2170069d8a
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,12 +285,25 @@ public class DecryptActivity extends BaseActivity {
}); });
mReplyButton.setVisibility(View.INVISIBLE); mReplyButton.setVisibility(View.INVISIBLE);
if (mSource.getCurrentView().getId() == R.id.sourceMessage && if (mReturnResult) {
mMessage.getText().length() > 0) { mSourcePrevious.setClickable(false);
mDecryptButton.performClick(); mSourcePrevious.setEnabled(false);
mSourcePrevious.setVisibility(View.INVISIBLE);
mSourceNext.setClickable(false);
mSourceNext.setEnabled(false);
mSourceNext.setVisibility(View.INVISIBLE);
mSourceLabel.setClickable(false);
mSourceLabel.setEnabled(false);
} }
updateSource(); updateSource();
if (mSource.getCurrentView().getId() == R.id.sourceMessage &&
mMessage.getText().length() > 0) {
mDecryptButton.performClick();
}
} }
private void openFile() { private void openFile() {

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

@ -347,6 +347,23 @@ public class EncryptActivity extends BaseActivity {
updateSource(); updateSource();
updateMode(); 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 && if (mMessage.getText().length() > 0 &&
((mEncryptionKeyIds != null && ((mEncryptionKeyIds != null &&
mEncryptionKeyIds.length > 0) || mEncryptionKeyIds.length > 0) ||