expo-sharing 11.2.2 → 11.3.1

package/CHANGELOG.md

@@ -10,9 +10,17 @@
 
 ### 💡 Others
 
-## 11.2.2 — 2023-03-03
+## 11.3.1 — 2023-04-14
 
-_This version does not introduce any user-facing changes._
+### 🐛 Bug fixes
+
+- On iOS, fixed an issue where file permissions were not checked correctly. ([#22112](https://github.com/expo/expo/pull/22112) by [@alanjhughes](https://github.com/alanjhughes))
+
+## 11.3.0 — 2023-04-12
+
+### 🎉 New features
+
+- On iOS, switched from using `UIDocumentInteractionController` to `UIActivityViewController` which provides more features. ([#22012](https://github.com/expo/expo/pull/22012) by [@alanjhughes](https://github.com/alanjhughes))
 
 ## 11.2.1 — 2023-02-09
 
@@ -28,7 +36,7 @@ _This version does not introduce any user-facing changes._
 
 ### 🎉 New features
 
-- Migrated Android implementation to Expo Modules API. ([#20112](https://github.com/expo/expo/pull/20112) by [@alanhughes](https://github.com/alanjhughes))
+- Migrated module to Expo Modules API. ([#20112](https://github.com/expo/expo/pull/20112) and ([#20969](https://github.com/expo/expo/pull/20969) by [@alanhughes](https://github.com/alanjhughes))
 
 ## 11.0.1 — 2022-10-27
 

package/README.md

@@ -9,7 +9,7 @@ Sharing standalone module
 
 # 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/sharing/).
+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/sharing/).
 
 # Installation in bare React Native projects
 

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '11.2.2'
+version = '11.3.1'
 
 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 16
-    versionName '11.2.2'
+    versionName '11.3.1'
   }
   lintOptions {
     abortOnError false

package/expo-module.config.json

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

package/ios/Exceptions.swift

@@ -0,0 +1,25 @@
+import ExpoModulesCore
+
+internal class FilePermissionException: Exception {
+  override var reason: String {
+    "You don't have access to the provided file"
+  }
+}
+
+internal class MissingCurrentViewControllerException: Exception {
+  override var reason: String {
+    "Cannot determine currently presented view controller"
+  }
+}
+
+internal class UnsupportedTypeException: Exception {
+  override var reason: String {
+    "Could not share file since there were no apps registered for its type"
+  }
+}
+
+internal class FilePermissionModuleException: Exception {
+  override var reason: String {
+    "File permission module not found"
+  }
+}

package/ios/{EXSharing.podspec → ExpoSharing.podspec}

@@ -3,7 +3,7 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, '..', 'package.json')))
 
 Pod::Spec.new do |s|
-  s.name           = 'EXSharing'
+  s.name           = 'ExpoSharing'
   s.version        = package['version']
   s.summary        = package['description']
   s.description    = package['description']
@@ -11,15 +11,22 @@ Pod::Spec.new do |s|
   s.author         = package['author']
   s.homepage       = package['homepage']
   s.platform       = :ios, '13.0'
+  s.swift_version  = '5.4'
   s.source         = { git: 'https://github.com/expo/expo.git' }
   s.static_framework = true
 
   s.dependency 'ExpoModulesCore'
 
+  # Swift/Objective-C compatibility
+  s.pod_target_xcconfig = {
+    'DEFINES_MODULE' => 'YES',
+    'SWIFT_COMPILATION_MODE' => 'wholemodule'
+  }
+
   if !$ExpoUseSources&.include?(package['name']) && ENV['EXPO_USE_SOURCE'].to_i == 0 && File.exist?("#{s.name}.xcframework") && Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.10.0')
-    s.source_files = "#{s.name}/**/*.h"
+    s.source_files = "**/*.h"
     s.vendored_frameworks = "#{s.name}.xcframework"
   else
-    s.source_files = "#{s.name}/**/*.{h,m}"
+    s.source_files = "**/*.{h,m,swift}"
   end
 end

package/ios/SharingModule.swift

@@ -0,0 +1,43 @@
+import ExpoModulesCore
+
+public final class SharingModule: Module {
+
+  public func definition() -> ModuleDefinition {
+    Name("ExpoSharing")
+
+    AsyncFunction("shareAsync") { (url: URL, options: SharingOptions, promise: Promise) in
+      guard let filePermissions: EXFilePermissionModuleInterface =
+        appContext?.legacyModule(implementing: EXFilePermissionModuleInterface.self)
+      else {
+        throw FilePermissionModuleException()
+      }
+
+      let grantedPermissions = filePermissions.getPathPermissions(url.relativePath)
+      guard grantedPermissions.rawValue >= EXFileSystemPermissionFlags.read.rawValue else {
+        throw FilePermissionException()
+      }
+
+      let activityController = UIActivityViewController(activityItems: [url], applicationActivities: nil)
+      activityController.title = options.dialogTitle
+
+      activityController.completionWithItemsHandler = { type, completed, _, _ in
+        // user shared an item
+        if type != nil && completed {
+          promise.resolve(nil)
+        }
+
+        // dismissed without action
+        if type == nil && !completed {
+          promise.resolve(nil)
+        }
+      }
+
+      guard let currentViewcontroller = appContext?.utilities?.currentViewController() else {
+        throw MissingCurrentViewControllerException()
+      }
+
+      currentViewcontroller.present(activityController, animated: true)
+    }
+    .runOnQueue(.main)
+  }
+}

package/ios/SharingOptions.swift

@@ -0,0 +1,7 @@
+import ExpoModulesCore
+
+internal struct SharingOptions: Record {
+  @Field var mimeType: String?
+  @Field var UTI: String?
+  @Field var dialogTitle: String?
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-sharing",
-  "version": "11.2.2",
+  "version": "11.3.1",
   "description": "ExpoSharing standalone module",
   "main": "build/Sharing.js",
   "types": "build/Sharing.d.ts",
@@ -37,5 +37,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "129986cd78fd83642786df331e8ba9e1451c5ee0"
+  "gitHead": "5d628076915823cbe56e281ec17c3a34cc0c1fc6"
 }

package/ios/EXSharing/EXSharingModule.h

@@ -1,8 +0,0 @@
-//  Copyright © 2018 650 Industries. All rights reserved.
-
-#import <ExpoModulesCore/EXExportedModule.h>
-#import <ExpoModulesCore/EXModuleRegistryConsumer.h>
-#import <UIKit/UIKit.h>
-
-@interface EXSharingModule : EXExportedModule <EXModuleRegistryConsumer, UIDocumentInteractionControllerDelegate>
-@end

package/ios/EXSharing/EXSharingModule.m

@@ -1,85 +0,0 @@
-// Copyright 2018-present 650 Industries. All rights reserved.
-
-#import <EXSharing/EXSharingModule.h>
-#import <ExpoModulesCore/EXUtilitiesInterface.h>
-#import <ExpoModulesCore/EXFileSystemInterface.h>
-#import <ExpoModulesCore/EXFilePermissionModuleInterface.h>
-
-@interface EXSharingModule ()
-
-@property (nonatomic, weak) EXModuleRegistry *moduleRegistry;
-@property (nonatomic, strong) UIDocumentInteractionController *documentInteractionController;
-
-@property (nonatomic, strong) EXPromiseResolveBlock pendingResolver;
-
-@end
-
-@implementation EXSharingModule
-
-EX_EXPORT_MODULE(ExpoSharing);
-
-- (void)setModuleRegistry:(EXModuleRegistry *)moduleRegistry
-{
-  _moduleRegistry = moduleRegistry;
-}
-
-EX_EXPORT_METHOD_AS(shareAsync,
-                    fileUrl:(NSString *)fileUrl
-                    params:(NSDictionary *)params
-                    resolve:(EXPromiseResolveBlock)resolve
-                    reject:(EXPromiseRejectBlock)reject)
-{
-  if (_documentInteractionController) {
-    NSString *errorMessage = @"Another item is being shared. Await the `shareAsync` request and then share the item again.";
-    reject(@"E_SHARING_MUL", errorMessage, EXErrorWithMessage(errorMessage));
-    return;
-  }
-
-  NSURL *url = [NSURL URLWithString:fileUrl];
-
-  id<EXFilePermissionModuleInterface> filePermissionsModule = [_moduleRegistry getModuleImplementingProtocol:@protocol(EXFilePermissionModuleInterface)];
-  if (filePermissionsModule && !([filePermissionsModule getPathPermissions:url.path] & EXFileSystemPermissionRead)) {
-    NSString *errorMessage = @"You don't have access to provided file.";
-    reject(@"E_SHARING_PERM", errorMessage, EXErrorWithMessage(errorMessage));
-    return;
-  }
-
-  _documentInteractionController = [UIDocumentInteractionController interactionControllerWithURL:url];
-  _documentInteractionController.delegate = self;
-  _documentInteractionController.UTI = params[@"UTI"];
-
-  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;
-    } else {
-      reject(@"ERR_SHARING_UNSUPPORTED_TYPE", @"Could not share file since there were no apps registered for its type", nil);
-      self.documentInteractionController = nil;
-    }
-  });
-}
-
-- (void)documentInteractionControllerDidDismissOpenInMenu:(UIDocumentInteractionController *)controller
-{
-  _pendingResolver(nil);
-  _pendingResolver = 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