Rewrite Google non-com redirects

3 years ago · 61c0f733cf
parent 3863ac8757
commit 61c0f733cf
1 changed files with 8 additions and 0 deletions
--- 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) {