cordova-plugin-mserviceinterface-2.0 1.0.94 → 1.0.95

package/package.json

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

package/plugin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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.94">
+    xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-mserviceinterface-2.0" version="1.0.95">
     <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,14 +47,11 @@
             <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
             <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
             <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-            <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-            <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
             <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
             <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
             <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
             <uses-permission android:name="android.permission.READ_PHONE_STATE" />
             <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-            <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
             <queries>
                 <intent>
                     <action android:name="android.media.action.IMAGE_CAPTURE" />

package/src/android/mInterface.java

@@ -486,11 +486,12 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
             } else if (action.equals("CheckLocationPermission")) {
                 checkLocationPermission(args, callbackContext);
                 return true;
-            } else if (action.equals("GetMediaImagePermission")) {
-                getMediaImagePermission(args, callbackContext);
-                return true;
-            } else if (action.equals("CheckMediaImagePermission")) {
-                checkMediaImagePermission(args, callbackContext);
+            } else if (action.equals("CheckMediaImagePermission") || action.equals("GetMediaImagePermission")) {
+                try {
+                    callbackContext.success("not_required");
+                } catch (Exception e) {
+                    callbackContext.error(e.getMessage());
+                }
                 return true;
             } else if (action.equals("AppVersion")) {
                 appVersion(callbackContext);
@@ -1606,40 +1607,12 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
         }
     }
 
-    private void checkMediaImagePermission(JSONArray args, CallbackContext callbackContext) {
-        boolean permissionGranted = true, checkPermission = true;
-        List<String> list;
-        try {
-            callback = callbackContext;
-            Context context = cordova.getActivity().getApplicationContext();
-            String[] permissions = args.optJSONObject(0).optString("permissions").split(",");
-            if (permissions[0].equalsIgnoreCase("android.permission.READ_MEDIA_IMAGES")) {
-                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-                    checkPermission = false;
-                }
-            }
-            if (checkPermission) {
-                list = new ArrayList<String>(Arrays.asList(permissions));
-                permissions = list.toArray(new String[0]);
-
-                for (int i = 0; i < permissions.length; i++) {
-                    if (ActivityCompat.checkSelfPermission(context, permissions[i]) != PackageManager.PERMISSION_GRANTED) {
-                        permissionGranted = false;
-                    }
-                }
-                if (!permissionGranted) {
-                    callback.error("failure");
-                } else {
-                    callback.success("success");
-                }
-            } else {
-                callback.success("success");
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+    private void checkMediaImagePermission(JSONArray args, CallbackContext cb) {
+        try { cb.success("not_required"); } catch (Exception e) { cb.error(e.getMessage()); }
+    }
+    private void getMediaImagePermission(JSONArray args, CallbackContext cb) {
+        try { cb.success("not_required"); } catch (Exception e) { cb.error(e.getMessage()); }
     }
-
 
     private void getLocationPermission(JSONArray args, CallbackContext callbackContext) {
         boolean permissionGranted = true;
@@ -1665,30 +1638,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
             e.printStackTrace();
         }
     }
-    private void getMediaImagePermission(JSONArray args, CallbackContext callbackContext) {
-        boolean permissionGranted = true;
-        List<String> list;
-        try {
-            callback = callbackContext;
-            Context context = cordova.getActivity().getApplicationContext();
-            String[] permissions = args.optJSONObject(0).optString("permissions").split(",");
-            list = new ArrayList<String>(Arrays.asList(permissions));
-            permissions = list.toArray(new String[0]);
-
-            for (int i = 0; i < permissions.length; i++) {
-                if (ActivityCompat.checkSelfPermission(context, permissions[i]) != PackageManager.PERMISSION_GRANTED) {
-                    permissionGranted = false;
-                }
-            }
-            if (!permissionGranted) {
-                PermissionHelper.requestPermissions(this, 111, permissions);
-            } else {
-                callback.success("success");
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
+   
     private void getPermissions(JSONArray args, CallbackContext callbackContext) {
         boolean permissionGranted = true;
         List<String> list;
@@ -1760,29 +1710,33 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
         pluginResult.setKeepCallback(true);
         callbackContext.sendPluginResult(pluginResult);
     }
-    public void pickImageFromGallery(CallbackContext callbackContext) {
+
+    void pickImageFromGallery(CallbackContext callbackContext) {
         try {
-            Intent openFile,
-                    selectFile;
-            PluginResult pluginResult;
-            callback = callbackContext;
-            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/*");
+            Intent i;
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
+                i = new Intent(MediaStore.ACTION_PICK_IMAGES);
+                i.setType("image/*");
             } else {
-                openFile = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
-                openFile.putExtra(Intent.EXTRA_LOCAL_ONLY, true);
+                i = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+                i.addCategory(Intent.CATEGORY_OPENABLE);
+                i.setType("image/*");
+                i.putExtra(Intent.EXTRA_LOCAL_ONLY, true);
             }
-            selectFile = Intent.createChooser(openFile, "Select File");
-            cordova.startActivityForResult(this, selectFile, PICK_IMAGE_FROM_GALLERY);
-            pluginResult = new PluginResult(PluginResult.Status.NO_RESULT);
-            pluginResult.setKeepCallback(true);
-            callbackContext.sendPluginResult(pluginResult);
+            i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+            this.callback = callbackContext;
+            PluginResult pr = new PluginResult(PluginResult.Status.NO_RESULT);
+            pr.setKeepCallback(true);
+            callbackContext.sendPluginResult(pr);
+            cordova.startActivityForResult(this, i, PICK_IMAGE_FROM_GALLERY);
+
+
         } catch (Exception e) {
             callbackContext.error("pickImageFromGallery failed, exception is : " + e.getMessage());
         }
     }
+    
+
 
     private String getMimeType(String path, Uri uri) {
         String mimeType = null;
@@ -2117,6 +2071,198 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
         return "";
     }
 
+
+    private String safeGetDisplayName(@NonNull ContentResolver cr, @NonNull Uri uri, @NonNull String defaultExt) {
+        String name = null;
+        try (Cursor c = cr.query(uri, new String[]{OpenableColumns.DISPLAY_NAME}, null, null, null)) {
+            if (c != null && c.moveToFirst()) {
+                int idx = c.getColumnIndex(OpenableColumns.DISPLAY_NAME);
+                if (idx != -1) name = c.getString(idx);
+            }
+        } catch (Throwable t) {
+            android.util.Log.w("mInterface", "safeGetDisplayName query failed: " + t.getMessage());
+        }
+        if (name == null || name.trim().isEmpty()) {
+            String ts = new java.text.SimpleDateFormat("yyyyMMdd_HHmmss").format(new java.util.Date());
+            name = "FILE_" + ts + (defaultExt.startsWith(".") ? defaultExt : "." + defaultExt);
+        }
+        return name;
+    }
+    private void postSuccess(final CallbackContext cb, final org.json.JSONObject out) {
+        if (cb == null) return;
+        final PluginResult pr = new PluginResult(PluginResult.Status.OK, out);
+        pr.setKeepCallback(false);
+        cordova.getActivity().runOnUiThread(new Runnable() {
+            @Override public void run() { cb.sendPluginResult(pr); }
+        });
+    }
+
+    private void postSuccess(final CallbackContext cb, final String s) {
+        if (cb == null) return;
+        final PluginResult pr = new PluginResult(PluginResult.Status.OK, s);
+        pr.setKeepCallback(false);
+        cordova.getActivity().runOnUiThread(new Runnable() {
+            @Override public void run() { cb.sendPluginResult(pr); }
+        });
+    }
+
+    private void postError(final CallbackContext cb, final String msg) {
+        if (cb == null) return;
+        final PluginResult pr = new PluginResult(PluginResult.Status.ERROR, msg);
+        pr.setKeepCallback(false);
+        cordova.getActivity().runOnUiThread(new Runnable() {
+            @Override public void run() { cb.sendPluginResult(pr); }
+        });
+    }
+
+    private int calcInSampleSize(BitmapFactory.Options o, int reqW, int reqH) {
+        int inSample = 1, h = o.outHeight, w = o.outWidth;
+        while ((h / inSample) > reqH || (w / inSample) > reqW) inSample <<= 1;
+        return Math.max(1, inSample);
+    }
+
+    /**
+     * Async version that mirrors the sync behavior:
+     *  - "camera"/"gallery": returns base64 string
+     *  - "compress": returns JSON { filePath, fileName, fileSize, fileExtension, thumbnail }
+     */
+    private void convertImageTo64BaseStringAsync(final CallbackContext cb,
+                                                 final String imageSourcePath,
+                                                 final String imgSrcType,
+                                                 final String destinationPath) {
+        cordova.getThreadPool().execute(new Runnable() {
+            @Override public void run() {
+                InputStream srcFileReader = null;
+                OutputStream desFileWriter = null;
+                ByteArrayOutputStream baos = null;
+                Bitmap bitmap = null;
+                try {
+                    // Common bits
+                    final String[] parts = imageSourcePath.split("/");
+                    String baseName = parts.length > 0 ? parts[parts.length - 1] : "IMG";
+                    if (baseName.indexOf(".") > 0) {
+                        baseName = baseName.substring(0, baseName.lastIndexOf("."));
+                    }
+                    final String extFromSource = "." + imageSourcePath.substring(imageSourcePath.lastIndexOf(".") + 1).toLowerCase();
+                    final String thumbnail = getFileThumbnail(imageSourcePath, extFromSource);
+
+                    if ("compress".equalsIgnoreCase(imgSrcType)) {
+                        // === COMPRESS: write JPEG to destination and return file properties ===
+                        File fileToCompress = new File(imageSourcePath);
+                        File compressedImageFile = new Compressor(cordova.getActivity())
+                                .setQuality(15)
+                                .setCompressFormat(Bitmap.CompressFormat.JPEG)
+                                .compressToFile(fileToCompress);
+
+                        String timeStamp = new java.text.SimpleDateFormat("yyyyMMdd_HHmmss").format(new java.util.Date());
+                        final String baseDir = (destinationPath != null && !destinationPath.isEmpty())
+                                ? (mInterfaceUtil.rootDirectory + "/" + destinationPath)
+                                : (mInterfaceUtil.rootDirectory + "/" + mInterfaceUtil.packageName + "/images");
+                        final String outName = baseName + "_" + timeStamp + ".jpg";
+                        final String outFullPath = baseDir + "/" + outName;
+
+                        File outDir = new File(baseDir);
+                        if (!outDir.exists()) outDir.mkdirs();
+
+                        // Copy compressed temp → final path
+                        if (compressedImageFile.exists()) {
+                            srcFileReader = new FileInputStream(compressedImageFile);
+                            desFileWriter = new FileOutputStream(new File(outFullPath));
+                            byte[] buf = new byte[64 * 1024];
+                            int n;
+                            while ((n = srcFileReader.read(buf)) > 0) {
+                                desFileWriter.write(buf, 0, n);
+                            }
+                            desFileWriter.flush();
+                        }
+
+                        // (Optional) load to normalize EXIF rotation like the sync version did
+                        try { bitmap = handleImageRotation(outFullPath); } catch (Throwable ignore) {}
+
+                        // Build properties
+                        File outFile = new File(outFullPath);
+                        org.json.JSONObject fileProps = new org.json.JSONObject();
+                        fileProps.put("filePath", outFile.getParent());
+                        fileProps.put("fileName", outFile.getName());
+                        fileProps.put("fileSize", outFile.length());
+                        fileProps.put("fileExtension", ".jpg");
+                        fileProps.put("thumbnail", thumbnail);
+
+                        // Match original behavior: clear attachmentDestPath if you rely on that global
+                        try { attachmentDestPath = ""; } catch (Throwable ignore) {}
+
+                        postSuccess(cb, fileProps);
+                        return;
+                    }
+
+                    // === CAMERA / GALLERY → return BASE64 string ===
+                    // Decode with downsampling and fix rotation
+                    BitmapFactory.Options o = new BitmapFactory.Options();
+                    o.inJustDecodeBounds = true; BitmapFactory.decodeFile(imageSourcePath, o);
+                    o.inSampleSize = calcInSampleSize(o, 1920, 1920);
+                    o.inJustDecodeBounds = false;
+
+                    // Prefer your rotation-aware helper (handles EXIF)
+                    try {
+                        bitmap = handleImageRotation(imageSourcePath);
+                        if (bitmap == null) bitmap = BitmapFactory.decodeFile(imageSourcePath, o);
+                    } catch (Throwable t) {
+                        bitmap = BitmapFactory.decodeFile(imageSourcePath, o);
+                    }
+                    if (bitmap == null) {
+                        postError(cb, "decode_failed");
+                        return;
+                    }
+
+                    baos = new ByteArrayOutputStream(1024 * 1024);
+                    bitmap.compress(Bitmap.CompressFormat.JPEG, 15, baos);
+                    String encodedImage = android.util.Base64.encodeToString(baos.toByteArray(), android.util.Base64.NO_WRAP);
+
+                    // Match original behavior: delete camera temp + clear dest flag
+                    if ("camera".equalsIgnoreCase(imgSrcType)) {
+                        try {
+                            File f = new File(imageSourcePath);
+                            if (f.exists()) f.delete();
+                        } catch (Throwable ignore) {}
+                        try { attachmentDestPath = ""; } catch (Throwable ignore) {}
+                    } else if ("gallery".equalsIgnoreCase(imgSrcType)) {
+                        try { attachmentDestPath = ""; } catch (Throwable ignore) {}
+                    }
+
+                    postSuccess(cb, encodedImage);
+                } catch (Exception e) {
+                    try { attachmentDestPath = ""; } catch (Throwable ignore) {}
+                    postError(cb, "convertImageTo64BaseStringAsync failed: " + e.getMessage());
+                } finally {
+                    try { if (srcFileReader != null) srcFileReader.close(); } catch (Exception ignore) {}
+                    try { if (desFileWriter != null) desFileWriter.close(); } catch (Exception ignore) {}
+                    try { if (baos != null) baos.close(); } catch (Exception ignore) {}
+                    try { if (bitmap != null) bitmap.recycle(); } catch (Exception ignore) {}
+                }
+            }
+        });
+    }
+
+
+    private String copyFileFromUriFast(Context ctx, Uri uri, String destName, String destDir) {
+        java.io.File dir = (destDir!=null && !destDir.isEmpty())
+                ? new java.io.File(ctx.getFilesDir(), destDir)
+                : ctx.getFilesDir();
+        if (!dir.exists() && !dir.mkdirs()) return null;
+        java.io.File out = new java.io.File(dir, destName);
+        try (java.io.InputStream in = ctx.getContentResolver().openInputStream(uri);
+             java.io.OutputStream os = new java.io.FileOutputStream(out)) {
+            if (in == null) return null;
+            byte[] buf = new byte[64 * 1024];
+            int n; while ((n = in.read(buf)) != -1) os.write(buf, 0, n);
+            os.flush();
+            return out.getAbsolutePath();
+        } catch (Exception e) {
+            android.util.Log.e("mInterface", "copyFileFromUriFast", e);
+            return null;
+        }
+    }
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         try {
@@ -2158,136 +2304,89 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                     SCANCODEINT = 0;
                     callback.error(resultCode);
                 }
-            } else if (requestCode == PICK_IMAGE_FROM_GALLERY && callback != null) {
-                if (resultCode == RESULT_OK) {
-                    String fileName = null, getfilePath = null, filePath, fileType, storageDefinition, fileExtension;
-                    final String docId, type, id;
-                    final String[] split;
-                    final String tag, path;
-                    final int splitIndex;
-                    Cursor cursor;
-                    Uri uri = data.getData(); //get uri for selected file
-                    fileType = this.cordova.getActivity().getContentResolver().getType(uri); // get mimeType for selected file
-                    File getFileName, file;
-                    try {
-                        //API LEVEL 19 AND ABOVE (TO GET FILEPATH)
-                        if (Build.VERSION.SDK_INT >= 19 && !Build.MANUFACTURER.equals("samsung") && DocumentsContract.isDocumentUri(cordova.getActivity(), uri)) {
-                            if ("com.android.externalstorage.documents".equals(uri.getAuthority())) { // ExternalStorageProvider
-                                docId = DocumentsContract.getDocumentId(uri);
-                                split = docId.split(":");
-                                type = split[0];
-                                if ("primary".equalsIgnoreCase(type)) {
-                                    getfilePath = mInterfaceUtil.rootDirectory + "/" + split[1];
-                                } else {
-                                    if (Environment.isExternalStorageRemovable()) {
-                                        storageDefinition = System.getenv("EXTERNAL_STORAGE");
-                                        getfilePath = storageDefinition;
-                                    } else {
-                                        splitIndex = docId.indexOf(':', 1);
-                                        tag = docId.substring(0, splitIndex);
-                                        path = docId.substring(splitIndex + 1);
-                                        if (new mInterfaceUtil().getPathToNonPrimaryVolume(cordova.getActivity(), tag) != null) {
-                                            storageDefinition = new mInterfaceUtil().getPathToNonPrimaryVolume(cordova.getActivity(), tag) + "/" + path;
-                                            file = new File(storageDefinition);
-                                            if (file.exists() && file.canRead()) {
-                                                getfilePath = storageDefinition;
-                                            }
-                                        }
-                                    }
-                                }
-                            } else if ("com.android.providers.downloads.documents".equals(uri.getAuthority())) { // DownloadsProvider
-                                id = DocumentsContract.getDocumentId(uri);
-                                final Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
-                                getfilePath = new mInterfaceUtil().getDataColumn(cordova.getActivity(), contentUri, null, null);
-                            } else if ("com.android.providers.media.documents".equals(uri.getAuthority())) { // MediaProvider
-                                docId = DocumentsContract.getDocumentId(uri);
-                                split = docId.split(":");
-                                type = split[0];
-                                Uri contentUri = null;
-                                if ("image".equals(type)) {
-                                    contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
-                                } else if ("video".equals(type)) {
-                                    contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
-                                } else if ("audio".equals(type)) {
-                                    contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
-                                }
-                                final String selection = "_id=?";
-                                final String[] selectionArgs = new String[]{
-                                        split[1]
-                                };
-                                getfilePath = new mInterfaceUtil().getDataColumn(cordova.getActivity(), contentUri, selection, selectionArgs);
-                            }
-                            // *** API Level 19 and Above (To Get FileName,FileExtension and FileSize)**** //
-                            cursor = cordova.getActivity().getContentResolver().query(uri, null, null, null, null, null);
+            }else if (requestCode == PICK_IMAGE_FROM_GALLERY) {
+                final CallbackContext cb = this.callback;
+                this.callback = null;
+                if (cb == null) return;
+
+                try {
+                    if (resultCode != RESULT_OK || data == null) {
+                        cb.error("canceled");
+                        return;
+                    }
+
+                    // Photo Picker may return via getData() or ClipData
+                    Uri uri = data.getData();
+                    if (uri == null && data.getClipData() != null && data.getClipData().getItemCount() > 0) {
+                        uri = data.getClipData().getItemAt(0).getUri();
+                    }
+                    if (uri == null) {
+                        cb.error("no_file_selected");
+                        return;
+                    }
+
+                    final Uri selectedUri = uri;
+                    final String destPath = attachmentDestPath;                 // capture current dest
+                    final String galleryInd = String.valueOf(galleryAttachmentInd);
+
+                    // Offload ALL heavy work (resolver, copy, bitmap/encode) to Cordova thread pool
+                    cordova.getThreadPool().execute(new Runnable() {
+                        @Override public void run() {
                             try {
-                                if (cursor != null && cursor.moveToFirst()) {
-                                    int displayNameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
-                                    if (displayNameIndex != -1) {
-                                        fileName = cursor.getString(displayNameIndex);
-                                    } else {
-                                        fileName = "";
-                                    }
+                                ContentResolver cr = cordova.getActivity().getContentResolver();
+
+                                String mime = null;
+                                try { mime = cr.getType(selectedUri); } catch (Throwable ignore) {}
+
+                                String defExt = (mime != null && mime.contains("/"))
+                                        ? mime.substring(mime.indexOf('/') + 1).toLowerCase()
+                                        : "jpg";
+
+                                // Get a display name if provider allows; otherwise build a sane fallback
+                                String fileName = safeGetDisplayName(cr, selectedUri, defExt);
+                                String ext = fileName.contains(".")
+                                        ? fileName.substring(fileName.lastIndexOf('.')).toLowerCase()
+                                        : ("." + defExt);
+
+                                // Copy the user-selected URI into app-private storage (no READ_MEDIA_* needed)
+                                String localPath = copyFileFromUriFast(
+                                        cordova.getActivity().getApplicationContext(),
+                                        selectedUri, fileName, destPath);
+
+                                if (localPath == null) {
+                                    cb.error("copy_failed");
+                                    return;
                                 }
-                            } finally {
-                                cursor.close();
-                            }
-                            // *** API Level 19 below and SAMSUNG (To Get FileProperties of MediaFiles)**** //
-                        } else {
-                            if (fileType != null) {
-                                String[] projection = {
-                                        MediaStore.Images.Media.DATA,
-                                        MediaStore.Images.Media.SIZE,
-                                        MediaStore.Images.Media.DISPLAY_NAME
-                                };
-                                cursor = cordova.getActivity().getContentResolver().query(uri, projection, null, null, null);
-                                if (cursor.moveToFirst()) {
-                                    getfilePath = cursor.getString(cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA));
-                                    fileName = cursor.getString(cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DISPLAY_NAME));
+
+                                // Accept only image-like picks (by MIME or extension)
+                                boolean imageLike =
+                                        (mime != null && mime.startsWith("image/")) ||
+                                                ext.equals(".jpg") || ext.equals(".jpeg") ||
+                                                ext.equals(".png") || ext.equals(".heic");
+
+                                if (!imageLike) {
+                                    cb.error("Only JPEG/PNG/HEIC images are allowed.");
+                                    return;
                                 }
-                                cursor.close();
-                                // 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));
-                                getFileName = new File(getfilePath);
-                                fileName = getFileName.getName();
-                            }
-                        }
-                        filePath = getfilePath.substring(0, getfilePath.lastIndexOf(File.separator));
-                        fileExtension = "." + getfilePath.substring(getfilePath.lastIndexOf(".") + 1).toLowerCase();
-                        if (filePath != null) {
-                            try {
-                                if (fileExtension.equals(".heic")) {
-                                    if (galleryAttachmentInd.equals("true")) {
-                                        convertImageTo64BaseString(callback, filePath + "/" + fileName, "compress", attachmentDestPath);
-                                    } else {
-                                        convertImageTo64BaseString(callback, filePath + "/" + fileName, "gallery", "");
-                                    }
 
-                                } else if (fileExtension.equals(".jpeg") || fileExtension.equals(".jpg") || fileExtension.equals(".png")) {
-                                    if (galleryAttachmentInd.equals("true")) {
-                                        convertImageTo64BaseString(callback, filePath + "/" + fileName, "compress", attachmentDestPath);
-                                    } else {
-                                        convertImageTo64BaseString(callback, filePath + "/" + fileName, "gallery", "");
-                                    }
+                                // Run your existing conversion on a worker too (non-blocking)
+                                if ("true".equals(galleryInd)) {
+                                    convertImageTo64BaseStringAsync(cb, localPath, "compress", destPath);
                                 } else {
-                                    callback.error("Only JPEG or PNG file extensions are allowed to attach.");
+                                    convertImageTo64BaseStringAsync(cb, localPath, "gallery", "");
                                 }
                             } catch (Exception e) {
-                                callback.error("Only JPEG or PNG file extensions are allowed to attach.");
+                                cb.error("PICK_IMAGE_FROM_GALLERY: " + e.getMessage());
                             }
-                        } else {
-                            callback.error("File path was null");
                         }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                } else if (resultCode == Activity.RESULT_CANCELED) {
-                    callback.error("failure");
-                } else {
-                    callback.error(resultCode);
+                    });
+                    return; // IMPORTANT: stop here so no other branch falls through
+                } catch (Exception e) {
+                    cb.error("PICK_IMAGE_FROM_GALLERY dispatch failed: " + e.getMessage());
+                    return;
                 }
-            } else if (requestCode == NEW_FILE_PICK_REQUEST && callback != null) {
+            }
+            else if (requestCode == NEW_FILE_PICK_REQUEST && callback != null) {
                 try {
                     Uri uri = data.getData();
                     String fileName, extension, filePath;