mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-11-04 08:15:02 -05:00
Fix nullpointer with clipboard
This commit is contained in:
parent
9a296c012d
commit
b9dc21969f
@ -76,20 +76,19 @@ public class DecryptActivity extends DrawerActivity {
|
||||
if (Build.VERSION.SDK_INT >= VERSION_CODES.ICE_CREAM_SANDWICH) {
|
||||
|
||||
// get text from clipboard
|
||||
final String clipboardText =
|
||||
ClipboardReflection.getClipboardText(DecryptActivity.this).toString();
|
||||
final CharSequence clipboardText = ClipboardReflection.getClipboardText(DecryptActivity.this);
|
||||
|
||||
AsyncTask<Void, Void, Boolean> tadaTask = new AsyncTask<Void, Void, Boolean>() {
|
||||
AsyncTask<String, Void, Boolean> tadaTask = 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;
|
||||
@ -107,7 +106,7 @@ public class DecryptActivity extends DrawerActivity {
|
||||
};
|
||||
|
||||
if (clipboardText != null) {
|
||||
tadaTask.execute();
|
||||
tadaTask.execute(clipboardText.toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user