expo-mail-composer 12.0.0 → 12.1.0

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 12.1.0 — 2023-02-03
+
+### 🐛 Bug fixes
+
+- Fix `composeAsync` not resolving promise after sending/ discarding email. ([#20869](https://github.com/expo/expo/pull/20869) by [@keith-kurak](https://github.com/keith-kurak))
+
+### 💡 Others
+
+- On Android bump `compileSdkVersion` and `targetSdkVersion` to `33`. ([#20721](https://github.com/expo/expo/pull/20721) by [@lukmccall](https://github.com/lukmccall))
+
 ## 12.0.0 — 2022-10-25
 
 ### 🛠 Breaking changes

package/README.md

@@ -4,7 +4,7 @@ Provides an API to compose mails using OS specific UI
 
 # API documentation
 
-- [Documentation for the main branch](https://github.com/expo/expo/blob/main/docs/pages/versions/unversioned/sdk/mail-composer.md)
+- [Documentation for the main branch](https://github.com/expo/expo/blob/main/docs/pages/versions/unversioned/sdk/mail-composer.mdx)
 - [Documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/mail-composer/)
 
 # Installation in managed Expo projects

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '12.0.0'
+version = '12.1.0'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -59,7 +59,7 @@ afterEvaluate {
 }
 
 android {
-  compileSdkVersion safeExtGet("compileSdkVersion", 31)
+  compileSdkVersion safeExtGet("compileSdkVersion", 33)
 
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_11
@@ -72,9 +72,9 @@ android {
 
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
-    targetSdkVersion safeExtGet("targetSdkVersion", 31)
+    targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 17
-    versionName "12.0.0"
+    versionName "12.1.0"
   }
   lintOptions {
     abortOnError false

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

@@ -1,5 +1,6 @@
 package expo.modules.mailcomposer
 
+import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.content.pm.LabeledIntent
@@ -12,13 +13,15 @@ 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.LifecycleEventListener
+import expo.modules.core.interfaces.ActivityEventListener
+import expo.modules.core.interfaces.services.UIManager
 
 class MailComposerModule(
   context: Context,
   private val moduleRegistryDelegate: ModuleRegistryDelegate = ModuleRegistryDelegate()
-) : ExportedModule(context), LifecycleEventListener {
+) : ExportedModule(context), ActivityEventListener {
   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()
@@ -27,6 +30,11 @@ class MailComposerModule(
 
   override fun onCreate(moduleRegistry: ModuleRegistry) {
     moduleRegistryDelegate.onCreate(moduleRegistry)
+    uiManager.registerActivityEventListener(this)
+  }
+
+  override fun onDestroy() {
+    uiManager.unregisterActivityEventListener(this)
   }
 
   @ExpoMethod
@@ -65,25 +73,26 @@ class MailComposerModule(
       null
     ).apply {
       putExtra(Intent.EXTRA_INITIAL_INTENTS, mailIntents.toTypedArray())
-      addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
       addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
     }
     pendingPromise = promise
-    context.startActivity(chooser)
+    activityProvider.currentActivity.startActivityForResult(chooser, REQUEST_CODE)
     composerOpened = true
   }
 
-  override fun onHostResume() {
-    val promise = pendingPromise ?: return
-    if (composerOpened) {
-      composerOpened = false
-      promise.resolve(Bundle().apply { putString("status", "sent") })
+  override fun onNewIntent(intent: Intent) = Unit
+
+  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") })
+      }
     }
   }
 
-  override fun onHostPause() = Unit
-
-  override fun onHostDestroy() {
-    // do nothing
+  companion object {
+    private const val REQUEST_CODE = 8675
   }
 }

package/build/MailComposer.types.d.ts

@@ -1,7 +1,7 @@
 /**
  * A map defining the data to fill the mail.
  */
-export declare type MailComposerOptions = {
+export type MailComposerOptions = {
     /**
      * An array of e-mail addresses of the recipients.
      */
@@ -32,7 +32,7 @@ export declare type MailComposerOptions = {
      */
     attachments?: string[];
 };
-export declare type MailComposerResult = {
+export type MailComposerResult = {
     status: MailComposerStatus;
 };
 export declare enum MailComposerStatus {

package/build/MailComposer.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MailComposer.types.d.ts","sourceRoot":"","sources":["../src/MailComposer.types.ts"],"names":[],"mappings":"AACA;;GAEG;AACH,oBAAY,mBAAmB,GAAG;IAChC;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAGF,oBAAY,kBAAkB,GAAG;IAC/B,MAAM,EAAE,kBAAkB,CAAC;CAC5B,CAAC;AAGF,oBAAY,kBAAkB;IAC5B,YAAY,iBAAiB;IAC7B,IAAI,SAAS;IACb,KAAK,UAAU;IACf,SAAS,cAAc;CACxB"}
+{"version":3,"file":"MailComposer.types.d.ts","sourceRoot":"","sources":["../src/MailComposer.types.ts"],"names":[],"mappings":"AACA;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAChC;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAGF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,kBAAkB,CAAC;CAC5B,CAAC;AAGF,oBAAY,kBAAkB;IAC5B,YAAY,iBAAiB;IAC7B,IAAI,SAAS;IACb,KAAK,UAAU;IACf,SAAS,cAAc;CACxB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-mail-composer",
-  "version": "12.0.0",
+  "version": "12.1.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": "eab2b09c735fb0fc2bf734a3f29a6593adba3838"
+  "gitHead": "1815e2eaad8c753588c7b1eb74420174a28e01f4"
 }