@capacitor/filesystem 7.0.0-dev-2269-20241202T174443.0 → 7.0.0-dev-2287-20241220T140459.0

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

@@ -28,6 +28,10 @@ import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Locale;
 import org.json.JSONException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import android.os.Handler;
+import android.os.Looper;
 
 public class Filesystem {
 
@@ -101,7 +105,7 @@ public class Filesystem {
     }
 
     public File copy(String from, String directory, String to, String toDirectory, boolean doRename)
-        throws IOException, CopyFailedException {
+            throws IOException, CopyFailedException {
         if (toDirectory == null) {
             toDirectory = directory;
         }
@@ -303,81 +307,123 @@ 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) throws IOException, URISyntaxException, JSONException {
         String urlString = call.getString("url", "");
-        JSObject headers = call.getObject("headers", new JSObject());
-        JSObject params = call.getObject("params", new JSObject());
-        Integer connectTimeout = call.getInt("connectTimeout");
-        Integer readTimeout = call.getInt("readTimeout");
-        Boolean disableRedirects = call.getBoolean("disableRedirects");
-        Boolean shouldEncode = call.getBoolean("shouldEncodeUrlParams", true);
-        Boolean progress = call.getBoolean("progress", false);
-
-        String method = call.getString("method", "GET").toUpperCase(Locale.ROOT);
-        String path = call.getString("path");
-        String directory = call.getString("directory", Environment.DIRECTORY_DOWNLOADS);
-
-        final URL url = new URL(urlString);
-        final File file = getFileObject(path, directory);
-
-        HttpRequestHandler.HttpURLConnectionBuilder connectionBuilder = new HttpRequestHandler.HttpURLConnectionBuilder()
-            .setUrl(url)
-            .setMethod(method)
-            .setHeaders(headers)
-            .setUrlParams(params, shouldEncode)
-            .setConnectTimeout(connectTimeout)
-            .setReadTimeout(readTimeout)
-            .setDisableRedirects(disableRedirects)
-            .openConnection();
-
-        CapacitorHttpUrlConnection connection = connectionBuilder.build();
-
-        connection.setSSLSocketFactory(bridge);
-
-        InputStream connectionInputStream = connection.getInputStream();
-        FileOutputStream fileOutputStream = new FileOutputStream(file, false);
-
-        String contentLength = connection.getHeaderField("content-length");
-        int bytes = 0;
-        int maxBytes = 0;
+        ExecutorService executor = Executors.newSingleThreadExecutor();
+        Handler handler = new Handler(Looper.getMainLooper());
+
+        executor.execute(() -> {
+            AsyncTaskResult result = doDownloadInBackground(urlString, call, bridge, emitter);
+            handler.post(() -> {
+                if (result.error != null) {
+                    callback.onError(result.error);
+                } else {
+                    callback.onSuccess(result.result);
+                }
+            });
+            executor.shutdown();
+        });
+    }
 
+    private AsyncTaskResult doDownloadInBackground(String urlString, PluginCall call, Bridge bridge,
+            HttpRequestHandler.ProgressEmitter emitter) {
         try {
-            maxBytes = contentLength != null ? Integer.parseInt(contentLength) : 0;
-        } catch (NumberFormatException ignored) {}
+            JSObject headers = call.getObject("headers", new JSObject());
+            JSObject params = call.getObject("params", new JSObject());
+            Integer connectTimeout = call.getInt("connectTimeout");
+            Integer readTimeout = call.getInt("readTimeout");
+            Boolean disableRedirects = call.getBoolean("disableRedirects");
+            Boolean shouldEncode = call.getBoolean("shouldEncodeUrlParams", true);
+            Boolean progress = call.getBoolean("progress", false);
+
+            String method = call.getString("method", "GET").toUpperCase(Locale.ROOT);
+            String path = call.getString("path");
+            String directory = call.getString("directory", Environment.DIRECTORY_DOWNLOADS);
+
+            final URL url = new URL(urlString);
+            final File file = getFileObject(path, directory);
+
+            HttpRequestHandler.HttpURLConnectionBuilder connectionBuilder = new HttpRequestHandler.HttpURLConnectionBuilder()
+                    .setUrl(url)
+                    .setMethod(method)
+                    .setHeaders(headers)
+                    .setUrlParams(params, shouldEncode)
+                    .setConnectTimeout(connectTimeout)
+                    .setReadTimeout(readTimeout)
+                    .setDisableRedirects(disableRedirects)
+                    .openConnection();
+
+            CapacitorHttpUrlConnection connection = connectionBuilder.build();
+
+            connection.setSSLSocketFactory(bridge);
+
+            InputStream connectionInputStream = connection.getInputStream();
+            FileOutputStream fileOutputStream = new FileOutputStream(file, false);
+
+            String contentLength = connection.getHeaderField("content-length");
+            int bytes = 0;
+            int maxBytes = 0;
+
+            try {
+                maxBytes = contentLength != null ? Integer.parseInt(contentLength) : 0;
+            } catch (NumberFormatException ignored) {
+            }
 
-        byte[] buffer = new byte[1024];
-        int len;
+            byte[] buffer = new byte[1024];
+            int len;
 
-        // Throttle emitter to 100ms so it doesn't slow down app
-        long lastEmitTime = System.currentTimeMillis();
-        long minEmitIntervalMillis = 100;
+            // Throttle emitter to 100ms so it doesn't slow down app
+            long lastEmitTime = System.currentTimeMillis();
+            long minEmitIntervalMillis = 100;
 
-        while ((len = connectionInputStream.read(buffer)) > 0) {
-            fileOutputStream.write(buffer, 0, len);
+            while ((len = connectionInputStream.read(buffer)) > 0) {
+                fileOutputStream.write(buffer, 0, len);
 
-            bytes += len;
+                bytes += len;
 
-            if (progress && null != emitter) {
-                long currentTime = System.currentTimeMillis();
-                if (currentTime - lastEmitTime > minEmitIntervalMillis) {
-                    emitter.emit(bytes, maxBytes);
-                    lastEmitTime = currentTime;
+                if (progress && null != emitter) {
+                    long currentTime = System.currentTimeMillis();
+                    if (currentTime - lastEmitTime > minEmitIntervalMillis) {
+                        emitter.emit(bytes, maxBytes);
+                        lastEmitTime = currentTime;
+                    }
                 }
             }
+
+            if (progress && null != emitter) {
+                emitter.emit(bytes, maxBytes);
+            }
+
+            connectionInputStream.close();
+            fileOutputStream.close();
+
+            JSObject ret = new JSObject();
+            ret.put("path", file.getAbsolutePath());
+            return new AsyncTaskResult(ret);
+        } catch (Exception e) {
+            return new AsyncTaskResult(e);
+        }
+    }
+
+    private static class AsyncTaskResult {
+        final JSObject result;
+        final Exception error;
+
+        AsyncTaskResult(JSObject result) {
+            this.result = result;
+            this.error = null;
         }
 
-        if (progress && null != emitter) {
-            emitter.emit(bytes, maxBytes);
+        AsyncTaskResult(Exception error) {
+            this.result = null;
+            this.error = error;
         }
+    }
 
-        connectionInputStream.close();
-        fileOutputStream.close();
+    public interface FilesystemDownloadCallback {
+        void onSuccess(JSObject result);
 
-        return new JSObject() {
-            {
-                put("path", file.getAbsolutePath());
-            }
-        };
+        void onError(Exception error);
     }
 }

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

@@ -133,7 +133,7 @@ public class FilesystemPlugin extends Plugin {
                 } else {
                     if (
                         fileObject.getParentFile() == null ||
-                        fileObject.getParentFile().exists() ||
+                            fileObject.getParentFile().exists() ||
                         (recursive && fileObject.getParentFile().mkdirs())
                     ) {
                         saveFile(call, fileObject, data);
@@ -169,7 +169,7 @@ public class FilesystemPlugin extends Plugin {
             call.resolve(result);
         } catch (IOException ex) {
             Logger.error(
-                getLogTag(),
+                    getLogTag(),
                 "Creating file '" + file.getPath() + "' with charset '" + charset + "' failed. Error: " + ex.getMessage(),
                 ex
             );
@@ -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": "7.0.0-dev-2269-20241202T174443.0",
+  "version": "7.0.0-dev-2287-20241220T140459.0",
   "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",