moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-08-13 15:53:53 -04:00
Code Issues Releases Wiki Activity

Dont show encrypted data before decryption from clipboard

Browse Source
This commit is contained in:
Dominik Schürmann 2014-04-01 19:00:14 +02:00
parent 07fdd6363f
commit c414dd2fe9
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java
View File

@ -47,10 +47,14 @@ import java.util.regex.Matcher;
public class DecryptMessageFragment extends DecryptFragment { public class DecryptMessageFragment extends DecryptFragment {
public static final String ARG_CIPHERTEXT = "ciphertext"; public static final String ARG_CIPHERTEXT = "ciphertext";
// view
private EditText mMessage; private EditText mMessage;
private BootstrapButton mDecryptButton; private BootstrapButton mDecryptButton;
private BootstrapButton mDecryptFromCLipboardButton; private BootstrapButton mDecryptFromCLipboardButton;
// model
private String mCiphertext;
/** /**
* Inflate the layout for this fragment * Inflate the layout for this fragment
*/ */
@ -64,13 +68,13 @@ public class DecryptMessageFragment extends DecryptFragment {
mDecryptButton.setOnClickListener(new OnClickListener() { mDecryptButton.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
decryptStart(null); decryptClicked();
} }
}); });
mDecryptFromCLipboardButton.setOnClickListener(new OnClickListener() { mDecryptFromCLipboardButton.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
decryptFromClipboard(); decryptFromClipboardClicked();
} }
}); });
@ -88,7 +92,12 @@ public class DecryptMessageFragment extends DecryptFragment {
} }
} }
private void decryptFromClipboard() { private void decryptClicked() {
mCiphertext = mMessage.getText().toString();
decryptStart(null);
}
private void decryptFromClipboardClicked() {
CharSequence clipboardText = ClipboardReflection.getClipboardText(getActivity()); CharSequence clipboardText = ClipboardReflection.getClipboardText(getActivity());
// only decrypt if clipboard content is available and a pgp message or cleartext signature // only decrypt if clipboard content is available and a pgp message or cleartext signature
@ -98,8 +107,7 @@ public class DecryptMessageFragment extends DecryptFragment {
matcher = PgpHelper.PGP_CLEARTEXT_SIGNATURE.matcher(clipboardText); matcher = PgpHelper.PGP_CLEARTEXT_SIGNATURE.matcher(clipboardText);
} }
if (matcher.matches()) { if (matcher.matches()) {
String data = matcher.group(1); mCiphertext = matcher.group(1);
mMessage.setText(data);
decryptStart(null); decryptStart(null);
} else { } else {
AppMsg.makeText(getActivity(), R.string.error_invalid_data, AppMsg.STYLE_INFO) AppMsg.makeText(getActivity(), R.string.error_invalid_data, AppMsg.STYLE_INFO)
@ -125,8 +133,7 @@ public class DecryptMessageFragment extends DecryptFragment {
// data // data
data.putInt(KeychainIntentService.TARGET, KeychainIntentService.TARGET_BYTES); data.putInt(KeychainIntentService.TARGET, KeychainIntentService.TARGET_BYTES);
String message = mMessage.getText().toString(); data.putByteArray(KeychainIntentService.DECRYPT_CIPHERTEXT_BYTES, mCiphertext.getBytes());
data.putByteArray(KeychainIntentService.DECRYPT_CIPHERTEXT_BYTES, message.getBytes());
data.putString(KeychainIntentService.DECRYPT_PASSPHRASE, passphrase); data.putString(KeychainIntentService.DECRYPT_PASSPHRASE, passphrase);
intent.putExtra(KeychainIntentService.EXTRA_DATA, data); intent.putExtra(KeychainIntentService.EXTRA_DATA, data);