Revert "feat(android): add WebViewAssetLoader proxy handler for cdvfile (apache#513)"

This reverts commit 3366ea6.

Author: Abaddon-88

README.md

@@ -422,22 +422,7 @@ This method will now return filesystem URLs of the form
 
 which can be used to identify the file uniquely.
 
-In v7.0.0 the return value of `toURL()` for Android was updated to return the absolute `file://` URL when app content is served from the `file://` scheme.
-
-If app content is served from the `http(s)://` scheme, a `cdvfile` formatted URL will be returned instead. The `cdvfile` formatted URL is created from the internal method `toInternalURL()`.
-
-An example `toInternalURL()` return filesystem URL:
-
-    https://localhost/persistent/path/to/file
-
-[![toURL flow](https://sketchviz.com/@erisu/7b05499842275be93a0581e8e3576798/6dc71d8302cafd05b443d874a592d10fa415b8e3.sketchy.png)](//sketchviz.com/@erisu/7b05499842275be93a0581e8e3576798)
-
-It is recommended to always use the `toURL()` to ensure that the correct URL is returned.
-
 ## cdvfile protocol
-
-- Not Supported on Android
-
 **Purpose**
 
 `cdvfile://localhost/persistent|temporary|another-fs-root*/path/to/file` can be used for platform-independent file paths.

package.json

@@ -37,7 +37,7 @@
         "cordova-android": ">=6.3.0"
       },
       "7.0.0": {
-        "cordova-android": ">=10.0.0"
+        "cordova-android": ">=9.0.0"
       },
       "8.0.0": {
         "cordova": ">100"

plugin.xml

@@ -30,7 +30,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"
     <issue>https://github.com/apache/cordova-plugin-file/issues</issue>
 
     <engines>
-        <engine name="cordova-android" version=">=10.0.0" />
+        <engine name="cordova-android" version=">=9.0.0" />
     </engines>
 
     <js-module src="www/DirectoryEntry.js" name="DirectoryEntry">
@@ -150,9 +150,6 @@ to config.xml in order for the application to find previously stored files.
         <source-file src="src/android/AssetFilesystem.java" target-dir="src/org/apache/cordova/file" />
         <source-file src="src/android/PendingRequests.java" target-dir="src/org/apache/cordova/file" />
 
-        <preference name="ANDROIDX_WEBKIT_VERSION" default="1.4.0"/>
-        <framework src="androidx.webkit:webkit:$ANDROIDX_WEBKIT_VERSION" />
-
         <!-- android specific file apis -->
         <js-module src="www/android/FileSystem.js" name="androidFileSystem">
             <merges target="FileSystem" />

src/android/AssetFilesystem.java

@@ -21,7 +21,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 import android.content.res.AssetManager;
 import android.net.Uri;
 
-import org.apache.cordova.CordovaPreferences;
 import org.apache.cordova.CordovaResourceApi;
 import org.apache.cordova.LOG;
 import org.json.JSONArray;
@@ -134,8 +133,8 @@ private long getAssetSize(String assetPath) throws FileNotFoundException {
         }
     }
 
-    public AssetFilesystem(AssetManager assetManager, CordovaResourceApi resourceApi, CordovaPreferences preferences) {
-        super(Uri.parse("file:///android_asset/"), "assets", resourceApi, preferences);
+    public AssetFilesystem(AssetManager assetManager, CordovaResourceApi resourceApi) {
+        super(Uri.parse("file:///android_asset/"), "assets", resourceApi);
         this.assetManager = assetManager;
 	}
 
@@ -162,9 +161,10 @@ public LocalFilesystemURL toLocalUri(Uri inputURL) {
         if (!subPath.isEmpty()) {
             subPath = subPath.substring(1);
         }
-
-        Uri.Builder b = createLocalUriBuilder();
-
+        Uri.Builder b = new Uri.Builder()
+            .scheme(LocalFilesystemURL.FILESYSTEM_PROTOCOL)
+            .authority("localhost")
+            .path(name);
         if (!subPath.isEmpty()) {
             b.appendEncodedPath(subPath);
         }

src/android/ContentFilesystem.java

@@ -28,8 +28,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-
-import org.apache.cordova.CordovaPreferences;
 import org.apache.cordova.CordovaResourceApi;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -38,8 +36,8 @@ public class ContentFilesystem extends Filesystem {
 
     private final Context context;
 
-	public ContentFilesystem(Context context, CordovaResourceApi resourceApi, CordovaPreferences preferences) {
-		super(Uri.parse("content://"), "content", resourceApi, preferences);
+	public ContentFilesystem(Context context, CordovaResourceApi resourceApi) {
+		super(Uri.parse("content://"), "content", resourceApi);
         this.context = context;
 	}
 
@@ -70,9 +68,11 @@ public LocalFilesystemURL toLocalUri(Uri inputURL) {
         if (subPath.length() > 0) {
             subPath = subPath.substring(1);
         }
-
-        Uri.Builder b = createLocalUriBuilder().appendPath(inputURL.getAuthority());
-
+        Uri.Builder b = new Uri.Builder()
+            .scheme(LocalFilesystemURL.FILESYSTEM_PROTOCOL)
+            .authority("localhost")
+            .path(name)
+            .appendPath(inputURL.getAuthority());
         if (subPath.length() > 0) {
             b.appendEncodedPath(subPath);
         }

src/android/FileUtils.java

@@ -20,23 +20,16 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 import android.Manifest;
 import android.app.Activity;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
 import android.util.Base64;
-import android.util.Log;
-import android.webkit.MimeTypeMap;
-import android.webkit.WebResourceResponse;
-
-import androidx.webkit.WebViewAssetLoader;
 
 import org.apache.cordova.CallbackContext;
 import org.apache.cordova.CordovaInterface;
 import org.apache.cordova.CordovaPlugin;
-import org.apache.cordova.CordovaPluginPathHandler;
 import org.apache.cordova.CordovaWebView;
 import org.apache.cordova.LOG;
 import org.apache.cordova.PermissionHelper;
@@ -46,16 +39,12 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
-import java.net.URL;
 import java.security.Permission;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -99,6 +88,8 @@ public class FileUtils extends CordovaPlugin {
 
     private PendingRequests pendingRequests;
 
+
+
     /*
      * We need both read and write when accessing the storage, I think.
      */
@@ -146,10 +137,10 @@ protected void registerExtraFileSystems(String[] filesystems, HashMap<String, St
                 if (fsRoot != null) {
                     File newRoot = new File(fsRoot);
                     if (newRoot.mkdirs() || newRoot.isDirectory()) {
-                        registerFilesystem(new LocalFilesystem(fsName, webView.getContext(), webView.getResourceApi(), newRoot, preferences));
+                        registerFilesystem(new LocalFilesystem(fsName, webView.getContext(), webView.getResourceApi(), newRoot));
                         installedFileSystems.add(fsName);
                     } else {
-                        LOG.d(LOG_TAG, "Unable to create root dir for filesystem \"" + fsName + "\", skipping");
+                       LOG.d(LOG_TAG, "Unable to create root dir for filesystem \"" + fsName + "\", skipping");
                     }
                 } else {
                     LOG.d(LOG_TAG, "Unrecognized extra filesystem identifier: " + fsName);
@@ -227,10 +218,10 @@ public void initialize(CordovaInterface cordova, CordovaWebView webView) {
     		// Note: The temporary and persistent filesystems need to be the first two
     		// registered, so that they will match window.TEMPORARY and window.PERSISTENT,
     		// per spec.
-    		this.registerFilesystem(new LocalFilesystem("temporary", webView.getContext(), webView.getResourceApi(), tmpRootFile, preferences));
-            this.registerFilesystem(new LocalFilesystem("persistent", webView.getContext(), webView.getResourceApi(), persistentRootFile, preferences));
-            this.registerFilesystem(new ContentFilesystem(webView.getContext(), webView.getResourceApi(), preferences));
-            this.registerFilesystem(new AssetFilesystem(webView.getContext().getAssets(), webView.getResourceApi(), preferences));
+    		this.registerFilesystem(new LocalFilesystem("temporary", webView.getContext(), webView.getResourceApi(), tmpRootFile));
+    		this.registerFilesystem(new LocalFilesystem("persistent", webView.getContext(), webView.getResourceApi(), persistentRootFile));
+    		this.registerFilesystem(new ContentFilesystem(webView.getContext(), webView.getResourceApi()));
+            this.registerFilesystem(new AssetFilesystem(webView.getContext().getAssets(), webView.getResourceApi()));
 
             registerExtraFileSystems(getExtraFileSystemsPreference(activity), getAvailableFileSystems(activity));
 
@@ -259,15 +250,13 @@ public Uri remapUri(Uri uri) {
         if (!LocalFilesystemURL.FILESYSTEM_PROTOCOL.equals(uri.getScheme())) {
             return null;
         }
-
         try {
         	LocalFilesystemURL inputURL = LocalFilesystemURL.parse(uri);
         	Filesystem fs = this.filesystemForURL(inputURL);
         	if (fs == null) {
         		return null;
         	}
         	String path = fs.filesystemPathForURL(inputURL);
-
         	if (path != null) {
         		return Uri.parse("file://" + fs.filesystemPathForURL(inputURL));
         	}
@@ -282,7 +271,6 @@ public boolean execute(String action, final String rawArgs, final CallbackContex
             callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.ERROR, "File plugin is not configured. Please see the README.md file for details on how to update config.xml"));
             return true;
         }
-
         if (action.equals("testSaveLocationExists")) {
             threadhelper(new FileOp() {
                 public void run(JSONArray args) {
@@ -473,24 +461,18 @@ else if (action.equals("getFile")) {
                 public void run(JSONArray args) throws FileExistsException, IOException, TypeMismatchException, EncodingException, JSONException {
                     String dirname = args.getString(0);
                     String path = args.getString(1);
+                    String nativeURL = resolveLocalFileSystemURI(dirname).getString("nativeURL");
+                    boolean containsCreate = (args.isNull(2)) ? false : args.getJSONObject(2).optBoolean("create", false);
 
-                    if (dirname.contains(LocalFilesystemURL.CDVFILE_KEYWORD) == true) {
+                    if(containsCreate && needPermission(nativeURL, WRITE)) {
+                        getWritePermission(rawArgs, ACTION_GET_FILE, callbackContext);
+                    }
+                    else if(!containsCreate && needPermission(nativeURL, READ)) {
+                        getReadPermission(rawArgs, ACTION_GET_FILE, callbackContext);
+                    }
+                    else {
                         JSONObject obj = getFile(dirname, path, args.optJSONObject(2), false);
                         callbackContext.success(obj);
-                    } else {
-                        String nativeURL = resolveLocalFileSystemURI(dirname).getString("nativeURL");
-                        boolean containsCreate = (args.isNull(2)) ? false : args.getJSONObject(2).optBoolean("create", false);
-
-                        if(containsCreate && needPermission(nativeURL, WRITE)) {
-                            getWritePermission(rawArgs, ACTION_GET_FILE, callbackContext);
-                        }
-                        else if(!containsCreate && needPermission(nativeURL, READ)) {
-                            getReadPermission(rawArgs, ACTION_GET_FILE, callbackContext);
-                        }
-                        else {
-                            JSONObject obj = getFile(dirname, path, args.optJSONObject(2), false);
-                            callbackContext.success(obj);
-                        }
                     }
                 }
             }, rawArgs, callbackContext);
@@ -904,7 +886,6 @@ private boolean remove(String baseURLstr) throws NoModificationAllowedException,
     private JSONObject getFile(String baseURLstr, String path, JSONObject options, boolean directory) throws FileExistsException, IOException, TypeMismatchException, EncodingException, JSONException {
         try {
         	LocalFilesystemURL inputURL = LocalFilesystemURL.parse(baseURLstr);
-
         	Filesystem fs = this.filesystemForURL(inputURL);
         	if (fs == null) {
         		throw new MalformedURLException("No installed handlers for this URL");
@@ -1258,68 +1239,4 @@ public void run(JSONArray args) throws FileNotFoundException, JSONException, Mal
            LOG.d(LOG_TAG, "Received permission callback for unknown request code");
         }
     }
-
-    private String getMimeType(Uri uri) {
-        String fileExtensionFromUrl = MimeTypeMap.getFileExtensionFromUrl(uri.toString()).toLowerCase();
-        return  MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExtensionFromUrl);
-    }
-
-    public CordovaPluginPathHandler getPathHandler() {
-        WebViewAssetLoader.PathHandler pathHandler = path -> {
-            String targetFileSystem = null;
-
-            if (path.startsWith(LocalFilesystemURL.fsNameToCdvKeyword("persistent"))) {
-                targetFileSystem = "persistent";
-            } else if (path.startsWith(LocalFilesystemURL.fsNameToCdvKeyword("temporary"))) {
-                targetFileSystem = "temporary";
-            } else if (path.startsWith(LocalFilesystemURL.fsNameToCdvKeyword("files"))) {
-                targetFileSystem = "files";
-            } else if (path.startsWith(LocalFilesystemURL.fsNameToCdvKeyword("documents"))) {
-                targetFileSystem = "documents";
-            } else if (path.startsWith(LocalFilesystemURL.fsNameToCdvKeyword("cache"))) {
-                targetFileSystem = "cache";
-            } else if (path.startsWith(LocalFilesystemURL.fsNameToCdvKeyword("root"))) {
-                targetFileSystem = "root";
-            } else if (path.startsWith(LocalFilesystemURL.fsNameToCdvKeyword("files-external"))) {
-                targetFileSystem = "files-external";
-            } else if (path.startsWith(LocalFilesystemURL.fsNameToCdvKeyword("sdcard"))) {
-                targetFileSystem = "sdcard";
-            } else if (path.startsWith(LocalFilesystemURL.fsNameToCdvKeyword("cache-external"))) {
-                targetFileSystem = "cache-external";
-            }
-
-            if (targetFileSystem != null) {
-                // Loop the registered file systems to find the target.
-                for (Filesystem fileSystem : filesystems) {
-
-                    /*
-                     * When target is discovered:
-                     * 1. Transform the url path to the native path
-                     * 2. Load the file contents
-                     * 3. Get the file mime type
-                     * 4. Return the file & mime information back we Web Resources
-                     */
-                    if (fileSystem.name.equals(targetFileSystem)) {
-                        // E.g. replace __cdvfile_persistent__ with native path "/data/user/0/com.example.file/files/files/"
-                        String fileSystemNativeUri = fileSystem.rootUri.toString().replace("file://", "");
-                        String fileTarget = path.replace(LocalFilesystemURL.fsNameToCdvKeyword(targetFileSystem) + "/", fileSystemNativeUri);
-
-                        File file = new File(fileTarget);
-
-                        try {
-                            InputStream in = new FileInputStream(file);
-                            String mimeType = getMimeType(Uri.parse(file.toString()));
-                            return new WebResourceResponse(mimeType, null, in);
-                        } catch (FileNotFoundException e) {
-                            Log.e(LOG_TAG, e.getMessage());
-                        }
-                    }
-                }
-            }
-
-            return null;
-        };
-
-        return new CordovaPluginPathHandler(pathHandler);
-    }
 }

src/android/Filesystem.java

@@ -29,7 +29,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import org.apache.cordova.CordovaPreferences;
 import org.apache.cordova.CordovaResourceApi;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -39,18 +38,13 @@ public abstract class Filesystem {
 
     protected final Uri rootUri;
     protected final CordovaResourceApi resourceApi;
-    protected final CordovaPreferences preferences;
     public final String name;
     private JSONObject rootEntry;
 
-    static String SCHEME_HTTPS = "https";
-    static String DEFAULT_HOSTNAME = "localhost";
-
-    public Filesystem(Uri rootUri, String name, CordovaResourceApi resourceApi, CordovaPreferences preferences) {
+    public Filesystem(Uri rootUri, String name, CordovaResourceApi resourceApi) {
         this.rootUri = rootUri;
         this.name = name;
         this.resourceApi = resourceApi;
-        this.preferences = preferences;
     }
 
     public interface ReadFileCallback {
@@ -334,15 +328,4 @@ public int read(byte[] buffer, int byteOffset, int byteCount) throws IOException
             return numBytesRead;
         }
     }
-
-    protected Uri.Builder createLocalUriBuilder() {
-        String scheme = preferences.getString("scheme", SCHEME_HTTPS).toLowerCase();
-        String hostname = preferences.getString("hostname", DEFAULT_HOSTNAME).toLowerCase();
-        String path = LocalFilesystemURL.fsNameToCdvKeyword(name);
-
-        return new Uri.Builder()
-            .scheme(scheme)
-            .authority(hostname)
-            .path(path);
-    }
 }