diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-16 21:03:49 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-16 21:03:49 +0200 |
commit | d5bde6997e6640f27d38f493e07a84e91a02fad6 (patch) | |
tree | e3a602a0f69627c3f2f12ab3fd93ffe2d4772d66 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain | |
parent | 5e0c40346eff669370be2bb0358dd878059e7092 (diff) | |
download | open-keychain-d5bde6997e6640f27d38f493e07a84e91a02fad6.tar.gz open-keychain-d5bde6997e6640f27d38f493e07a84e91a02fad6.tar.bz2 open-keychain-d5bde6997e6640f27d38f493e07a84e91a02fad6.zip |
fail with warning if we get data from the AOSP mail client (see #290)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java | 12 |
1 files changed, 11 insertions, 1 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 043929130..5eb9963f5 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java @@ -159,7 +159,17 @@ public class DecryptActivity extends BaseActivity { canDelete = true; case OpenKeychainIntents.DECRYPT_DATA: default: - uris.add(intent.getData()); + Uri uri = intent.getData(); + if (uri != null) { + + if ("com.android.email.attachmentprovider".equals(uri.getHost())) { + Toast.makeText(this, R.string.error_reading_aosp, Toast.LENGTH_LONG).show(); + finish(); + return; + } + + uris.add(intent.getData()); + } } |