cordova-plugin-mserviceinterface-2.0 1.0.55 → 1.0.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-mserviceinterface-2.0",
-  "version": "1.0.55",
+  "version": "1.0.57",
   "description": "This plugin establishes the connection to the native interface and performs the requested task.",
   "main": "index.js",
   "scripts": {

package/plugin.xml

@@ -2,7 +2,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="cordova-plugin-mserviceinterface-2.0"
-    version="1.0.55">
+    version="1.0.57">
     <name>mserviceinterface-2.0</name>
     <description>This plugin establishes the connection to the native interface and performs the requested task.</description>
     <author>selfservit@gmail.com</author>
@@ -47,6 +47,7 @@
             <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
             <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
             <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+            <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
         </config-file>
         <config-file target="AndroidManifest.xml" parent="/manifest/application">
             <service android:name="com.selfservit.util.mInterfaceService" android:foregroundServiceType="location" android:enabled="true" android:exported="true"/>

package/src/android/mInterface.java

@@ -25,7 +25,6 @@ import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.location.Location;
-import androidx.exifinterface.media.ExifInterface;
 import android.media.MediaMetadataRetriever;
 import android.media.ThumbnailUtils;
 import android.net.ConnectivityManager;
@@ -35,7 +34,6 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
-import android.os.PowerManager;
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
 import android.provider.OpenableColumns;
@@ -52,6 +50,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.core.app.ActivityCompat;
+import androidx.exifinterface.media.ExifInterface;
 
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.api.GoogleApiClient;
@@ -150,7 +149,6 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
     @RequiresApi(api = Build.VERSION_CODES.O)
     @Override
     public boolean execute(final String action, JSONArray args, final CallbackContext callbackContext) throws JSONException {
-        callback = callbackContext;
         mInterfaceUtil.rootDirectory = new File(cordova.getActivity().getExternalFilesDir(""), "");
         if (mInterfaceUtil.packageName.equals("")) {
             mInterfaceUtil.packageName = cordova.getActivity().getApplicationContext().getPackageName().split("\\.")[2];
@@ -721,7 +719,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
             }
         } else if (action.equals("DownloadFile")) {
             callback = callbackContext;
-            final DownloadTask downloadTask = new DownloadTask(cordova.getActivity());
+            final DownloadTask downloadTask = new DownloadTask(cordova.getActivity(),callback);
             downloadTask.execute(args.optJSONObject(0).optString("url"), args.optJSONObject(0).optString("filePath"), args.optJSONObject(0).optString("thumbnailInd"));
             return true;
         } else if ("QueueProcessor".equals(action)) {
@@ -1051,6 +1049,12 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                 if (Build.VERSION.SDK_INT != Build.VERSION_CODES.Q) {
                     list = new ArrayList<String>(Arrays.asList(permissions));
                     list.remove("android.permission.ACCESS_BACKGROUND_LOCATION");
+                    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+                        list.remove("android.permission.POST_NOTIFICATIONS");
+                    }else{
+                        list.remove("android.permission.WRITE_EXTERNAL_STORAGE");
+                        list.remove("android.permission.READ_EXTERNAL_STORAGE");
+                    }
                     permissions = list.toArray(new String[0]);
                 }
                 for (int i = 0; i < permissions.length; i++) {
@@ -1128,19 +1132,26 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                 selectFile;
         PluginResult pluginResult;
         callback = callbackContext;
-        if (Build.MANUFACTURER.equals("samsung")) {
-            /* SELECT FILE FOR SAMSUNG DEVICES */
-            openFile = new Intent("com.sec.android.app.myfiles.PICK_DATA");
-            openFile.putExtra("CONTENT_TYPE", "*/*");
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            // Use the ACTION_OPEN_DOCUMENT intent for Android 13 and higher
+            openFile =  new Intent(MediaStore.ACTION_PICK_IMAGES);
+            openFile.setType("image/*");
         } else {
-            /* SELECT FILE FOR EXCEPT SAMSUNG DEVICES */
-            openFile = new Intent(Intent.ACTION_GET_CONTENT);
-            openFile.setType("*/*");
-            openFile.addCategory(Intent.CATEGORY_OPENABLE);
-            openFile.putExtra(Intent.EXTRA_LOCAL_ONLY, true);
+            if (Build.MANUFACTURER.equals("samsung")) {
+                /* SELECT FILE FOR SAMSUNG DEVICES */
+                openFile = new Intent("com.sec.android.app.myfiles.PICK_DATA");
+                openFile.putExtra("CONTENT_TYPE", "*/*");
+            } else {
+                /* SELECT FILE FOR EXCEPT SAMSUNG DEVICES */
+                openFile = new Intent(Intent.ACTION_GET_CONTENT);
+                openFile.setType("*/*");
+                openFile.addCategory(Intent.CATEGORY_OPENABLE);
+                openFile.putExtra(Intent.EXTRA_LOCAL_ONLY, true);
+            }
         }
+
         selectFile = Intent.createChooser(openFile, "Select File");
-        cordova.startActivityForResult(this, selectFile, PICK_IMAGE_FROM_GALLERY);
+        cordova.startActivityForResult(this,selectFile, PICK_IMAGE_FROM_GALLERY);
         pluginResult = new PluginResult(PluginResult.Status.NO_RESULT);
         pluginResult.setKeepCallback(true);
         callbackContext.sendPluginResult(pluginResult);
@@ -1714,7 +1725,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                                 fileName = cursor.getString(cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DISPLAY_NAME));
                             }
                             cursor.close();
-                            // API LEVEL 19 BELOW AND SAMSUNG (TO GET FILEPROPERTIES OF NORMAL FILES(EX:txt,.pdf,etc..,))
+                            // API LEVEL 19 BELOW AND SAMSUNG (TO GET FILE PROPERTIES OF NORMAL FILES(EX:txt,.pdf,etc..,))
                         } else {
                             getfilePath = data.getData().getPath();
                             filePath = getfilePath.substring(0, getfilePath.lastIndexOf(File.separator));
@@ -1764,7 +1775,6 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                 Cursor cursor = null;
                 if (uri.getScheme().equals("file")) {
                     fileName = uri.getLastPathSegment();
-
                     if (fileName.indexOf(".") > 0) {
                         fileName = fileName.substring(0, fileName.lastIndexOf("."));
                         String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
@@ -2176,9 +2186,11 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
     private class DownloadTask extends AsyncTask<String, Integer, String> {
 
         private final Context context;
+        private final CallbackContext downloadFileCallback;
 
-        public DownloadTask(Context context) {
+        public DownloadTask(Context context, CallbackContext callback) {
             this.context = context;
+            this.downloadFileCallback = callback;
         }
 
         @Override
@@ -2223,7 +2235,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                     output.write(data, 0, count);
                 }
             } catch (Exception e) {
-                callback.error("Failure..." + e.getMessage());
+                downloadFileCallback.error("Failure..." + e.getMessage());
             }
             if (sUrl[2].equalsIgnoreCase("true")) {
                 return sUrl[1];
@@ -2240,13 +2252,13 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                         String extension = "." + result.substring(result.lastIndexOf(".") + 1).toLowerCase(),
                                 filePath = mInterfaceUtil.rootDirectory + "/" + result;
                         String thumbnail = getFileThumbnail(filePath, extension);
-                        callback.success(thumbnail);
+                        downloadFileCallback.success(thumbnail);
                     } else {
-                        callback.error("Failure...");
+                        downloadFileCallback.error("Failure...");
                     }
                 } else {
                     System.out.println("success");
-                    callback.success("");
+                    downloadFileCallback.success("");
                 }
             } catch (Exception e) {
                 e.printStackTrace();