cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix NPE in EncryptDecryptFragment on empty clipboard

Browse Source
This commit is contained in:
Dominik Schürmann
2018-06-19 15:41:44 +02:00
parent c0b6cea7cb
commit 289ba7cadc
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptFragment.java
View File

@@ -103,7 +103,7 @@ public class EncryptDecryptFragment extends Fragment {
} }
final CharSequence clipboardText = ClipboardReflection.getClipboardText(activity); final CharSequence clipboardText = ClipboardReflection.getClipboardText(activity);
if (clipboardText == null || TextUtils.isEmpty(clipboardText)) { if (TextUtils.isEmpty(clipboardText)) {
Notify.create(activity, R.string.error_clipboard_empty, Style.ERROR).show(); Notify.create(activity, R.string.error_clipboard_empty, Style.ERROR).show();
return; return;
} }
@@ -126,6 +126,9 @@ public class EncryptDecryptFragment extends Fragment {
new AsyncTask<Void, Void, Boolean>() { new AsyncTask<Void, Void, Boolean>() {
@Override @Override
protected Boolean doInBackground(Void... voids) { protected Boolean doInBackground(Void... voids) {
if (clipboardText == null) {
return false;
}
// see if it looks like a pgp thing // see if it looks like a pgp thing
Matcher matcher = PgpHelper.PGP_MESSAGE.matcher(clipboardText); Matcher matcher = PgpHelper.PGP_MESSAGE.matcher(clipboardText);