- Additional options added for iOS

- Fix share issue with SDK version 24 or above on Android
Puah-Devops · May 24, 2018 · 19029eb · 19029eb
1 parent 729ca8e
commit 19029eb
Show file tree

Hide file tree

Showing 7 changed files with 191 additions and 69 deletions.
diff --git a/README.md b/README.md
@@ -29,12 +29,23 @@ $ npm install --save @ionic-native/photo-viewer
 PhotoViewer.show('http://my_site.com/my_image.jpg', 'Optional Title');
 ```
 
-Optionally you can pass third parameter which can be used to hide the share button [ONLY FOR ANDROID]
+Optionally you can pass third parameter option as object.
+
+Options:
+* share: Option is used to hide and show the share option.
+* closeBtn: Option for close button visibility when share false [ONLY FOR iOS]
+* copyToReference: If you need to copy image to reference before show then set it true [ONLY FOR iOS]
 
 ##### Usage
 
 ```
-PhotoViewer.show('http://my_site.com/my_image.jpg', 'Optional Title', {share:false});
+var options = {
+    share: true, // default is false
+    closeButton: false, // default is true
+    copyToReference: true // default is false
+};
+
+PhotoViewer.show('http://my_site.com/my_image.jpg', 'Optional Title', options);
 ```
 
 ### Versions  
@@ -71,3 +82,7 @@ PhotoViewer.show('http://my_site.com/my_image.jpg', 'Optional Title', {share:fal
 
 (1.1.9/10)  
 - Fix how image is shown on Android
+
+(1.1.17)  
+- Additional options added for iOS
+- Fix share issue with SDK version 24 or above on Android
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com-sarriaroman-photoviewer",
-  "version": "1.1.16",
+  "version": "1.1.17",
   "description": "This plugin is intended to show a picture from an URL into a Photo Viewer with zoom features.",
   "cordova": {
     "id": "com-sarriaroman-photoviewer",
@@ -22,4 +22,4 @@
   ],
   "author": "Román A. Sarria",
   "license": "MIT"
-}
+}
diff --git a/plugin.xml b/plugin.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<plugin id="com-sarriaroman-photoviewer" version="1.1.16" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<plugin id="com-sarriaroman-photoviewer" version="1.1.17" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
 	<name>PhotoViewer</name>
 	<description>This plugin is intended to show a picture from an URL into a Photo Viewer with zoom features.</description>
 	<js-module name="PhotoViewer" src="www/PhotoViewer.js">

diff --git a/src/android/PhotoActivity.java b/src/android/PhotoActivity.java
@@ -1,21 +1,20 @@
 package com.sarriaroman.PhotoViewer;
 
-import uk.co.senab.photoview.PhotoViewAttacher;
-
 import android.app.Activity;
+import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
+import android.os.StrictMode;
 import android.util.Base64;
 import android.view.View;
 import android.widget.ImageButton;
 import android.widget.ImageView;
-
-import android.content.Intent;
-import android.net.Uri;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -24,11 +23,13 @@
 
 import org.json.JSONArray;
 import org.json.JSONException;
-import org.json.JSONObject;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.lang.reflect.Method;
+
+import uk.co.senab.photoview.PhotoViewAttacher;
 
 public class PhotoActivity extends Activity {
     private PhotoViewAttacher mAttacher;
@@ -43,7 +44,7 @@ public class PhotoActivity extends Activity {
 
     private String mImage;
     private String mTitle;
-    private JSONObject mOptions;
+    private boolean mShare;
     private File mTempImage;
     private int shareBtnVisibility;
 
@@ -61,13 +62,13 @@ protected void onCreate(Bundle savedInstanceState) {
         try {
             this.mImage = mArgs.getString(0);
             this.mTitle = mArgs.getString(1);
-            this.mOptions = mArgs.getJSONObject(2);
+            this.mShare = mArgs.getBoolean(2);
             //Set the share button visibility
-            shareBtnVisibility = mOptions.getBoolean("share") ? View.VISIBLE : View.INVISIBLE;
+            shareBtnVisibility = this.mShare ? View.VISIBLE : View.INVISIBLE;
 
 
         } catch (JSONException exception) {
-            shareBtnVisibility = View.VISIBLE;
+            shareBtnVisibility = View.INVISIBLE;
         }
         shareBtn.setVisibility(shareBtnVisibility);
         //Change the activity title
@@ -88,8 +89,17 @@ public void onClick(View v) {
         shareBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if (Build.VERSION.SDK_INT >= 24) {
+                    try {
+                        Method m = StrictMode.class.getMethod("disableDeathOnFileUriExposure");
+                        m.invoke(null);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+
                 Uri imageUri;
-                if (mTempImage == null){
+                if (mTempImage == null) {
                     mTempImage = getLocalBitmapFileFromView(photo);
                 }
 

diff --git a/src/android/PhotoViewer.java b/src/android/PhotoViewer.java
@@ -1,16 +1,15 @@
 package com.sarriaroman.PhotoViewer;
 
-import org.apache.cordova.CordovaPlugin;
+import android.Manifest;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+
 import org.apache.cordova.CallbackContext;
+import org.apache.cordova.CordovaPlugin;
 import org.apache.cordova.PluginResult;
 import org.json.JSONArray;
-import org.json.JSONObject;
 import org.json.JSONException;
 
-import android.Manifest;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-
 /**
  * Class to Open PhotoViewer with the Required Parameters from Cordova
  * <p>
@@ -37,8 +36,7 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
 
             boolean requiresExternalPermission = true;
             try {
-                JSONObject options = this.args.optJSONObject(2);
-                requiresExternalPermission = options.getBoolean("share");
+                requiresExternalPermission = this.args.getBoolean(2);
             } catch (JSONException exception) {
             }