From db54ba777cc0ceaab2559c1eb8db7f097997e3d1 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 23 Sep 2026 08:08:07 +0200
Subject: [PATCH] Confirm sanitized host/domain

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java  | 2 +-
 .../java/eu/faircode/email/FragmentDialogOpenLink.java   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 2b1ad49825..73f5119a48 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -6805,7 +6805,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                     boolean confirm_links = prefs.getBoolean("confirm_links", true);
 
-                    String chost = FragmentDialogOpenLink.getConfirmHost(uri);
+                    String chost = FragmentDialogOpenLink.getConfirmHost(context, uri);
                     boolean confirm_link = (chost == null || prefs.getBoolean(chost + ".confirm_link", true));
                     if (always_confirm || (confirm_links && confirm_link)) {
                         if (parentFragment == null)
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java b/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
index 1e7af52515..9d5af810d7 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
@@ -348,7 +348,7 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
         cbNotAgain.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                prefs.edit().putBoolean(getConfirmHost(uri) + ".confirm_link", !isChecked).apply();
+                prefs.edit().putBoolean(getConfirmHost(buttonView.getContext(), uri) + ".confirm_link", !isChecked).apply();
             }
         });
 
@@ -613,7 +613,7 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
 
         cbSanitize.setChecked(sanitize_links);
 
-        String chost = getConfirmHost(uri);
+        String chost = getConfirmHost(context, uri);
         cbNotAgain.setText(context.getString(R.string.title_no_ask_for_again, chost));
         cbNotAgain.setVisibility(!always_confirm && !sanitize_links && chost != null ? View.VISIBLE : View.GONE);
 
@@ -960,10 +960,11 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
         }
     }
 
-    public static String getConfirmHost(Uri uri) {
+    public static String getConfirmHost(Context context, Uri uri) {
         String scheme = uri.getScheme();
         if ("https".equals(scheme)) {
-            String host = uri.getHost();
+            Uri sanitized = UriHelper.sanitize(context, uri);
+            String host = (sanitized == null ? uri : sanitized).getHost();
             return (TextUtils.isEmpty(host) ? null : host.toLowerCase(Locale.ROOT));
         } else if ("mailto".equals(scheme)) {
             MailTo mailto = MailTo.parse(uri);