fail more gracefully on empty clipboard in DecryptActivity

1 files changed, 7 insertions, 0 deletions

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;