expo-sharing 11.0.0 → 11.1.0

package/CHANGELOG.md

@@ -10,6 +10,18 @@
 
 ### 💡 Others
 
+## 11.1.0 — 2022-12-30
+
+### 🎉 New features
+
+- Migrated Android implementation to Expo Modules API. ([#20112](https://github.com/expo/expo/pull/20112) by [@alanhughes](https://github.com/alanjhughes))
+
+## 11.0.1 — 2022-10-27
+
+### 🐛 Bug fixes
+
+- On iOS, dismiss share sheet after sharing to an app is canceled, so the file doesn't fail to attach when trying to share again ([#19656](https://github.com/expo/expo/pull/19656) by [@keith-kurak](https://github.com/keith-kurak))
+
 ## 11.0.0 — 2022-10-25
 
 ### 🛠 Breaking changes

package/README.md

@@ -4,7 +4,7 @@ Sharing standalone module
 
 # API documentation
 
-- [Documentation for the main branch](https://github.com/expo/expo/blob/main/docs/pages/versions/unversioned/sdk/sharing.md)
+- [Documentation for the main branch](https://github.com/expo/expo/blob/main/docs/pages/versions/unversioned/sdk/sharing.mdx)
 - [Documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/sharing/)
 
 # 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 = '11.0.0'
+version = '11.1.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", 31)
     versionCode 16
-    versionName '11.0.0'
+    versionName '11.1.0'
   }
   lintOptions {
     abortOnError false

package/android/src/main/java/expo/modules/sharing/SharingExceptions.kt

@@ -0,0 +1,15 @@
+package expo.modules.sharing
+
+import expo.modules.kotlin.exception.CodedException
+
+internal class MissingCurrentActivityException :
+  CodedException("Activity which was provided during module initialization is no longer available")
+
+internal class SharingInProgressException :
+  CodedException("Another share request is being processed now.")
+
+internal class SharingFailedException(message: String, e: Exception) :
+  CodedException(message, e.cause)
+
+internal class SharingInvalidArgsException(message: String?, e: Exception) :
+  CodedException(message, e.cause)

package/android/src/main/java/expo/modules/sharing/SharingModule.kt

@@ -1,81 +1,69 @@
 package expo.modules.sharing
 
-import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
 import androidx.core.content.FileProvider
-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.errors.InvalidArgumentException
-import expo.modules.core.interfaces.ActivityEventListener
-import expo.modules.core.interfaces.ActivityProvider
-import expo.modules.core.interfaces.ExpoMethod
-import expo.modules.core.interfaces.services.UIManager
-import expo.modules.interfaces.filesystem.FilePermissionModuleInterface
 import expo.modules.interfaces.filesystem.Permission
+import expo.modules.kotlin.Promise
+import expo.modules.kotlin.exception.Exceptions
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
 import java.io.File
 import java.net.URLConnection
 
-class SharingModule(
-  context: Context,
-  private val moduleRegistryDelegate: ModuleRegistryDelegate = ModuleRegistryDelegate()
-) : ExportedModule(context), ActivityEventListener {
+class SharingModule : Module() {
+  private val context: Context
+    get() = appContext.reactContext ?: throw Exceptions.ReactContextLost()
+  private val currentActivity
+    get() = appContext.currentActivity ?: throw MissingCurrentActivityException()
   private var pendingPromise: Promise? = null
-  private val uiManager: UIManager by moduleRegistry()
-  override fun getName() = "ExpoSharing"
 
-  private inline fun <reified T> moduleRegistry() =
-    moduleRegistryDelegate.getFromModuleRegistry<T>()
+  override fun definition() = ModuleDefinition {
+    Name("ExpoSharing")
 
-  override fun onCreate(moduleRegistry: ModuleRegistry) {
-    moduleRegistryDelegate.onCreate(moduleRegistry)
-    uiManager.registerActivityEventListener(this)
-  }
-
-  override fun onDestroy() {
-    uiManager.unregisterActivityEventListener(this)
-  }
-
-  @ExpoMethod
-  fun shareAsync(url: String?, params: ReadableArguments, promise: Promise) {
-    if (pendingPromise != null) {
-      promise.reject("ERR_SHARING_MUL", "Another share request is being processed now.")
-      return
+    AsyncFunction("shareAsync") { url: String?, params: SharingOptions, promise: Promise ->
+      if (pendingPromise != null) {
+        throw SharingInProgressException()
+      }
+      try {
+        val fileToShare = getLocalFileFoUrl(url)
+        val contentUri = FileProvider.getUriForFile(
+          context,
+          context.applicationInfo.packageName + ".SharingFileProvider",
+          fileToShare
+        )
+        val mimeType = params.mimeType
+          ?: URLConnection.guessContentTypeFromName(fileToShare.name)
+          ?: "*/*"
+        val intent = Intent.createChooser(
+          createSharingIntent(contentUri, mimeType),
+          params.dialogTitle
+        )
+        val resInfoList = context.packageManager.queryIntentActivities(
+          intent,
+          PackageManager.MATCH_DEFAULT_ONLY
+        )
+        resInfoList.forEach {
+          val packageName = it.activityInfo.packageName
+          context.grantUriPermission(packageName, contentUri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+        }
+        pendingPromise = promise
+        currentActivity.startActivity(intent)
+      } catch (e: InvalidArgumentException) {
+        throw SharingInvalidArgsException(e.message, e)
+      } catch (e: Exception) {
+        throw SharingFailedException("Failed to share the file: ${e.message}", e)
+      }
     }
-    try {
-      val fileToShare = getLocalFileFoUrl(url)
-      val contentUri = FileProvider.getUriForFile(
-        context,
-        context.applicationInfo.packageName + ".SharingFileProvider",
-        fileToShare
-      )
-      val mimeType = params.getString(MIME_TYPE_OPTIONS_KEY)
-        ?: URLConnection.guessContentTypeFromName(fileToShare.name)
-        ?: "*/*"
-      val intent = Intent.createChooser(
-        createSharingIntent(contentUri, mimeType),
-        params.getString(DIALOG_TITLE_OPTIONS_KEY)
-      )
-      val resInfoList = context.packageManager.queryIntentActivities(
-        intent,
-        PackageManager.MATCH_DEFAULT_ONLY
-      )
-      resInfoList.forEach {
-        val packageName = it.activityInfo.packageName
-        context.grantUriPermission(packageName, contentUri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+
+    OnActivityResult { _, (requestCode) ->
+      if (requestCode == REQUEST_CODE && pendingPromise != null) {
+        pendingPromise?.resolve(null)
+        pendingPromise = null
       }
-      val activityProvider: ActivityProvider by moduleRegistry()
-      activityProvider.currentActivity.startActivityForResult(intent, REQUEST_CODE)
-      pendingPromise = promise
-    } catch (e: InvalidArgumentException) {
-      promise.reject("ERR_SHARING_URL", e.message, e)
-    } catch (e: Exception) {
-      promise.reject("ERR_SHARING", "Failed to share the file: " + e.message, e)
     }
   }
 
@@ -97,8 +85,9 @@ class SharingModule(
   }
 
   private fun isAllowedToRead(url: String?): Boolean {
-    val permissionModuleInterface: FilePermissionModuleInterface by moduleRegistry()
-    return permissionModuleInterface.getPathPermissions(context, url).contains(Permission.READ)
+    val permissions = appContext.filePermission
+    return permissions?.getPathPermissions(context, url)?.contains(Permission.READ)
+      ?: false
   }
 
   private fun createSharingIntent(uri: Uri, mimeType: String?) =
@@ -108,18 +97,7 @@ class SharingModule(
       addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
     }
 
-  override fun onActivityResult(activity: Activity, requestCode: Int, resultCode: Int, data: Intent?) {
-    if (requestCode == REQUEST_CODE && pendingPromise != null) {
-      pendingPromise?.resolve(null)
-      pendingPromise = null
-    }
-  }
-
-  override fun onNewIntent(intent: Intent) = Unit
-
   companion object {
     private const val REQUEST_CODE = 8524
-    private const val MIME_TYPE_OPTIONS_KEY = "mimeType"
-    private const val DIALOG_TITLE_OPTIONS_KEY = "dialogTitle"
   }
 }

package/android/src/main/java/expo/modules/sharing/SharingOptions.kt

@@ -0,0 +1,10 @@
+package expo.modules.sharing
+
+import expo.modules.kotlin.records.Field
+import expo.modules.kotlin.records.Record
+
+data class SharingOptions(
+  @Field val mimeType: String?,
+  @Field val UTI: String?,
+  @Field val dialogTitle: String?
+) : Record

package/build/ExpoSharing.d.ts

@@ -1,3 +1,3 @@
-declare const _default: import("expo-modules-core").ProxyNativeModule;
+declare const _default: any;
 export default _default;
 //# sourceMappingURL=ExpoSharing.d.ts.map

package/build/ExpoSharing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoSharing.d.ts","sourceRoot":"","sources":["../src/ExpoSharing.ts"],"names":[],"mappings":";AAEA,wBAA8C"}
+{"version":3,"file":"ExpoSharing.d.ts","sourceRoot":"","sources":["../src/ExpoSharing.ts"],"names":[],"mappings":";AACA,wBAAkD"}

package/build/ExpoSharing.js

@@ -1,3 +1,3 @@
-import { NativeModulesProxy } from 'expo-modules-core';
-export default NativeModulesProxy.ExpoSharing;
+import { requireNativeModule } from 'expo-modules-core';
+export default requireNativeModule('ExpoSharing');
 //# sourceMappingURL=ExpoSharing.js.map

package/build/ExpoSharing.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoSharing.js","sourceRoot":"","sources":["../src/ExpoSharing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,eAAe,kBAAkB,CAAC,WAAW,CAAC","sourcesContent":["import { NativeModulesProxy } from 'expo-modules-core';\n\nexport default NativeModulesProxy.ExpoSharing;\n"]}
+{"version":3,"file":"ExpoSharing.js","sourceRoot":"","sources":["../src/ExpoSharing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,eAAe,mBAAmB,CAAC,aAAa,CAAC,CAAC","sourcesContent":["import { requireNativeModule } from 'expo-modules-core';\nexport default requireNativeModule('ExpoSharing');\n"]}

package/build/ExpoSharing.web.d.ts

@@ -1,4 +1,4 @@
-declare type ShareOptions = {
+type ShareOptions = {
     title?: string;
     text?: string;
     url?: string;

package/build/ExpoSharing.web.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoSharing.web.d.ts","sourceRoot":"","sources":["../src/ExpoSharing.web.ts"],"names":[],"mappings":"AAEA,aAAK,YAAY,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;;;wBAMxC,QAAQ,OAAO,CAAC;oBAOpB,MAAM,YAAW,YAAY,GAAQ,QAAQ,IAAI,CAAC;;AAX1E,wBAmBE"}
+{"version":3,"file":"ExpoSharing.web.d.ts","sourceRoot":"","sources":["../src/ExpoSharing.web.ts"],"names":[],"mappings":"AAEA,KAAK,YAAY,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;;;wBAMxC,QAAQ,OAAO,CAAC;oBAOpB,MAAM,YAAW,YAAY,GAAQ,QAAQ,IAAI,CAAC;;AAX1E,wBAmBE"}

package/build/Sharing.d.ts

@@ -1,4 +1,4 @@
-export declare type SharingOptions = {
+export type SharingOptions = {
     /**
      * Sets `mimeType` for `Intent`.
      * @platform android

package/build/Sharing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Sharing.d.ts","sourceRoot":"","sources":["../src/Sharing.ts"],"names":[],"mappings":"AAKA,oBAAY,cAAc,GAAG;IAC3B;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAGF;;;GAGG;AACH,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC,CASzD;AAGD;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAKzF"}
+{"version":3,"file":"Sharing.d.ts","sourceRoot":"","sources":["../src/Sharing.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,cAAc,GAAG;IAC3B;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAGF;;;GAGG;AACH,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC,CASzD;AAGD;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAKzF"}

package/expo-module.config.json

@@ -0,0 +1,7 @@
+{
+  "name": "expo-sharing",
+  "platforms": ["ios", "android"],
+  "android": {
+    "modules": ["expo.modules.sharing.SharingModule"]
+  }
+}

package/ios/EXSharing/EXSharingModule.m

@@ -48,11 +48,10 @@ EX_EXPORT_METHOD_AS(shareAsync,
   _documentInteractionController.delegate = self;
   _documentInteractionController.UTI = params[@"UTI"];
 
-  UIViewController *viewController = [[_moduleRegistry getModuleImplementingProtocol:@protocol(EXUtilitiesInterface)] currentViewController];
-
   EX_WEAKIFY(self);
   dispatch_async(dispatch_get_main_queue(), ^{
     EX_ENSURE_STRONGIFY(self);
+    UIViewController *viewController = [[self.moduleRegistry getModuleImplementingProtocol:@protocol(EXUtilitiesInterface)] currentViewController];
     UIView *rootView = [viewController view];
     if ([self.documentInteractionController presentOpenInMenuFromRect:CGRectZero inView:rootView animated:YES]) {
       self.pendingResolver = resolve;
@@ -68,7 +67,19 @@ EX_EXPORT_METHOD_AS(shareAsync,
   _pendingResolver(nil);
   _pendingResolver = nil;
 
-  _documentInteractionController = nil;
+  // This delegate method is called whenever:
+  // a) the share sheet is canceled
+  // b) an app is chosen, it's dialog opened, and the share is confirmed/ sent
+  // c) an app is chosen, it's dialog opened, and that dialog is canceled
+  // In case c), the share sheet remains open, even though the promise was resolved
+  // Future attempts to share without closing the sheet will fail to attach the file, so we need to close it
+  // No other delegate methods fire only when the share sheet is dismissed, unfortunately
+  EX_WEAKIFY(self);
+  dispatch_async(dispatch_get_main_queue(), ^{
+    EX_ENSURE_STRONGIFY(self);
+    [self.documentInteractionController dismissMenuAnimated:true];
+    self.documentInteractionController = nil;
+  });
 }
 
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-sharing",
-  "version": "11.0.0",
+  "version": "11.1.0",
   "description": "ExpoSharing standalone module",
   "main": "build/Sharing.js",
   "types": "build/Sharing.d.ts",
@@ -37,5 +37,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "eab2b09c735fb0fc2bf734a3f29a6593adba3838"
+  "gitHead": "ba80e8181b79d06e00a245653727f4eaeb80420e"
 }

package/src/ExpoSharing.ts

@@ -1,3 +1,2 @@
-import { NativeModulesProxy } from 'expo-modules-core';
-
-export default NativeModulesProxy.ExpoSharing;
+import { requireNativeModule } from 'expo-modules-core';
+export default requireNativeModule('ExpoSharing');

package/android/src/main/java/expo/modules/sharing/SharingPackage.kt

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

package/unimodule.json

@@ -1,4 +0,0 @@
-{
-  "name": "expo-sharing",
-  "platforms": ["ios", "android"]
-}