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 | |
| 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)
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java | 12 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 1 |
2 files changed, 12 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()); + } } diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 3dcb24fef..1f4fe0606 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1540,6 +1540,7 @@ <string name="error_loading_keys">"Error loading keys!"</string> <string name="error_empty_log">"(error, empty log)"</string> <string name="error_reading_text">"Could not read input to decrypt!"</string> + <string name="error_reading_aosp">"Failed reading data, this is a bug in the Android E-Mail client!"</string> <string name="filename_unknown">Unknown filename (click to open)</string> <string name="filename_unknown_text">Text (click to show)</string> <string name="intent_show">Show Signed/Encrypted Content</string> |