@capgo/capacitor-uploader 8.1.11 → 8.1.12

package/android/src/main/java/ee/forgr/capacitor/uploader/Uploader.java

@@ -63,10 +63,14 @@ public class Uploader {
             request.addFileToUpload(filePath, fileField, getFileNameFromUri(Uri.parse(filePath)), mimeType);
 
             for (Map.Entry<String, String> entry : headers.entrySet()) {
-                request.addHeader(entry.getKey(), entry.getValue());
+                if (entry.getKey() != null && entry.getValue() != null) {
+                    request.addHeader(entry.getKey(), entry.getValue());
+                }
             }
             for (Map.Entry<String, String> entry : parameters.entrySet()) {
-                request.addParameter(entry.getKey(), entry.getValue());
+                if (entry.getKey() != null && entry.getValue() != null) {
+                    request.addParameter(entry.getKey(), entry.getValue());
+                }
             }
 
             return request.startUpload();
@@ -91,14 +95,20 @@ public class Uploader {
             .setNotificationConfig((ctx, uploadId) -> notificationConfig)
             .setMaxRetries(maxRetries);
 
-        request.addHeader("Content-Type", mimeType);
+        if (mimeType != null && !mimeType.isEmpty()) {
+            request.addHeader("Content-Type", mimeType);
+        }
 
         for (Map.Entry<String, String> entry : headers.entrySet()) {
-            request.addHeader(entry.getKey(), entry.getValue());
+            if (entry.getKey() != null && entry.getValue() != null) {
+                request.addHeader(entry.getKey(), entry.getValue());
+            }
         }
 
         for (Map.Entry<String, String> entry : parameters.entrySet()) {
-            request.addParameter(entry.getKey(), entry.getValue());
+            if (entry.getKey() != null && entry.getValue() != null) {
+                request.addParameter(entry.getKey(), entry.getValue());
+            }
         }
 
         return request.startUpload();
@@ -132,7 +142,7 @@ public class Uploader {
 
     private String getFileNameFromUri(Uri uri) {
         String result = null;
-        if (uri.getScheme().equals("content")) {
+        if ("content".equals(uri.getScheme())) {
             try (Cursor cursor = context.getContentResolver().query(uri, null, null, null, null)) {
                 if (cursor != null && cursor.moveToFirst()) {
                     int index = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
@@ -145,10 +155,10 @@ public class Uploader {
             }
         }
         if (result == null) {
-            result = uri.getPath();
-            int cut = result.lastIndexOf('/');
-            if (cut != -1) {
-                result = result.substring(cut + 1);
+            String path = uri.getPath();
+            if (path != null) {
+                int cut = path.lastIndexOf('/');
+                result = cut != -1 ? path.substring(cut + 1) : path;
             }
         }
         return result;

package/android/src/main/java/ee/forgr/capacitor/uploader/UploaderPlugin.java

@@ -3,6 +3,7 @@ package ee.forgr.capacitor.uploader;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.content.Context;
+import android.net.Uri;
 import android.os.Build;
 import android.webkit.MimeTypeMap;
 import com.getcapacitor.JSObject;
@@ -21,7 +22,11 @@ import net.gotev.uploadservice.observer.request.RequestObserverDelegate;
 @CapacitorPlugin(name = "Uploader")
 public class UploaderPlugin extends Plugin {
 
-    private final String pluginVersion = "8.1.11";
+    private static final String CAPACITOR_FILE_PATH_PREFIX = "/_capacitor_file_";
+
+    private static final String CAPACITOR_CONTENT_PATH_PREFIX = "/_capacitor_content_";
+
+    private final String pluginVersion = "8.1.12";
 
     private Uploader implementation;
 
@@ -123,6 +128,10 @@ public class UploaderPlugin extends Plugin {
             return;
         }
 
+        // Convert Capacitor web-accessible URLs to paths native code can open.
+        // Capacitor 8+ removed Bridge.getLocalUrl(String); mirror AndroidProtocolHandler logic.
+        String localFilePath = resolveCapacitorPath(filePath);
+
         JSObject headersObj = call.getObject("headers", new JSObject());
         JSObject parametersObj = call.getObject("parameters", new JSObject());
         String httpMethod = call.getString("method", "POST");
@@ -135,10 +144,10 @@ public class UploaderPlugin extends Plugin {
         Map<String, String> parameters = JSObjectToMap(parametersObj);
 
         try {
-            String mimeType = call.getString("mimeType", getMimeType(filePath));
+            String mimeType = call.getString("mimeType", getMimeType(localFilePath));
 
             String id = implementation.startUpload(
-                filePath,
+                localFilePath,
                 serverUrl,
                 headers,
                 parameters,
@@ -172,12 +181,50 @@ public class UploaderPlugin extends Plugin {
         }
     }
 
+    /**
+     * Maps WebView URLs (e.g. http(s)://localhost/_capacitor_file_/...) to filesystem or content
+     * paths, matching {@link com.getcapacitor.AndroidProtocolHandler}. Plain absolute paths and
+     * unrecognized URLs are returned unchanged.
+     */
+    private static String resolveCapacitorPath(String filePath) {
+        if (filePath == null || filePath.isEmpty()) {
+            return filePath;
+        }
+        Uri uri = Uri.parse(filePath);
+        String path = uri.getPath();
+        if (path != null) {
+            if (path.startsWith(CAPACITOR_FILE_PATH_PREFIX)) {
+                return path.substring(CAPACITOR_FILE_PATH_PREFIX.length());
+            }
+            if (path.startsWith(CAPACITOR_CONTENT_PATH_PREFIX)) {
+                String scheme = uri.getScheme();
+                String host = uri.getHost();
+                if (scheme != null && host != null) {
+                    String baseUrl = scheme + "://" + host;
+                    if (uri.getPort() != -1) {
+                        baseUrl += ":" + uri.getPort();
+                    }
+                    return filePath.replace(baseUrl + CAPACITOR_CONTENT_PATH_PREFIX, "content:/");
+                }
+                return filePath.replace(CAPACITOR_CONTENT_PATH_PREFIX, "content:/");
+            }
+        }
+        if ("file".equalsIgnoreCase(uri.getScheme()) && uri.getPath() != null) {
+            return uri.getPath();
+        }
+        return filePath;
+    }
+
     private Map<String, String> JSObjectToMap(JSObject object) {
         Map<String, String> map = new HashMap<>();
         if (object != null) {
             for (Iterator<String> it = object.keys(); it.hasNext(); ) {
                 String key = it.next();
-                map.put(key, object.getString(key));
+                String value = object.getString(key);
+                // Only add non-null and non-empty values to prevent upload service errors
+                if (value != null && !value.isEmpty()) {
+                    map.put(key, value);
+                }
             }
         }
         return map;

package/ios/Sources/UploaderPlugin/UploaderPlugin.swift

@@ -3,7 +3,7 @@ import Capacitor
 
 @objc(UploaderPlugin)
 public class UploaderPlugin: CAPPlugin, CAPBridgedPlugin {
-    private let pluginVersion: String = "8.1.11"
+    private let pluginVersion: String = "8.1.12"
     public let identifier = "UploaderPlugin"
     public let jsName = "Uploader"
     public let pluginMethods: [CAPPluginMethod] = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-uploader",
-  "version": "8.1.11",
+  "version": "8.1.12",
   "description": "Upload file natively",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",