From 2baa11161d7e2166bb98dec209ab623195d27bc3 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 15 Apr 2024 07:56:58 +0200
Subject: [PATCH] Improved geo link pattern

---
 app/src/main/java/eu/faircode/email/HtmlHelper.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 7e64bbbc54..94a5b68150 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -1543,6 +1543,8 @@ public class HtmlHelper {
 
     static void autoLink(Document document, boolean outbound) {
         // https://en.wikipedia.org/wiki/List_of_URI_schemes
+        // https://en.wikipedia.org/wiki/Geo_URI_scheme
+        // https://developers.google.com/maps/documentation/urls/android-intents
         // xmpp:[<user>]@<host>[:<port>]/[<resource>][?<query>]
         // geo:<lat>,<lon>[,<alt>][;u=<uncertainty>]
         // tel:<phonenumber>
@@ -1555,7 +1557,10 @@ public class HtmlHelper {
                                 .replace("(?i:http|https|rtsp)://",
                                         "(((?i:http|https)://)|((?i:xmpp):))") +
                         "|" +
-                        "(?i:geo:\\d+,\\d+(,\\d+)?(;u=\\d+)?)" +
+                        "(?i:geo:(-?\\d+(\\.\\d+)?),(-?\\d+(\\.\\d+)?)(,-?\\d+(\\.\\d+)?)?" +
+                        "(;u=\\d+)?" + // Uncertainty
+                        "(\\?z=\\d+)?" + // Zoom
+                        "(\\?q=.+)?)" + // Google Maps query
                         "|" +
                         "(?i:tel:" + Patterns.PHONE.pattern() + ")" +
                         (BuildConfig.DEBUG ? "|(" + GPA_PATTERN + ")" : ""));