From a0c238617251de8334f8064ee86394a12215d6db Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 30 Oct 2019 09:09:07 +0100
Subject: [PATCH] Suppress user interaction on auto decrypt

---
 .../java/eu/faircode/email/AdapterMessage.java |  9 +++++----
 .../eu/faircode/email/FragmentMessages.java    | 18 ++++++++++++++----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index c6c0f2b812..a6f524a974 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1625,7 +1625,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
             boolean auto_decrypt = prefs.getBoolean("auto_decrypt", false);
             if (auto_decrypt && is_encrypted)
-                onActionDecrypt(message);
+                onActionDecrypt(message, true);
 
             cbInline.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
                 @Override
@@ -1973,7 +1973,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         onActionUnsubscribe(message);
                         break;
                     case R.id.ibDecrypt:
-                        onActionDecrypt(message);
+                        onActionDecrypt(message, false);
                         break;
 
                     case R.id.ibDownloading:
@@ -2650,11 +2650,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             onOpenLink(uri, context.getString(R.string.title_legend_show_unsubscribe));
         }
 
-        private void onActionDecrypt(TupleMessageEx message) {
+        private void onActionDecrypt(TupleMessageEx message, boolean auto) {
             LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
             lbm.sendBroadcast(
                     new Intent(FragmentMessages.ACTION_DECRYPT)
-                            .putExtra("id", message.id));
+                            .putExtra("id", message.id)
+                            .putExtra("auto", auto));
         }
 
         private void onActionReplyMenu(TupleMessageEx message) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 5f95709dc3..d4b7ba3fd5 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3746,7 +3746,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             Intent data = new Intent();
             data.setAction(OpenPgpApi.ACTION_DECRYPT_VERIFY);
 
-            onDecrypt(data, intent.getLongExtra("id", -1));
+            long id = intent.getLongExtra("id", -1);
+            boolean auto = intent.getBooleanExtra("auto", false);
+
+            onDecrypt(data, id, auto);
         } else
             Snackbar.make(view, R.string.title_no_openpgp, Snackbar.LENGTH_LONG).show();
     }
@@ -3763,7 +3766,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                     break;
                 case REQUEST_DECRYPT:
                     if (resultCode == RESULT_OK && data != null)
-                        onDecrypt(data, message);
+                        onDecrypt(data, message, false);
                     break;
                 case REQUEST_MESSAGE_DELETE:
                     if (resultCode == RESULT_OK && data != null)
@@ -3926,16 +3929,18 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         }.execute(this, args, "raw:save");
     }
 
-    private void onDecrypt(Intent data, long id) {
+    private void onDecrypt(Intent data, long id, boolean auto) {
         Bundle args = new Bundle();
         args.putLong("id", id);
         args.putParcelable("data", data);
+        args.putBoolean("auto", auto);
 
         new SimpleTask<PendingIntent>() {
             @Override
             protected PendingIntent onExecute(Context context, Bundle args) throws Throwable {
                 // Get arguments
                 long id = args.getLong("id");
+                boolean auto = args.getBoolean("auto");
                 Intent data = args.getParcelable("data");
 
                 DB db = DB.getInstance(context);
@@ -3980,8 +3985,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                     }
                 }
 
-                if (in == null)
+                if (in == null) {
+                    if (auto)
+                        return null;
                     throw new IllegalArgumentException(context.getString(R.string.title_not_encrypted));
+                }
 
                 Intent result;
                 File plain = File.createTempFile("plain", "." + id, context.getCacheDir());
@@ -4069,6 +4077,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                             break;
 
                         case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED:
+                            if (auto)
+                                return null;
                             FragmentMessages.this.message = id;
                             return result.getParcelableExtra(OpenPgpApi.RESULT_INTENT);