@capacitor/filesystem 6.0.2-nightly-20240905T150509.0 → 6.0.3

package/Package.swift

@@ -10,7 +10,7 @@ let package = Package(
             targets: ["FilesystemPlugin"])
     ],
     dependencies: [
-        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", branch: "main")
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "6.0.0")
     ],
     targets: [
         .target(

package/android/src/main/java/com/capacitorjs/plugins/filesystem/Filesystem.java

@@ -3,6 +3,8 @@ package com.capacitorjs.plugins.filesystem;
 import android.content.Context;
 import android.net.Uri;
 import android.os.Environment;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Base64;
 import com.capacitorjs.plugins.filesystem.exceptions.CopyFailedException;
 import com.capacitorjs.plugins.filesystem.exceptions.DirectoryExistsException;
@@ -27,6 +29,8 @@ import java.nio.channels.FileChannel;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Locale;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import org.json.JSONException;
 
 public class Filesystem {
@@ -303,9 +307,32 @@ public class Filesystem {
         }
     }
 
-    public JSObject downloadFile(PluginCall call, Bridge bridge, HttpRequestHandler.ProgressEmitter emitter)
-        throws IOException, URISyntaxException, JSONException {
+    public void downloadFile(
+        PluginCall call,
+        Bridge bridge,
+        HttpRequestHandler.ProgressEmitter emitter,
+        FilesystemDownloadCallback callback
+    ) {
         String urlString = call.getString("url", "");
+        ExecutorService executor = Executors.newSingleThreadExecutor();
+        Handler handler = new Handler(Looper.getMainLooper());
+
+        executor.execute(
+            () -> {
+                try {
+                    JSObject result = doDownloadInBackground(urlString, call, bridge, emitter);
+                    handler.post(() -> callback.onSuccess(result));
+                } catch (Exception error) {
+                    handler.post(() -> callback.onError(error));
+                } finally {
+                    executor.shutdown();
+                }
+            }
+        );
+    }
+
+    private JSObject doDownloadInBackground(String urlString, PluginCall call, Bridge bridge, HttpRequestHandler.ProgressEmitter emitter)
+        throws IOException, URISyntaxException, JSONException {
         JSObject headers = call.getObject("headers", new JSObject());
         JSObject params = call.getObject("params", new JSObject());
         Integer connectTimeout = call.getInt("connectTimeout");
@@ -374,10 +401,14 @@ public class Filesystem {
         connectionInputStream.close();
         fileOutputStream.close();
 
-        return new JSObject() {
-            {
-                put("path", file.getAbsolutePath());
-            }
-        };
+        JSObject ret = new JSObject();
+        ret.put("path", file.getAbsolutePath());
+        return ret;
+    }
+
+    public interface FilesystemDownloadCallback {
+        void onSuccess(JSObject result);
+
+        void onError(Exception error);
     }
 }

package/android/src/main/java/com/capacitorjs/plugins/filesystem/FilesystemPlugin.java

@@ -388,23 +388,37 @@ public class FilesystemPlugin extends Plugin {
 
             if (isPublicDirectory(directory) && !isStoragePermissionGranted()) {
                 requestAllPermissions(call, "permissionCallback");
-            } else {
-                HttpRequestHandler.ProgressEmitter emitter = (bytes, contentLength) -> {
-                    JSObject ret = new JSObject();
-                    ret.put("url", call.getString("url"));
-                    ret.put("bytes", bytes);
-                    ret.put("contentLength", contentLength);
+                return;
+            }
 
-                    notifyListeners("progress", ret);
-                };
+            HttpRequestHandler.ProgressEmitter emitter = (bytes, contentLength) -> {
+                JSObject ret = new JSObject();
+                ret.put("url", call.getString("url"));
+                ret.put("bytes", bytes);
+                ret.put("contentLength", contentLength);
+                notifyListeners("progress", ret);
+            };
+
+            implementation.downloadFile(
+                call,
+                bridge,
+                emitter,
+                new Filesystem.FilesystemDownloadCallback() {
+                    @Override
+                    public void onSuccess(JSObject response) {
+                        // update mediaStore index only if file was written to external storage
+                        if (isPublicDirectory(directory)) {
+                            MediaScannerConnection.scanFile(getContext(), new String[] { response.getString("path") }, null, null);
+                        }
+                        call.resolve(response);
+                    }
 
-                JSObject response = implementation.downloadFile(call, bridge, emitter);
-                // update mediaStore index only if file was written to external storage
-                if (isPublicDirectory(directory)) {
-                    MediaScannerConnection.scanFile(getContext(), new String[] { response.getString("path") }, null, null);
+                    @Override
+                    public void onError(Exception error) {
+                        call.reject("Error downloading file: " + error.getLocalizedMessage(), error);
+                    }
                 }
-                call.resolve(response);
-            }
+            );
         } catch (Exception ex) {
             call.reject("Error downloading file: " + ex.getLocalizedMessage(), ex);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/filesystem",
-  "version": "6.0.2-nightly-20240905T150509.0",
+  "version": "6.0.3",
   "description": "The Filesystem API provides a NodeJS-like API for working with files on the device.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "88228ac4cff2e4ebaf33e7ba28a6946e11b1af96"
+  "gitHead": "adb1bbe6a8936f8fb388252c502a1ade0d30b60f"
 }