From 9e7c9a0d325b45226d37efe00188eadb81f506ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 29 Sep 2014 23:05:17 +0200
Subject: Fix nullpointer in DecryptActivity

---
 .../org/sufficientlysecure/keychain/ui/DecryptActivity.java  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java')

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 46c99878b..ac58c63dc 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
@@ -79,7 +79,7 @@ public class DecryptActivity extends DrawerActivity {
             final String clipboardText =
                     ClipboardReflection.getClipboardText(DecryptActivity.this).toString();
 
-            new AsyncTask<Void,Void,Boolean>() {
+            AsyncTask<Void, Void, Boolean> tadaTask = new AsyncTask<Void, Void, Boolean>() {
                 @Override
                 protected Boolean doInBackground(Void... params) {
 
@@ -88,7 +88,7 @@ public class DecryptActivity extends DrawerActivity {
                     boolean animate = matcher.matches();
 
                     // see if it looks like another pgp thing
-                    if(!animate) {
+                    if (!animate) {
                         matcher = PgpHelper.PGP_CLEARTEXT_SIGNATURE.matcher(clipboardText);
                         animate = matcher.matches();
                     }
@@ -100,11 +100,15 @@ public class DecryptActivity extends DrawerActivity {
                     super.onPostExecute(animate);
 
                     // if so, animate the clipboard icon just a bit~
-                    if(animate) {
+                    if (animate) {
                         SubtleAttentionSeeker.tada(findViewById(R.id.clipboard_icon), 1.5f).start();
                     }
                 }
-            }.execute();
+            };
+
+            if (clipboardText != null) {
+                tadaTask.execute();
+            }
         }
     }
 
-- 
cgit v1.2.3