From 289ba7cadcb77d949220e7aa2b5d8d821234599b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@schuermann.eu>
Date: Tue, 19 Jun 2018 15:41:44 +0200
Subject: [PATCH] fix NPE in EncryptDecryptFragment on empty clipboard

---
 .../keychain/ui/EncryptDecryptFragment.java                  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptFragment.java
index d0d0cdfcb..97c8d2991 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptFragment.java
@@ -103,7 +103,7 @@ public class EncryptDecryptFragment extends Fragment {
         }
 
         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();
             return;
         }
@@ -126,6 +126,9 @@ public class EncryptDecryptFragment extends Fragment {
         new AsyncTask<Void, Void, Boolean>() {
             @Override
             protected Boolean doInBackground(Void... voids) {
+                if (clipboardText == null) {
+                    return false;
+                }
 
                 // see if it looks like a pgp thing
                 Matcher matcher = PgpHelper.PGP_MESSAGE.matcher(clipboardText);