react-native-share 5.1.1 → 5.1.5

package/android/src/main/java/cl/json/social/ShareIntent.java

@@ -340,7 +340,7 @@ public abstract class ShareIntent {
         } else {
             chooser = Intent.createChooser(this.getIntent(), this.chooserTitle);
         }
-        chooser.setFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
+        chooser.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
 
         if (ShareIntent.hasValidKey("showAppsToView", options) && ShareIntent.hasValidKey("url", options)) {
             Intent viewIntent = new Intent(Intent.ACTION_VIEW);

package/android/src/main/java/cl/json/social/SingleShareIntent.java

@@ -78,11 +78,11 @@ public abstract class SingleShareIntent extends ShareIntent {
             if (TargetChosenReceiver.isSupported()) {
                 IntentSender sender = TargetChosenReceiver.getSharingSenderIntent(this.reactContext);
                 Intent chooser = Intent.createChooser(this.getIntent(), this.chooserTitle, sender);
-                chooser.setFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
+                chooser.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
                 activity.startActivityForResult(chooser, RNShareModule.SHARE_REQUEST_CODE);
             } else {
                 Intent chooser = Intent.createChooser(this.getIntent(), this.chooserTitle);
-                chooser.setFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
+                chooser.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
                 activity.startActivityForResult(chooser, RNShareModule.SHARE_REQUEST_CODE);
                 TargetChosenReceiver.sendCallback(true, true, "OK");
             }

package/ios/RNShare.m

@@ -262,13 +262,23 @@ RCT_EXPORT_METHOD(open:(NSDictionary *)options
         shareController.excludedActivityTypes = excludedActivityTypes;
     }
 
+    __weak UIActivityViewController* weakShareController = shareController;
     shareController.completionWithItemsHandler = ^(NSString *activityType, BOOL completed, __unused NSArray *returnedItems, NSError *activityError) {
+        
+        // always dismiss since this may be called from cancelled shares
+        // but the share menu would remain open, and our callback would fire again on close
+        [controller dismissViewControllerAnimated:true completion:nil];
+        
         if (activityError) {
-            [controller  dismissViewControllerAnimated:true completion:nil];
             failureCallback(activityError);
-        } else if (completed || activityType == nil) {
+        } else {
             successCallback(@[@(completed), RCTNullIfNil(activityType)]);
         }
+        
+        // clear the completion handler to prevent cycles
+        if(weakShareController){
+            weakShareController.completionWithItemsHandler = nil;
+        }
     };
 
     shareController.modalPresentationStyle = UIModalPresentationPopover;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-share",
   "description": "Social share, sending simple data to other apps.",
-  "version": "5.1.1",
+  "version": "5.1.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/react-native-community/react-native-share.git"