From b9dc21969faa7c4cd7b10638a629690d0df20cf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 3 Oct 2014 02:17:51 +0200
Subject: Fix nullpointer with clipboard

---
 .../org/sufficientlysecure/keychain/ui/DecryptActivity.java | 13 ++++++-------
 .../sufficientlysecure/keychain/ui/DecryptTextActivity.java |  6 +++---
 2 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'OpenKeychain/src/main/java/org')

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 ac58c63dc..5e23a24ae 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
@@ -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());
             }
         }
     }
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();
             }
-- 
cgit v1.2.3