From fdb1a7384e81d6b395ec6d930a1df46eb7db9496 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Thu, 17 Sep 2015 19:48:51 +0200
Subject: multidcrypt: display k9 download only after decryption failure

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

(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 4b80af437..5eb9963f5 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
@@ -162,10 +162,6 @@ 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/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
index ca89509c5..dcba595e9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
@@ -56,6 +56,7 @@ import android.widget.PopupMenu.OnDismissListener;
 import android.widget.PopupMenu.OnMenuItemClickListener;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+import android.widget.Toast;
 import android.widget.ViewAnimator;
 
 import com.cocosw.bottomsheet.BottomSheet;
@@ -304,6 +305,11 @@ public class DecryptListFragment
         final Uri uri = mCurrentInputUri;
         mCurrentInputUri = null;
 
+        Activity activity = getActivity();
+        if (activity != null && "com.fsck.k9.attachmentprovider".equals(uri.getHost())) {
+            Toast.makeText(getActivity(), R.string.error_reading_k9, Toast.LENGTH_LONG).show();
+        }
+
         mAdapter.addResult(uri, result);
 
         cryptoOperation();
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 0db982a8b..6b88350e6 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1541,7 +1541,7 @@
     <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! (Issue #290)"</string>
-    <string name="error_reading_k9">"If decryption fails, press 'Download complete message' in K-9 Mail!"</string>
+    <string name="error_reading_k9">"Received incomplete data, try pressing '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