diff options
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java | 10 | ||||
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java index 7789ca9c4..6001687a1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java @@ -84,17 +84,17 @@ public class DecryptActivity extends DrawerActivity { return; } - new AsyncTask<Void, Void, Boolean>() { + new AsyncTask<String, Void, Boolean>() { @Override - protected Boolean doInBackground(Void... params) { + protected Boolean doInBackground(String... clipboardText) { // see if it looks like a pgp thing - Matcher matcher = PgpHelper.PGP_MESSAGE.matcher(clipboardText); + Matcher matcher = PgpHelper.PGP_MESSAGE.matcher(clipboardText[0]); boolean animate = matcher.matches(); // see if it looks like another pgp thing if (!animate) { - matcher = PgpHelper.PGP_CLEARTEXT_SIGNATURE.matcher(clipboardText); + matcher = PgpHelper.PGP_CLEARTEXT_SIGNATURE.matcher(clipboardText[0]); animate = matcher.matches(); } return animate; @@ -109,7 +109,7 @@ public class DecryptActivity extends DrawerActivity { SubtleAttentionSeeker.tada(findViewById(R.id.clipboard_icon), 1.5f).start(); } } - }.execute(); + }.execute(clipboardText.toString()); } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java index 8d489b3d4..73163eabd 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java @@ -156,11 +156,11 @@ public class DecryptTextActivity extends ActionBarActivity { } else if (ACTION_DECRYPT_FROM_CLIPBOARD.equals(action)) { Log.d(Constants.TAG, "ACTION_DECRYPT_FROM_CLIPBOARD"); - String clipboardText = ClipboardReflection.getClipboardText(this).toString(); - clipboardText = getPgpContent(clipboardText); + CharSequence clipboardText = ClipboardReflection.getClipboardText(this); if (clipboardText != null) { - loadFragment(savedInstanceState, clipboardText); + String text = getPgpContent(clipboardText.toString()); + loadFragment(savedInstanceState, text); } else { returnInvalidResult(); } |