From acbb857f24c3283ae0e9a6b495e02825b40f5579 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 17 Sep 2015 10:16:59 +0200
Subject: Add K-9 Mail warning toast

---
 .../main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java | 4 ++++
 OpenKeychain/src/main/res/values/strings.xml                          | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain/src')

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();
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 1f4fe0606..2be695ffa 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1540,7 +1540,8 @@
     <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="error_reading_aosp">"Failed reading data, this is a bug in the Android E-Mail client! (Issue #290)"</string>
+    <string name="error_reading_k9">"If decryption fails, press 'Download complete message' in K-9 Mail!"</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>
-- 
cgit v1.2.3