v1.0.6 Added optional mime type for Android sharing intents

NicholasSheehan · May 8, 2021 · aae5e81 · aae5e81
1 parent 0739e96
commit aae5e81
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 15 deletions.
diff --git a/Adapters/AndroidUnityNativeSharingAdapter.cs b/Adapters/AndroidUnityNativeSharingAdapter.cs
@@ -33,11 +33,11 @@ public AndroidUnityNativeSharingAdapter()
             sharingJavaClass = new AndroidJavaClass(AndroidClass);
         }
 
-        public void ShareScreenshotAndText(string shareText, string filePath, bool showShareDialogBox = true, string shareDialogBoxText = "Select App To Share With")
+        public void ShareScreenshotAndText(string shareText, string filePath, bool showShareDialogBox = true, string shareDialogBoxText = "Select App To Share With", string mimeType = "image/*")
         {
             AndroidJNI.AttachCurrentThread();
 
-            sharingJavaClass.CallStatic(ShareScreenshotWithTextMethodName, shareText, filePath, showShareDialogBox, shareDialogBoxText);
+            sharingJavaClass.CallStatic(ShareScreenshotWithTextMethodName, shareText, filePath, showShareDialogBox, shareDialogBoxText, mimeType);
         }
 
         public void ShareText(string shareText, bool showShareDialogBox = true, string shareDialogBoxText = "Select App To Share With")

diff --git a/Adapters/IUnityNativeSharingAdapter.cs b/Adapters/IUnityNativeSharingAdapter.cs
@@ -2,7 +2,7 @@ namespace UnityNative.Sharing
 {
     public interface IUnityNativeSharingAdapter
     {
-        void ShareScreenshotAndText(string shareText, string filePath,                  bool   showShareDialogBox = true, string shareDialogBoxText = "Select App To Share With");
+        void ShareScreenshotAndText(string shareText, string filePath,                  bool   showShareDialogBox = true, string shareDialogBoxText = "Select App To Share With", string mimeType = "image/*");
         void ShareText(string              shareText, bool   showShareDialogBox = true, string shareDialogBoxText = "Select App To Share With");
     }
 }
diff --git a/Adapters/IosUnityNativeSharingAdapter.cs b/Adapters/IosUnityNativeSharingAdapter.cs
@@ -10,7 +10,7 @@ public class IosUnityNativeSharingAdapter : IUnityNativeSharingAdapter
         [System.Runtime.InteropServices.DllImport("__Internal")]
         private static extern void UnityNative_Sharing_ShareText(string shareText);
 
-        public void ShareScreenshotAndText(string shareText, string filePath, bool showShareDialogBox = true, string shareDialogBoxText = "Select App To Share With")
+        public void ShareScreenshotAndText(string shareText, string filePath, bool showShareDialogBox = true, string shareDialogBoxText = "Select App To Share With", string mimeType = "image/*")
         {
             UnityNative_Sharing_ShareTextAndScreenshot(shareText, filePath);
         }

diff --git a/Adapters/NullUnityNativeSharingAdapter.cs b/Adapters/NullUnityNativeSharingAdapter.cs
@@ -2,7 +2,7 @@ namespace UnityNative.Sharing
 {
     public class NullUnityNativeSharingAdapter : IUnityNativeSharingAdapter
     {
-        public void ShareScreenshotAndText(string shareText, string filePath, bool showShareDialogBox = true, string shareDialogBoxText = "Select App To Share With")
+        public void ShareScreenshotAndText(string shareText, string filePath, bool showShareDialogBox = true, string shareDialogBoxText = "Select App To Share With", string mimeType = "image/*")
         {
         }
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,9 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [1.0.6] - 2021-03-09
+### Added
+- Added optional mime type parameter for Android to use in the intent rather than it being hardcoded to `image/*`
 
 ## [1.0.5] - 2021-01-07
 ### Fixed

diff --git a/...ndroid/com.UnityNative.Sharing-v1.0.5.aar → ...ndroid/com.UnityNative.Sharing-v1.0.6.aar b/...ndroid/com.UnityNative.Sharing-v1.0.5.aar → ...ndroid/com.UnityNative.Sharing-v1.0.6.aar
diff --git a/...d/com.UnityNative.Sharing-v1.0.5.aar.meta → ...d/com.UnityNative.Sharing-v1.0.6.aar.meta b/...d/com.UnityNative.Sharing-v1.0.5.aar.meta → ...d/com.UnityNative.Sharing-v1.0.6.aar.meta
diff --git a/Plugins/Android/src~/Unity-Native-Sharing/build.gradle b/Plugins/Android/src~/Unity-Native-Sharing/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 ext.outputDir = "..\\.."
-ext.outputName = "com.UnityNative.Sharing-v1.0.5"
+ext.outputName = "com.UnityNative.Sharing-v1.0.6"
 
 android {
     compileSdkVersion 28

diff --git a/...Unity-Native-Sharing/src/main/java/com/UnityNative/Sharing/UnityNativeSharingAdapter.java b/...Unity-Native-Sharing/src/main/java/com/UnityNative/Sharing/UnityNativeSharingAdapter.java
@@ -24,14 +24,15 @@ public class UnityNativeSharingAdapter {
      * @param imagePath          - Path to the file to share
      * @param showShareDialog    - Should the share dialog be opened
      * @param shareDialogBoxText - Title of the share dialog
+     * @param mimeType           - Mime type of the file being shared
      */
     @Keep
-    public static void ShareScreenshotAndText(String shareText, String imagePath, boolean showShareDialog, String shareDialogBoxText) {
+    public static void ShareScreenshotAndText(String shareText, String imagePath, boolean showShareDialog, String shareDialogBoxText, String mimeType) {
 
         //Generate the intent
         Intent intent = new Intent();
         intent.setAction(Intent.ACTION_SEND);
-        intent.setType("image/*");
+        intent.setType(mimeType);
         intent.putExtra(Intent.EXTRA_TEXT, shareText);
         intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
 

diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ Examples can be found at [Unity-Native-Example-Project](https://github.com/Nicho
 
 ![AddPackageFromGitURL](Images~/AddPackageFromGitURL.PNG)
 
-`https://github.com/NicholasSheehan/Unity-Native-Sharing.git#v1.0.5`
+`https://github.com/NicholasSheehan/Unity-Native-Sharing.git#v1.0.6`
 
 <h2 align="center">Unity 2018.3 or later (Using Unity Package Manager)</h2>
 
@@ -50,7 +50,7 @@ Add this to the projects `manifest.json`
 
 To update the package, change suffix `#{version}` to the target version.
 
-* e.g. `"com.unitynative.sharing" : "https://github.com/NicholasSheehan/Unity-Native-Sharing.git#v1.0.5"`
+* e.g. `"com.unitynative.sharing" : "https://github.com/NicholasSheehan/Unity-Native-Sharing.git#v1.0.6"`
 
 <h2 align="center">Unity 2018.3 or later (Using OpenUPM)</h2>
 

diff --git a/UnityNativeSharing.cs b/UnityNativeSharing.cs
@@ -2,7 +2,7 @@
 {
     public interface IUnityNativeSharing
     {
-        void ShareScreenshotAndText(string shareText, string filePath,                  bool   showShareDialogBox = true, string shareDialogBoxText = "Select App To Share With");
+        void ShareScreenshotAndText(string shareText, string filePath,                  bool   showShareDialogBox = true, string shareDialogBoxText = "Select App To Share With", string mimeType = "image/*");
         void ShareText(string              shareText, bool   showShareDialogBox = true, string shareDialogBoxText = "Select App To Share With");
     }
 
@@ -38,9 +38,10 @@ public UnityNativeSharing(IUnityNativeSharingAdapter adapter)
         /// <param name="filePath">The path to the attached file</param>
         /// <param name="showShareDialogBox">Should the share dialog be opened (Android only)</param>
         /// <param name="shareDialogBoxText">The text to show on the share dialog (Android only)</param>
-        public void ShareScreenshotAndText(string shareText, string filePath, bool showShareDialogBox = true, string shareDialogBoxText = "Select App To Share With")
+        /// <param name="mimeType">Mime type of the file being shared (Android only)</param>
+        public void ShareScreenshotAndText(string shareText, string filePath, bool showShareDialogBox = true, string shareDialogBoxText = "Select App To Share With", string mimeType = "image/*")
         {
-            adapter.ShareScreenshotAndText(shareText, filePath, showShareDialogBox, shareDialogBoxText);
+            adapter.ShareScreenshotAndText(shareText, filePath, showShareDialogBox, shareDialogBoxText, mimeType);
         }
 
         /// <summary>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.unitynative.sharing",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "displayName": "Unity-Native-Sharing",
   "description": "A Unity plugin to open native sharing dialogs on iOS and Android",
   "unity": "2018.3",
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ namespace UnityNative.Sharing @@
     {
         public class NullUnityNativeSharingAdapter : IUnityNativeSharingAdapter
         {
-            public void ShareScreenshotAndText(string shareText, string filePath, bool showShareDialogBox = true, string shareDialogBoxText = "Select App To Share With")
+            public void ShareScreenshotAndText(string shareText, string filePath, bool showShareDialogBox = true, string shareDialogBoxText = "Select App To Share With", string mimeType = "image/*")
             {
             }
@@ Expand Down @@