fail more gracefully on empty clipboard in DecryptActivity

2015-06-30 15:13:28 +02:00
parent ddf7f50062
commit 27441c7d63
1 changed files with 7 additions and 0 deletions
--- 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;