From 29698d3a9213f75c997fac0b39565259e50fc08e Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 11 Nov 2022 18:10:09 +0100
Subject: [PATCH] Conditional always confirm

---
 app/src/main/java/eu/faircode/email/ActivityEML.java  |  1 +
 .../main/java/eu/faircode/email/AdapterMessage.java   |  4 +++-
 .../main/java/eu/faircode/email/FragmentCompose.java  |  1 +
 .../eu/faircode/email/FragmentDialogOpenLink.java     | 11 ++++++++---
 .../main/java/eu/faircode/email/ProtectedContent.java |  1 +
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityEML.java b/app/src/main/java/eu/faircode/email/ActivityEML.java
index 27eaf3f97a..e66e9ffbea 100644
--- a/app/src/main/java/eu/faircode/email/ActivityEML.java
+++ b/app/src/main/java/eu/faircode/email/ActivityEML.java
@@ -156,6 +156,7 @@ public class ActivityEML extends ActivityBase {
                         Bundle args = new Bundle();
                         args.putParcelable("uri", uri);
                         args.putString("title", title);
+                        args.putBoolean("always_confirm", true);
 
                         FragmentDialogOpenLink fragment = new FragmentDialogOpenLink();
                         fragment.setArguments(args);
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 39214b67b2..078dc1be31 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -5937,13 +5937,15 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 String scheme = guri.getScheme();
                 String host = guri.getHost();
 
+                boolean sanitize_links = prefs.getBoolean("sanitize_links", false);
                 boolean confirm_link =
                         !"https".equalsIgnoreCase(scheme) || TextUtils.isEmpty(host) ||
                                 prefs.getBoolean(host + ".confirm_link", true);
-                if (always_confirm || (confirm_links && confirm_link)) {
+                if (always_confirm || sanitize_links || (confirm_links && confirm_link)) {
                     Bundle args = new Bundle();
                     args.putParcelable("uri", uri);
                     args.putString("title", title);
+                    args.putBoolean("always_confirm", always_confirm);
 
                     FragmentDialogOpenLink fragment = new FragmentDialogOpenLink();
                     fragment.setArguments(args);
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index a33049bc25..7ec9be6ee0 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -993,6 +993,7 @@ public class FragmentCompose extends FragmentBase {
                         Bundle args = new Bundle();
                         args.putParcelable("uri", uri);
                         args.putString("title", title);
+                        args.putBoolean("always_confirm", true);
 
                         FragmentDialogOpenLink fragment = new FragmentDialogOpenLink();
                         fragment.setArguments(args);
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java b/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
index 934b546cf6..dce3a445fa 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
@@ -104,13 +104,15 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
     @NonNull
     @Override
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
-        Uri _uri = getArguments().getParcelable("uri");
-        String _title = getArguments().getString("title");
+        Bundle a = getArguments();
+        Uri _uri = a.getParcelable("uri");
+        String _title = a.getString("title");
         if (_title != null)
             _title = _title.replace("\uFFFC", ""); // Object replacement character
         if (TextUtils.isEmpty(_title))
             _title = null;
         final String title = _title;
+        final boolean always_confirm = a.getBoolean("always_confirm", false);
 
         final Context context = getContext();
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
@@ -580,7 +582,10 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
 
         cbNotAgain.setText(context.getString(R.string.title_no_ask_for_again, uri.getHost()));
         cbNotAgain.setVisibility(
-                UriHelper.isSecure(uri) && !TextUtils.isEmpty(uri.getHost())
+                !always_confirm &&
+                        !sanitize_links &&
+                        UriHelper.isSecure(uri) &&
+                        !TextUtils.isEmpty(uri.getHost())
                         ? View.VISIBLE : View.GONE);
 
         setMore(false);
diff --git a/app/src/main/java/eu/faircode/email/ProtectedContent.java b/app/src/main/java/eu/faircode/email/ProtectedContent.java
index b0c1ede7ea..456095fb2a 100644
--- a/app/src/main/java/eu/faircode/email/ProtectedContent.java
+++ b/app/src/main/java/eu/faircode/email/ProtectedContent.java
@@ -228,6 +228,7 @@ public class ProtectedContent {
                                     Bundle args = new Bundle();
                                     args.putParcelable("uri", uri);
                                     args.putString("title", title);
+                                    args.putBoolean("always_confirm", true);
 
                                     FragmentDialogOpenLink fragment = new FragmentDialogOpenLink();
                                     fragment.setArguments(args);