From 440832ff22d4235a3b9ecbd078f1a8acedbe4e41 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 9 Apr 2020 19:17:20 +0200
Subject: [PATCH] Sanitize Outlook safelinks

---
 .../java/eu/faircode/email/AdapterMessage.java    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 0770f65824..2d97934e6f 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -5215,12 +5215,21 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             if (uri.isOpaque())
                 sanitized = uri;
             else {
-                // https://en.wikipedia.org/wiki/UTM_parameters
-                Uri.Builder builder = uri.buildUpon();
-
                 boolean changed = false;
+
+                Uri.Builder builder;
+                if (uri.getHost() != null &&
+                        uri.getHost().endsWith("safelinks.protection.outlook.com") &&
+                        !TextUtils.isEmpty(uri.getQueryParameter("url"))) {
+                    changed = true;
+                    builder = Uri.parse(uri.getQueryParameter("url")).buildUpon();
+                }
+                else
+                    builder = uri.buildUpon();
+
                 builder.clearQuery();
                 for (String key : uri.getQueryParameterNames())
+                    // https://en.wikipedia.org/wiki/UTM_parameters
                     if (key.toLowerCase(Locale.ROOT).startsWith("utm_") ||
                             PARANOID_QUERY.contains(key.toLowerCase(Locale.ROOT)))
                         changed = true;