Improve stripUrl regex (#443)

* improve url regex * improve url regex --------- Co-authored-by: Arnau Mora Gras <[email protected]>
bitfireAT · Oct 3, 2024 · 29a78c7 · 29a78c7
1 parent db68a9b
commit 29a78c7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/src/main/java/at/bitfire/icsdroid/UriUtils.kt b/app/src/main/java/at/bitfire/icsdroid/UriUtils.kt
@@ -47,7 +47,9 @@ object UriUtils {
      * @throws IllegalArgumentException if no URL is found in the string
      */
     fun String.stripUrl(): String? {
-        return "([a-zA-Z]+)://(\\w+)(.\\w+)*[\\w.&?=*]*".toRegex()
+        //      schema             host          port         path           query
+        return ("([a-zA-Z]+://)" + "([\\w.]+)" + "(:\\d+)?" + "([\\w/]+)?" + "(\\?[\\w.&=*]*)?")
+            .toRegex()
             .find(this)
             ?.value
     }