expo-mail-composer 12.1.1 → 12.2.0

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 12.2.0 — 2023-05-08
+
+### 💡 Others
+
+- Migrated Android codebase to use the new modules API. ([#21200](https://github.com/expo/expo/pull/21200) by [@alanjhughes](https://github.com/alanjhughes))
+
 ## 12.1.1 — 2023-02-09
 
 _This version does not introduce any user-facing changes._

package/README.md

@@ -16,7 +16,7 @@ Provides an API to compose mails using OS specific UI
 
 # Installation in managed Expo projects
 
-For [managed](https://docs.expo.dev/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/mail-composer/).
+For [managed](https://docs.expo.dev/archive/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/mail-composer/).
 
 # Installation in bare React Native projects
 
@@ -25,7 +25,7 @@ For bare React Native projects, you must ensure that you have [installed and con
 ### Add the package to your npm dependencies
 
 ```
-expo install expo-mail-composer
+npx expo install expo-mail-composer
 ```
 
 ### Configure for iOS

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '12.1.1'
+version = '12.2.0'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -74,7 +74,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 17
-    versionName "12.1.1"
+    versionName "12.2.0"
   }
   lintOptions {
     abortOnError false

package/android/src/main/java/expo/modules/mailcomposer/MailComposerModule.kt

@@ -1,93 +1,75 @@
 package expo.modules.mailcomposer
 
-import android.app.Activity
-import android.content.Context
 import android.content.Intent
 import android.content.pm.LabeledIntent
 import android.net.Uri
 import android.os.Bundle
-import expo.modules.core.ExportedModule
-import expo.modules.core.ModuleRegistry
-import expo.modules.core.ModuleRegistryDelegate
-import expo.modules.core.Promise
-import expo.modules.core.arguments.ReadableArguments
-import expo.modules.core.interfaces.ActivityProvider
-import expo.modules.core.interfaces.ExpoMethod
-import expo.modules.core.interfaces.ActivityEventListener
-import expo.modules.core.interfaces.services.UIManager
+import expo.modules.kotlin.Promise
+import expo.modules.kotlin.exception.Exceptions
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
 
-class MailComposerModule(
-  context: Context,
-  private val moduleRegistryDelegate: ModuleRegistryDelegate = ModuleRegistryDelegate()
-) : ExportedModule(context), ActivityEventListener {
+class MailComposerModule : Module() {
+  private val context
+    get() = appContext.reactContext ?: throw Exceptions.ReactContextLost()
+  private val currentActivity
+    get() = appContext.currentActivity ?: throw Exceptions.MissingActivity()
   private var composerOpened = false
-  private val uiManager: UIManager by moduleRegistry()
   private var pendingPromise: Promise? = null
-  override fun getName() = "ExpoMailComposer"
-  private val activityProvider: ActivityProvider by moduleRegistry()
 
-  private inline fun <reified T> moduleRegistry() = moduleRegistryDelegate.getFromModuleRegistry<T>()
+  override fun definition() = ModuleDefinition {
+    Name("ExpoMailComposer")
 
-  override fun onCreate(moduleRegistry: ModuleRegistry) {
-    moduleRegistryDelegate.onCreate(moduleRegistry)
-    uiManager.registerActivityEventListener(this)
-  }
+    AsyncFunction("isAvailableAsync") {
+      return@AsyncFunction true
+    }
 
-  override fun onDestroy() {
-    uiManager.unregisterActivityEventListener(this)
-  }
+    AsyncFunction("composeAsync") { options: MailComposerOptions, promise: Promise ->
+      val intent = Intent(Intent.ACTION_SENDTO).apply { data = Uri.parse("mailto:") }
+      val application = currentActivity.application
+      val resolveInfo = context.packageManager.queryIntentActivities(intent, 0)
 
-  @ExpoMethod
-  fun isAvailableAsync(promise: Promise) {
-    promise.resolve(true)
-  }
+      val mailIntents = resolveInfo.map { info ->
+        val mailIntentBuilder = MailIntentBuilder(options)
+          .setComponentName(info.activityInfo.packageName, info.activityInfo.name)
+          .putRecipients(Intent.EXTRA_EMAIL)
+          .putCcRecipients(Intent.EXTRA_CC)
+          .putBccRecipients(Intent.EXTRA_BCC)
+          .putSubject(Intent.EXTRA_SUBJECT)
+          .putBody(Intent.EXTRA_TEXT, options.isHtml ?: false)
+          .putAttachments(
+            Intent.EXTRA_STREAM,
+            application
+          )
 
-  @ExpoMethod
-  fun composeAsync(options: ReadableArguments, promise: Promise) {
-    val intent = Intent(Intent.ACTION_SENDTO).apply { data = Uri.parse("mailto:") }
-    val application = activityProvider.currentActivity.application
-    val resolveInfo = context.packageManager.queryIntentActivities(intent, 0)
-    val mailIntents = resolveInfo.map { info ->
-      val isHtml = options.containsKey("isHtml") && options.getBoolean("isHtml")
-      val mailIntentBuilder = MailIntentBuilder(options)
-        .setComponentName(info.activityInfo.packageName, info.activityInfo.name)
-        .putExtraIfKeyExists("recipients", Intent.EXTRA_EMAIL)
-        .putExtraIfKeyExists("ccRecipients", Intent.EXTRA_CC)
-        .putExtraIfKeyExists("bccRecipients", Intent.EXTRA_BCC)
-        .putExtraIfKeyExists("subject", Intent.EXTRA_SUBJECT)
-        .putExtraIfKeyExists("body", Intent.EXTRA_TEXT, isHtml)
-        .putParcelableArrayListExtraIfKeyExists(
-          "attachments",
-          Intent.EXTRA_STREAM,
-          application
+        LabeledIntent(
+          mailIntentBuilder.build(),
+          info.activityInfo.packageName,
+          info.loadLabel(context.packageManager),
+          info.icon
         )
-      LabeledIntent(
-        mailIntentBuilder.build(),
-        info.activityInfo.packageName,
-        info.loadLabel(context.packageManager),
-        info.icon
-      )
-    }.toMutableList()
-    val chooser = Intent.createChooser(
-      mailIntents.removeAt(mailIntents.size - 1),
-      null
-    ).apply {
-      putExtra(Intent.EXTRA_INITIAL_INTENTS, mailIntents.toTypedArray())
-      addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-    }
-    pendingPromise = promise
-    activityProvider.currentActivity.startActivityForResult(chooser, REQUEST_CODE)
-    composerOpened = true
-  }
+      }.toMutableList()
+
+      val chooser = Intent.createChooser(
+        mailIntents.removeAt(mailIntents.size - 1),
+        null
+      ).apply {
+        putExtra(Intent.EXTRA_INITIAL_INTENTS, mailIntents.toTypedArray())
+        addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+      }
 
-  override fun onNewIntent(intent: Intent) = Unit
+      pendingPromise = promise
+      currentActivity.startActivityForResult(chooser, REQUEST_CODE)
+      composerOpened = true
+    }
 
-  override fun onActivityResult(activity: Activity, requestCode: Int, resultCode: Int, data: Intent?) {
-    if (requestCode == REQUEST_CODE && pendingPromise != null) {
-      val promise = pendingPromise ?: return
-      if (composerOpened) {
-        composerOpened = false
-        promise.resolve(Bundle().apply { putString("status", "sent") })
+    OnActivityResult { _, payload ->
+      if (payload.requestCode == REQUEST_CODE && pendingPromise != null) {
+        val promise = pendingPromise ?: return@OnActivityResult
+        if (composerOpened) {
+          composerOpened = false
+          promise.resolve(Bundle().apply { putString("status", "sent") })
+        }
       }
     }
   }

package/android/src/main/java/expo/modules/mailcomposer/MailIntentBuilder.kt

@@ -7,19 +7,13 @@ import android.net.Uri
 import android.text.Html
 import android.util.Log
 import androidx.core.content.FileProvider
-import expo.modules.core.arguments.ReadableArguments
 import java.io.File
 
 class MailIntentBuilder(
-  private val options: ReadableArguments
+  private val options: MailComposerOptions
 ) {
   private val mailIntent = Intent(Intent.ACTION_SEND_MULTIPLE)
 
-  @Suppress("UNCHECKED_CAST")
-  private fun getStringArrayFrom(key: String): Array<String?> {
-    return (options.getList(key) as List<String?>).toTypedArray()
-  }
-
   private fun contentUriFromFile(file: File, application: Application): Uri = try {
     FileProvider.getUriForFile(
       application,
@@ -36,41 +30,55 @@ class MailIntentBuilder(
     mailIntent.component = ComponentName(pkg, cls)
   }
 
-  fun putExtraIfKeyExists(key: String, intentName: String) = apply {
-    if (options.containsKey(key)) {
-      if (options.getList(key) != null) {
-        mailIntent.putExtra(intentName, getStringArrayFrom(key))
-      } else {
-        mailIntent.putExtra(intentName, options.getString(key))
-      }
+  fun putRecipients(intentName: String) = apply {
+    options.recipients?.let {
+      mailIntent.putExtra(intentName, it.toTypedArray())
     }
   }
 
-  fun putExtraIfKeyExists(key: String, intentName: String, isBodyHtml: Boolean) = apply {
-    if (options.containsKey(key)) {
+  fun putCcRecipients(intentName: String) = apply {
+    options.ccRecipients?.let {
+      mailIntent.putExtra(intentName, it.toTypedArray())
+    }
+  }
+
+  fun putBccRecipients(intentName: String) = apply {
+    options.bccRecipients?.let {
+      mailIntent.putExtra(intentName, it.toTypedArray())
+    }
+  }
+
+  fun putSubject(intentName: String) = apply {
+    options.subject?.let {
+      mailIntent.putExtra(intentName, it)
+    }
+  }
+
+  fun putBody(intentName: String, isBodyHtml: Boolean) = apply {
+    options.body?.let {
       val body = if (isBodyHtml) {
-        Html.fromHtml(options.getString(key))
+        Html.fromHtml(options.body)
       } else {
-        options.getString(key)
+        options.body
       }
       mailIntent.putExtra(intentName, body)
     }
   }
 
-  fun putParcelableArrayListExtraIfKeyExists(
-    key: String,
+  fun putAttachments(
     intentName: String,
     application: Application,
   ) = apply {
     try {
-      if (options.containsKey(key)) {
-        val requestedAttachments = getStringArrayFrom(key)
-        val attachments = requestedAttachments.map { requestedAttachment ->
+      options.attachments?.let { requestedAttachments ->
+        val attachments = requestedAttachments.toTypedArray().map { requestedAttachment ->
           val path = Uri.parse(requestedAttachment).path
-          requireNotNull(path, { "Path to attachment can not be null" })
+          requireNotNull(path) { "Path to attachment can not be null" }
+
           val attachmentFile = File(path)
           contentUriFromFile(attachmentFile, application)
         }.toCollection(ArrayList())
+
         mailIntent.putParcelableArrayListExtra(intentName, attachments)
       }
     } catch (error: IllegalArgumentException) {

package/android/src/main/java/expo/modules/mailcomposer/Records.kt

@@ -0,0 +1,21 @@
+package expo.modules.mailcomposer
+
+import expo.modules.kotlin.records.Field
+import expo.modules.kotlin.records.Record
+
+data class MailComposerOptions(
+  @Field
+  val recipients: List<String>?,
+  @Field
+  val ccRecipients: List<String>?,
+  @Field
+  val bccRecipients: List<String>?,
+  @Field
+  val subject: String?,
+  @Field
+  val body: String?,
+  @Field
+  val isHtml: Boolean?,
+  @Field
+  val attachments: List<String>?,
+) : Record

package/expo-module.config.json

@@ -3,5 +3,8 @@
   "platforms": ["ios", "android"],
   "ios": {
     "modules": ["MailComposerModule"]
+  },
+  "android": {
+    "modules": ["expo.modules.mailcomposer.MailComposerModule"]
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-mail-composer",
-  "version": "12.1.1",
+  "version": "12.2.0",
   "description": "Provides an API to compose mails using OS specific UI",
   "main": "build/MailComposer.js",
   "types": "build/MailComposer.d.ts",
@@ -43,5 +43,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "1f8a6a09570fd451378565ca34933018ce48454e"
+  "gitHead": "4ba50c428c8369bb6b3a51a860d4898ad4ccbe78"
 }

package/android/src/main/java/expo/modules/mailcomposer/MailComposerPackage.kt

@@ -1,9 +0,0 @@
-package expo.modules.mailcomposer
-
-import android.content.Context
-import expo.modules.core.BasePackage
-
-class MailComposerPackage : BasePackage() {
-  override fun createExportedModules(context: Context) =
-    listOf(MailComposerModule(context))
-}