From 77bb3b8a9bb45b0b483bec96e76c63ac05c73415 Mon Sep 17 00:00:00 2001 From: Lee Houghton Date: Mon, 25 Oct 2021 14:44:18 +0100 Subject: [PATCH 1/2] Fix Http.uploadFile not allowing a file:// source --- .../main/java/com/getcapacitor/plugin/http/FilesystemUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/getcapacitor/plugin/http/FilesystemUtils.java b/android/src/main/java/com/getcapacitor/plugin/http/FilesystemUtils.java index fa7773e9..56bc454b 100644 --- a/android/src/main/java/com/getcapacitor/plugin/http/FilesystemUtils.java +++ b/android/src/main/java/com/getcapacitor/plugin/http/FilesystemUtils.java @@ -16,7 +16,7 @@ public class FilesystemUtils { public static final String DIRECTORY_EXTERNAL_STORAGE = "EXTERNAL_STORAGE"; public static File getFileObject(Context c, String path, String directory) { - if (directory == null) { + if (directory == null || path.startsWith("file://")) { Uri u = Uri.parse(path); if (u.getScheme() == null || u.getScheme().equals("file")) { return new File(u.getPath()); From e1e9fcd7d514c118190614c6ca73af1bd1135d4c Mon Sep 17 00:00:00 2001 From: Lee Houghton Date: Mon, 25 Oct 2021 14:44:53 +0100 Subject: [PATCH 2/2] Fix Http.uploadFile erroring if method not supplied on android --- .../java/com/getcapacitor/plugin/http/HttpRequestHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/getcapacitor/plugin/http/HttpRequestHandler.java b/android/src/main/java/com/getcapacitor/plugin/http/HttpRequestHandler.java index 6c4f345b..90774fb6 100644 --- a/android/src/main/java/com/getcapacitor/plugin/http/HttpRequestHandler.java +++ b/android/src/main/java/com/getcapacitor/plugin/http/HttpRequestHandler.java @@ -471,7 +471,7 @@ public static JSObject downloadFile(PluginCall call, Context context, ProgressEm */ public static JSObject uploadFile(PluginCall call, Context context) throws IOException, URISyntaxException, JSONException { String urlString = call.getString("url"); - String method = call.getString("method").toUpperCase(); + String method = call.getString("method", "POST").toUpperCase(); String filePath = call.getString("filePath"); String fileDirectory = call.getString("fileDirectory", FilesystemUtils.DIRECTORY_DOCUMENTS); String name = call.getString("name", "file");