react-native-share 7.8.0 → 7.9.1

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

@@ -45,13 +45,10 @@ public class InstagramShare extends SingleShareIntent {
                 return;
             }
             String type = options.getString("type");
+            String extension = this.getExtension(type);
             Boolean isImage = type.startsWith("image");
 
-            if (isImage) {
-                this.openInstagramIntentChooserForImage(url, chooserTitle);
-            } else {
-                super.openIntentChooser();
-            }
+            this.openInstagramIntentChooser(url, chooserTitle, isImage, extension);
     }
 
     protected void openInstagramUrlScheme(String url) {
@@ -61,18 +58,33 @@ public class InstagramShare extends SingleShareIntent {
             super.openIntentChooser();
     }
 
-    protected void openInstagramIntentChooserForImage(String url, String chooserTitle) {
+    private String getExtension(String url) {
+            String[] ext = url.split("/");
+            return ext[ext.length -1];
+    }
+
+    protected void openInstagramIntentChooser(String url, String chooserTitle, Boolean isImage, String extension) {
         Boolean shouldUseInternalStorage = ShareIntent.hasValidKey("useInternalStorage", options) && options.getBoolean("useInternalStorage");
-        ShareFile shareFile = new ShareFile(url, "image/jpeg", "image", shouldUseInternalStorage, this.reactContext);
+        ShareFile shareFile = isImage 
+            ? new ShareFile(url, "image/" + extension, "image", shouldUseInternalStorage, this.reactContext) 
+            : new ShareFile(url, "video/" + extension, "video", shouldUseInternalStorage, this.reactContext);
         Uri uri = shareFile.getURI();
 
         Intent feedIntent = new Intent(Intent.ACTION_SEND);
-        feedIntent.setType("image/*");
+
+        if (isImage) {
+            feedIntent.setType("image/*");
+        } else {
+            feedIntent.setType("video/*");
+        }
+
         feedIntent.putExtra(Intent.EXTRA_STREAM, uri);
         feedIntent.setPackage(PACKAGE);
 
         Intent storiesIntent = new Intent("com.instagram.share.ADD_TO_STORY");
-        storiesIntent.setDataAndType(uri, "jpg");
+
+        storiesIntent.setDataAndType(uri, extension);
+
         storiesIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
         storiesIntent.setPackage(PACKAGE);
 
@@ -83,6 +95,7 @@ public class InstagramShare extends SingleShareIntent {
         Activity activity = this.reactContext.getCurrentActivity();
         activity.grantUriPermission(PACKAGE, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
         this.reactContext.startActivity(chooserIntent);
+        TargetChosenReceiver.sendCallback(true, true, this.getIntent().getPackage());
     }
 
     @Override

package/ios/MessengerShare.h

@@ -0,0 +1,8 @@
+#import <UIKit/UIKit.h>
+
+#import <React/RCTBridgeModule.h>
+
+@interface MessengerShare : NSObject <RCTBridgeModule>
+
+- (void)shareSingle:(NSDictionary *)options failureCallback:(RCTResponseErrorBlock)failureCallback successCallback:(RCTResponseSenderBlock)successCallback;
+@end

package/ios/MessengerShare.m

@@ -0,0 +1,35 @@
+#import "MessengerShare.h"
+
+#import <React/RCTConvert.h>
+
+@implementation MessengerShare
+RCT_EXPORT_MODULE();
+
+- (void)shareSingle:(NSDictionary *)options failureCallback:(RCTResponseErrorBlock)failureCallback successCallback:(RCTResponseSenderBlock)successCallback {
+
+  if ([options objectForKey:@"url"] && [options objectForKey:@"url"] != [NSNull null]) {
+
+    NSString *urlString = [NSString stringWithFormat:@"fb-messenger://share?link=%@", [RCTConvert NSString:options[@"url"]]];
+    NSURL *url = [NSURL URLWithString:urlString];
+
+    if ([[UIApplication sharedApplication] canOpenURL:url]) {
+      [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil];
+
+      successCallback(@[@true, @""]);
+    } else {
+      // Cannot open Messenger
+      NSString *contentLinkString = @"https://apps.apple.com/us/app/messenger/id454638411";
+      NSURL *url = [NSURL URLWithString:contentLinkString];
+      [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil];
+
+      NSString *errorMessage = @"Not installed";
+      NSDictionary *userInfo = @{NSLocalizedFailureReasonErrorKey: NSLocalizedString(errorMessage, nil)};
+      NSError *error = [NSError errorWithDomain:@"com.rnshare" code:1 userInfo:userInfo];
+
+      NSLog(@"%@", errorMessage);
+      failureCallback(error);
+    }
+  }
+}
+
+@end

package/ios/RNShare.m

@@ -19,6 +19,7 @@
 #import "EmailShare.h"
 #import "TelegramShare.h"
 #import "ViberShare.h"
+#import "MessengerShare.h"
 #import "RNShareActivityItemSource.h"
 #import "RNShareUtils.h"
 
@@ -84,6 +85,7 @@ RCT_EXPORT_MODULE()
     @"INSTAGRAMSTORIES": @"instagramstories",
     @"TELEGRAM": @"telegram",
     @"EMAIL": @"email",
+    @"MESSENGER": @"messanger",
     @"VIBER": @"viber",
 
     @"SHARE_BACKGROUND_IMAGE": @"shareBackgroundImage",
@@ -149,7 +151,11 @@ RCT_EXPORT_METHOD(shareSingle:(NSDictionary *)options
             NSLog(@"TRY OPEN viber");
             ViberShare *shareCtl = [[ViberShare alloc] init];
             [shareCtl shareSingle:options failureCallback: failureCallback successCallback: successCallback];
-        } 
+        } else if([social isEqualToString:@"messenger"]) {
+            NSLog(@"TRY OPEN messenger");
+            MessengerShare *shareCtl = [[MessengerShare alloc] init];
+            [shareCtl shareSingle:options failureCallback: failureCallback successCallback: successCallback];
+        }
     } else {
         RCTLogError(@"key 'social' missing in options");
         return;

package/ios/RNShare.xcodeproj/project.pbxproj

@@ -7,7 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		4EED9CAF24F5A2EB006505C4 /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EED9CAE24F5A2EB006505C4 /* Utils.m */; };
+		6513A53928AF109A00F0AE09 /* MessengerShare.m in Sources */ = {isa = PBXBuildFile; fileRef = 6513A53828AF109A00F0AE09 /* MessengerShare.m */; };
+		65B4E1BA28AF0DC800D905B8 /* RNShareUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 65B4E1B928AF0DC800D905B8 /* RNShareUtils.m */; };
 		6D697F8423A86EBC00F754A1 /* RNShareActivityItemSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 6D697F8323A86EBC00F754A1 /* RNShareActivityItemSource.m */; };
 		B33C22851D441713006BCD98 /* GenericShare.m in Sources */ = {isa = PBXBuildFile; fileRef = B33C22841D441713006BCD98 /* GenericShare.m */; };
 		B33C22891D4419E8006BCD98 /* WhatsAppShare.m in Sources */ = {isa = PBXBuildFile; fileRef = B33C22881D4419E8006BCD98 /* WhatsAppShare.m */; };
@@ -33,8 +34,10 @@
 
 /* Begin PBXFileReference section */
 		134814201AA4EA6300B7C361 /* libRNShare.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNShare.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		4EED9CAD24F5A2EB006505C4 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utils.h; sourceTree = "<group>"; };
-		4EED9CAE24F5A2EB006505C4 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Utils.m; sourceTree = "<group>"; };
+		6513A53728AF108500F0AE09 /* MessengerShare.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessengerShare.h; sourceTree = "<group>"; };
+		6513A53828AF109A00F0AE09 /* MessengerShare.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessengerShare.m; sourceTree = "<group>"; };
+		65B4E1B828AF0DB400D905B8 /* RNShareUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNShareUtils.h; sourceTree = "<group>"; };
+		65B4E1B928AF0DC800D905B8 /* RNShareUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNShareUtils.m; sourceTree = "<group>"; };
 		6D697F8223A86EBC00F754A1 /* RNShareActivityItemSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNShareActivityItemSource.h; sourceTree = "<group>"; };
 		6D697F8323A86EBC00F754A1 /* RNShareActivityItemSource.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNShareActivityItemSource.m; sourceTree = "<group>"; };
 		B33C22841D441713006BCD98 /* GenericShare.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GenericShare.m; sourceTree = "<group>"; };
@@ -89,22 +92,24 @@
 		B33C22801D43F9B0006BCD98 /* social */ = {
 			isa = PBXGroup;
 			children = (
-				CE0C76361E9E7DE100ED396E /* InstagramShare.m */,
-				CE0C76621E9E869300ED396E /* InstagramShare.h */,
-				B33C22841D441713006BCD98 /* GenericShare.m */,
-				B33C22861D441723006BCD98 /* GenericShare.h */,
-				B33C22871D4419DA006BCD98 /* WhatsAppShare.h */,
-				B33C22881D4419E8006BCD98 /* WhatsAppShare.m */,
-				B33C228A1D442576006BCD98 /* EmailShare.m */,
 				B33C228C1D442583006BCD98 /* EmailShare.h */,
-				4EED9CAD24F5A2EB006505C4 /* Utils.h */,
-				4EED9CAE24F5A2EB006505C4 /* Utils.m */,
-				B3EEE48D1D4844E7008422B6 /* GooglePlusShare.m */,
+				B33C228A1D442576006BCD98 /* EmailShare.m */,
+				F1A1AD562444B09B00E32E33 /* FacebookStories.h */,
+				F1A1AD572444B09B00E32E33 /* FacebookStories.m */,
+				B33C22861D441723006BCD98 /* GenericShare.h */,
+				B33C22841D441713006BCD98 /* GenericShare.m */,
 				B3EEE48F1D4844F4008422B6 /* GooglePlusShare.h */,
+				B3EEE48D1D4844E7008422B6 /* GooglePlusShare.m */,
+				CE0C76621E9E869300ED396E /* InstagramShare.h */,
+				CE0C76361E9E7DE100ED396E /* InstagramShare.m */,
 				FCC7BB4D2214566C00E1EA39 /* InstagramStories.h */,
 				FCC7BB4E221457EF00E1EA39 /* InstagramStories.m */,
-				F1A1AD562444B09B00E32E33 /* FacebookStories.h */,
-				F1A1AD572444B09B00E32E33 /* FacebookStories.m */,
+				6513A53728AF108500F0AE09 /* MessengerShare.h */,
+				6513A53828AF109A00F0AE09 /* MessengerShare.m */,
+				65B4E1B828AF0DB400D905B8 /* RNShareUtils.h */,
+				65B4E1B928AF0DC800D905B8 /* RNShareUtils.m */,
+				B33C22871D4419DA006BCD98 /* WhatsAppShare.h */,
+				B33C22881D4419E8006BCD98 /* WhatsAppShare.m */,
 			);
 			name = social;
 			sourceTree = "<group>";
@@ -167,14 +172,15 @@
 			buildActionMask = 2147483647;
 			files = (
 				F1A1AD582444B09B00E32E33 /* FacebookStories.m in Sources */,
+				65B4E1BA28AF0DC800D905B8 /* RNShareUtils.m in Sources */,
 				6D697F8423A86EBC00F754A1 /* RNShareActivityItemSource.m in Sources */,
 				CE0C76371E9E7DE100ED396E /* InstagramShare.m in Sources */,
-				4EED9CAF24F5A2EB006505C4 /* Utils.m in Sources */,
 				B3EEE48E1D4844E7008422B6 /* GooglePlusShare.m in Sources */,
 				B3E7B58A1CC2AC0600A0062D /* RNShare.m in Sources */,
 				B33C22891D4419E8006BCD98 /* WhatsAppShare.m in Sources */,
 				B33C228B1D442577006BCD98 /* EmailShare.m in Sources */,
 				FCC7BB4F221457EF00E1EA39 /* InstagramStories.m in Sources */,
+				6513A53928AF109A00F0AE09 /* MessengerShare.m in Sources */,
 				B33C22851D441713006BCD98 /* GenericShare.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

package/ios/RNShareUtils.h

@@ -1,3 +1,5 @@
+#import <Foundation/Foundation.h>
+
 @interface RNShareUtils : NSObject
 +(NSString*)getExtensionFromBase64:(NSString*)base64String;
 +(NSURL*)getPathFromBase64:(NSString*)base64String with:(NSData*)data;

package/ios/WhatsAppShare.m

@@ -1,5 +1,5 @@
 //
-//  FacebookShare.m
+//  WhatsAppShare.m
 //  RNShare
 //
 //  Created by Diseño Uno BBCL on 23-07-16.

package/package.json

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