From 61c0f733cfb78cb246089017922ef0919f49c764 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 4 Jan 2022 19:03:21 +0100
Subject: [PATCH] Rewrite Google non-com redirects

---
 app/src/main/java/eu/faircode/email/UriHelper.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/UriHelper.java b/app/src/main/java/eu/faircode/email/UriHelper.java
index 27cfcbbe77..73d4a32fe6 100644
--- a/app/src/main/java/eu/faircode/email/UriHelper.java
+++ b/app/src/main/java/eu/faircode/email/UriHelper.java
@@ -237,6 +237,14 @@ public class UriHelper {
                 p = u.indexOf("/");
             }
 
+            changed = (result != null);
+            url = (result == null ? uri : result);
+        } else if ("https".equals(uri.getScheme()) &&
+                uri.getHost() != null &&
+                uri.getHost().startsWith("www.google.") &&
+                uri.getQueryParameter("url") != null) {
+            // Google non-com redirects
+            Uri result = Uri.parse(uri.getQueryParameter("url"));
             changed = (result != null);
             url = (result == null ? uri : result);
         } else if (uri.getQueryParameterNames().size() == 1) {