From d86ae0f1365e613d8de9263dd2ab29149bb7b5d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=A8=E3=83=AA=E3=82=B9?= Date: Thu, 30 Jan 2025 11:36:06 +0900 Subject: [PATCH] refactor: apply formatting suggestion --- .../apache/cordova/CordovaResourceApi.java | 42 ++++++++++++------- .../cordova/engine/SystemWebViewClient.java | 12 +++--- 2 files changed, 35 insertions(+), 19 deletions(-) diff --git a/framework/src/org/apache/cordova/CordovaResourceApi.java b/framework/src/org/apache/cordova/CordovaResourceApi.java index 46b7e6e7e..38edef246 100644 --- a/framework/src/org/apache/cordova/CordovaResourceApi.java +++ b/framework/src/org/apache/cordova/CordovaResourceApi.java @@ -46,21 +46,35 @@ Licensed to the Apache Software Foundation (ASF) under one /** * What this class provides: * - *

1. Helpers for reading & writing to URLs. - * - E.g. handles assets, resources, content providers, files, data URIs, http[s] - * - E.g. Can be used to query for mime-type & content length.

+ *
    + *
  1. + * Helpers for reading & writing to URLs. + *
      + *
    • E.g. handles assets, resources, content providers, files, data URIs, http[s]
    • + *
    • E.g. Can be used to query for mime-type & content length.

    • + *
    + *
  2. + *
  3. + * To allow plugins to redirect URLs (via remapUrl). + *
      + *
    • + * All plugins should call remapUrl() on URLs they receive from JS *before* passing the URL onto other utility functions in this class. + *
    • + *
    • For an example usage of this, refer to the org.apache.cordova.file plugin.
    • + *
    + *
  4. + *
* - *

2. To allow plugins to redirect URLs (via remapUrl). - * - All plugins should call remapUrl() on URLs they receive from JS *before* - * passing the URL onto other utility functions in this class. - * - For an example usage of this, refer to the org.apache.cordova.file plugin.

- * - *

Future Work: - * - Consider using a Cursor to query content URLs for their size (like the file plugin does). - * - Allow plugins to remapUri to "cdv-plugin://plugin-name/foo", which CordovaResourceApi - * would then delegate to pluginManager.getPlugin(plugin-name).openForRead(url) - * - Currently, plugins *can* do this by remapping to a data: URL, but it's inefficient - * for large payloads.

+ *

Future Work:

+ * */ public class CordovaResourceApi { @SuppressWarnings("unused") diff --git a/framework/src/org/apache/cordova/engine/SystemWebViewClient.java b/framework/src/org/apache/cordova/engine/SystemWebViewClient.java index fb1c27aaf..dcf3beed7 100755 --- a/framework/src/org/apache/cordova/engine/SystemWebViewClient.java +++ b/framework/src/org/apache/cordova/engine/SystemWebViewClient.java @@ -341,11 +341,13 @@ public AuthenticationToken removeAuthenticationToken(String host, String realm) /** * Gets the authentication token. * - *

In order it tries: - * 1- host + realm - * 2- host - * 3- realm - * 4- no host, no realm

+ *

In order it tries:

+ *
    + *
  1. host + realm
  2. + *
  3. host
  4. + *
  5. realm
  6. + *
  7. no host, no realm
  8. + *
* * @param host * @param realm