From 27441c7d63175255d1a50e96ad6418592666a3db Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 30 Jun 2015 15:13:28 +0200
Subject: fail more gracefully on empty clipboard in DecryptActivity

---
 .../java/org/sufficientlysecure/keychain/ui/DecryptActivity.java   | 7 +++++++
 1 file changed, 7 insertions(+)

(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 4375be740..04f54f151 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
@@ -120,7 +120,14 @@ public class DecryptActivity extends BaseActivity {
 
                 case ACTION_DECRYPT_FROM_CLIPBOARD: {
                     ClipboardManager clipMan = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+                    if (clipMan == null) {
+                        break;
+                    }
+
                     ClipData clip = clipMan.getPrimaryClip();
+                    if (clip == null) {
+                        break;
+                    }
 
                     // check if data is available as uri
                     Uri uri = null;
-- 
cgit v1.2.3