diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-17 13:45:32 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-17 13:45:32 +0200 |
| commit | 142a71480e5e7406dd775c73552bb45f5582648e (patch) | |
| tree | ed0f9050f7cdea7fe2a3f8b4c80db8972d801f8c /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui | |
| parent | 7da80c84b79f8b0760db7c42c77ab16f10131dda (diff) | |
| parent | acbb857f24c3283ae0e9a6b495e02825b40f5579 (diff) | |
| download | open-keychain-142a71480e5e7406dd775c73552bb45f5582648e.tar.gz open-keychain-142a71480e5e7406dd775c73552bb45f5582648e.tar.bz2 open-keychain-142a71480e5e7406dd775c73552bb45f5582648e.zip | |
Merge branch 'mime4j' of github.com:open-keychain/open-keychain into mime4j
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java | 4 |
1 files changed, 4 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 5eb9963f5..4b80af437 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java @@ -162,6 +162,10 @@ public class DecryptActivity extends BaseActivity { Uri uri = intent.getData(); if (uri != null) { + if ("com.fsck.k9.attachmentprovider".equals(uri.getHost())) { + Toast.makeText(this, R.string.error_reading_k9, Toast.LENGTH_LONG).show(); + } + if ("com.android.email.attachmentprovider".equals(uri.getHost())) { Toast.makeText(this, R.string.error_reading_aosp, Toast.LENGTH_LONG).show(); finish(); |