fix: mailto on android (#311)

ooni · Nov 27, 2024 · 63e2baa · 63e2baa
1 parent 5f331c2
commit 63e2baa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/composeApp/src/commonMain/composeResources/values/untraslatable.xml b/composeApp/src/commonMain/composeResources/values/untraslatable.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="shareEmailTo" translatable="false">mailto:[email protected]</string>
+    <string name="shareEmailTo" translatable="false">[email protected]</string>
     <string name="shareSubject" translatable="false">[bug-report] OONI Probe %1$s</string>
     <string name="version" translatable="false">%1$s: %2$s</string>
 </resources>
diff --git a/composeApp/src/commonMain/kotlin/org/ooni/probe/domain/SendSupportEmail.kt b/composeApp/src/commonMain/kotlin/org/ooni/probe/domain/SendSupportEmail.kt
@@ -14,7 +14,6 @@ class SendSupportEmail(
     private val launchAction: (PlatformAction) -> Boolean,
 ) {
     suspend operator fun invoke() {
-        getString(Res.string.shareEmailTo)
         val supportEmail = getString(Res.string.shareEmailTo)
         val subject = getString(Res.string.shareSubject, platformInfo.version)
         val chooserTitle = getString(Res.string.Settings_SendEmail_Label)

diff --git a/composeApp/src/iosMain/kotlin/org/ooni/probe/SetupDependencies.kt b/composeApp/src/iosMain/kotlin/org/ooni/probe/SetupDependencies.kt
@@ -162,7 +162,6 @@ class SetupDependencies(
 
     private fun sendMail(action: PlatformAction.Mail): Boolean {
         MFMailComposeViewController.canSendMail().let { canSendMail ->
-            val email = action.to.removePrefix("mailto:")
             if (canSendMail) {
                 MFMailComposeViewController().apply {
                     mailComposeDelegate = object :
@@ -176,7 +175,7 @@ class SetupDependencies(
                             controller.dismissViewControllerAnimated(true, null)
                         }
                     }
-                    setToRecipients(listOf(email))
+                    setToRecipients(listOf(action.to))
                     setSubject(action.subject)
                     setMessageBody(action.body, isHTML = false)
                 }.let {
@@ -188,7 +187,7 @@ class SetupDependencies(
                 }
                 return true
             } else {
-                UIPasteboard.generalPasteboard.string = email
+                UIPasteboard.generalPasteboard.string = action.to
                 return false
             }
         }