diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-30 15:13:28 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-30 15:13:28 +0200 |
| commit | 27441c7d63175255d1a50e96ad6418592666a3db (patch) | |
| tree | c8b26e53e8580f7d872d37d6569ed1685208cd8a /OpenKeychain/src | |
| parent | ddf7f5006203d0da087cc46321504530a02d6ebf (diff) | |
| download | open-keychain-27441c7d63175255d1a50e96ad6418592666a3db.tar.gz open-keychain-27441c7d63175255d1a50e96ad6418592666a3db.tar.bz2 open-keychain-27441c7d63175255d1a50e96ad6418592666a3db.zip | |
fail more gracefully on empty clipboard in DecryptActivity
Diffstat (limited to 'OpenKeychain/src')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java | 7 |
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; |