Fixed email links not opening email client

spacecowboy · Jun 4, 2024 · 7694230 · 7694230
1 parent 347ed83
commit 7694230
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/app/src/main/java/com/nononsenseapps/feeder/model/html/HtmlLinearizer.kt b/app/src/main/java/com/nononsenseapps/feeder/model/html/HtmlLinearizer.kt
@@ -352,7 +352,8 @@ class HtmlLinearizer {
                         }
 
                         "a" -> {
-                            withLinearTextAnnotation(LinearTextAnnotationLink(element.attr("abs:href"))) {
+                            // abs:href will be blank for mailto: links
+                            withLinearTextAnnotation(LinearTextAnnotationLink(element.attr("abs:href").ifBlank { element.attr("href") })) {
                                 linearizeChildren(
                                     element.childNodes(),
                                     blockStyle = blockStyle,

diff --git a/app/src/main/java/com/nononsenseapps/feeder/ui/compose/text/HtmlToAnnotatedString.kt b/app/src/main/java/com/nononsenseapps/feeder/ui/compose/text/HtmlToAnnotatedString.kt
@@ -238,7 +238,8 @@ private fun AnnotatedStringComposer.appendTextChildren(
                     }
 
                     "a" -> {
-                        withAnnotation("URL", element.attr("abs:href") ?: "") {
+                        // abs:href will be blank for mailto: links
+                        withAnnotation("URL", element.attr("abs:href").ifBlank { element.attr("href") }) {
                             appendTextChildren(
                                 element.childNodes(),
                                 baseUrl = baseUrl,

diff --git a/app/src/main/java/com/nononsenseapps/feeder/util/ActivityLauncher.kt b/app/src/main/java/com/nononsenseapps/feeder/util/ActivityLauncher.kt
@@ -61,10 +61,24 @@ class ActivityLauncher(
         @ColorInt toolbarColor: Int,
         openAdjacentIfSuitable: Boolean = true,
     ): Boolean {
-        return when (repository.linkOpener.value) {
-            LinkOpener.CUSTOM_TAB -> openLinkInCustomTab(link, toolbarColor, openAdjacentIfSuitable)
-            LinkOpener.DEFAULT_BROWSER -> openLinkInBrowser(link, openAdjacentIfSuitable)
+        if (link.isBlank()) {
+            return false
         }
+        return if (link.startsWith("mailto:")) {
+            openEmailClient(link)
+        } else {
+            when (repository.linkOpener.value) {
+                LinkOpener.CUSTOM_TAB -> openLinkInCustomTab(link, toolbarColor, openAdjacentIfSuitable)
+                LinkOpener.DEFAULT_BROWSER -> openLinkInBrowser(link, openAdjacentIfSuitable)
+            }
+        }
+    }
+
+    private fun openEmailClient(link: String): Boolean {
+        // example link: mailto:[email protected]?subject=subject
+        val intent = Intent(Intent.ACTION_SENDTO, Uri.parse(link))
+
+        return startActivity(openAdjacentIfSuitable = true, intent = intent)
     }
 
     /**