@capgo/capacitor-patch 8.1.0 → 8.2.0

package/patches/upstream-pr-6991-android-native-bridge.patch

@@ -0,0 +1,15 @@
+diff --git a/capacitor/src/main/assets/native-bridge.js b/capacitor/src/main/assets/native-bridge.js
+index f5e7cc4..1463c68 100644
+--- a/capacitor/src/main/assets/native-bridge.js
++++ b/capacitor/src/main/assets/native-bridge.js
+@@ -689,8 +689,8 @@ var nativeBridge = (function (exports) {
+                                             if (isProgressEventAvailable()) {
+                                                 this.dispatchEvent(new ProgressEvent('progress', {
+                                                     lengthComputable: true,
+-                                                    loaded: nativeResponse.data.length,
+-                                                    total: nativeResponse.data.length,
++                                                    loaded: nativeResponse.data == null ? 0 : nativeResponse.data.length,
++                                                    total: nativeResponse.data == null ? 0 : nativeResponse.data.length,
+                                                 }));
+                                             }
+                                             this._headers = nativeResponse.headers;

package/patches/upstream-pr-6991-ios-native-bridge.patch

@@ -0,0 +1,15 @@
+diff --git a/Capacitor/Capacitor/assets/native-bridge.js b/Capacitor/Capacitor/assets/native-bridge.js
+index f5e7cc4..1463c68 100644
+--- a/Capacitor/Capacitor/assets/native-bridge.js
++++ b/Capacitor/Capacitor/assets/native-bridge.js
+@@ -689,8 +689,8 @@ var nativeBridge = (function (exports) {
+                                             if (isProgressEventAvailable()) {
+                                                 this.dispatchEvent(new ProgressEvent('progress', {
+                                                     lengthComputable: true,
+-                                                    loaded: nativeResponse.data.length,
+-                                                    total: nativeResponse.data.length,
++                                                    loaded: nativeResponse.data == null ? 0 : nativeResponse.data.length,
++                                                    total: nativeResponse.data == null ? 0 : nativeResponse.data.length,
+                                                 }));
+                                             }
+                                             this._headers = nativeResponse.headers;

package/patches/upstream-pr-7301-core.patch

@@ -0,0 +1,38 @@
+diff --git a/dist/index.cjs.js b/dist/index.cjs.js
+index e48348e..9c366ea 100644
+--- a/dist/index.cjs.js
++++ b/dist/index.cjs.js
+@@ -523,7 +523,13 @@ class CapacitorHttpPluginWeb extends WebPlugin {
+                 data = await readBlobAsBase64(blob);
+                 break;
+             case 'json':
+-                data = await response.json();
++                responseText = await response.text();
++                try {
++                    data = JSON.parse(responseText);
++                }
++                catch (e) {
++                    data = responseText;
++                }
+                 break;
+             case 'document':
+             case 'text':
+diff --git a/dist/index.js b/dist/index.js
+index 2509854..b10777f 100644
+--- a/dist/index.js
++++ b/dist/index.js
+@@ -519,7 +519,13 @@ class CapacitorHttpPluginWeb extends WebPlugin {
+                 data = await readBlobAsBase64(blob);
+                 break;
+             case 'json':
+-                data = await response.json();
++                responseText = await response.text();
++                try {
++                    data = JSON.parse(responseText);
++                }
++                catch (e) {
++                    data = responseText;
++                }
+                 break;
+             case 'document':
+             case 'text':

package/patches/upstream-pr-7419-ios.patch

@@ -0,0 +1,13 @@
+diff --git a/Capacitor/Capacitor/WebViewDelegationHandler.swift b/Capacitor/Capacitor/WebViewDelegationHandler.swift
+index 2b4a256d..bbdf0db9 100644
+--- a/Capacitor/Capacitor/WebViewDelegationHandler.swift
++++ b/Capacitor/Capacitor/WebViewDelegationHandler.swift
+@@ -213,7 +213,7 @@ open class WebViewDelegationHandler: NSObject, WKNavigationDelegate, WKUIDelegat
+                 let method = dict["action"] as? String ?? ""
+                 let callbackId = dict["callbackId"] as? String ?? ""
+ 
+-                let args = dict["actionArgs"] as? Array ?? []
++                let args = dict["actionArgs"] as? Array ?? [] as [String]
+                 let options = ["options": args]
+ 
+                 CAPLog.print("To Native Cordova -> ", pluginId, method, callbackId, options)

package/patches/upstream-pr-7420-ios.patch

@@ -0,0 +1,13 @@
+diff --git a/Capacitor/Capacitor/CAPApplicationDelegateProxy.swift b/Capacitor/Capacitor/CAPApplicationDelegateProxy.swift
+index 7f510bc5..7fe2bae7 100644
+--- a/Capacitor/Capacitor/CAPApplicationDelegateProxy.swift
++++ b/Capacitor/Capacitor/CAPApplicationDelegateProxy.swift
+@@ -10,7 +10,7 @@ public class ApplicationDelegateProxy: NSObject, UIApplicationDelegate {
+         NotificationCenter.default.post(name: .capacitorOpenURL, object: [
+             "url": url,
+             "options": options
+-        ])
++        ] as [String : Any])
+         NotificationCenter.default.post(name: NSNotification.Name.CDVPluginHandleOpenURL, object: url)
+         lastURL = url
+         return true

package/patches/upstream-pr-7446-android.patch

@@ -0,0 +1,14 @@
+diff --git a/capacitor/src/main/java/com/getcapacitor/Bridge.java b/capacitor/src/main/java/com/getcapacitor/Bridge.java
+index 2a72a430..5cde1e4b 100644
+--- a/capacitor/src/main/java/com/getcapacitor/Bridge.java
++++ b/capacitor/src/main/java/com/getcapacitor/Bridge.java
+@@ -279,6 +279,9 @@ public class Bridge {
+ 
+         webView.setWebChromeClient(new BridgeWebChromeClient(this));
+         webView.setWebViewClient(this.webViewClient);
++        webView.getSettings().setBuiltInZoomControls(true);
++        webView.setInitialScale(100);
++        webView.setPadding(0, 0, 0, 0);
+ 
+         if (config.isResolveServiceWorkerRequests()) {
+             ServiceWorkerController swController = ServiceWorkerController.getInstance();

package/patches/upstream-pr-7490-android.patch

@@ -0,0 +1,13 @@
+diff --git a/capacitor/src/main/java/com/getcapacitor/plugin/util/HttpRequestHandler.java b/capacitor/src/main/java/com/getcapacitor/plugin/util/HttpRequestHandler.java
+index b47d57cf..d9f310f1 100644
+--- a/capacitor/src/main/java/com/getcapacitor/plugin/util/HttpRequestHandler.java
++++ b/capacitor/src/main/java/com/getcapacitor/plugin/util/HttpRequestHandler.java
+@@ -392,7 +392,7 @@ public class HttpRequestHandler {
+         Boolean disableRedirects = call.getBoolean("disableRedirects");
+         Boolean shouldEncode = call.getBoolean("shouldEncodeUrlParams", true);
+         ResponseType responseType = ResponseType.parse(call.getString("responseType"));
+-        String dataType = call.getString("dataType");
++        String dataType = call.getString("dataType", "application/json");
+ 
+         String method = httpMethod != null ? httpMethod.toUpperCase(Locale.ROOT) : call.getString("method", "GET").toUpperCase(Locale.ROOT);
+ 

package/patches/upstream-pr-7490-ios.patch

@@ -0,0 +1,13 @@
+diff --git a/Capacitor/Capacitor/Plugins/HttpRequestHandler.swift b/Capacitor/Capacitor/Plugins/HttpRequestHandler.swift
+index 651c1b76..44e74b96 100644
+--- a/Capacitor/Capacitor/Plugins/HttpRequestHandler.swift
++++ b/Capacitor/Capacitor/Plugins/HttpRequestHandler.swift
+@@ -157,7 +157,7 @@ open class HttpRequestHandler {
+             return output
+         }
+ 
+-        let contentType = (response.allHeaderFields["Content-Type"] as? String ?? "application/default").lowercased()
++        let contentType = (response.allHeaderFields["Content-Type"] as? String ?? "application/json").lowercased()
+ 
+         if contentType.contains("application/json") || responseType == .json {
+             output["data"] = tryParseJson(data)

package/patches/upstream-pr-7535-android.patch

@@ -0,0 +1,13 @@
+diff --git a/capacitor/src/main/java/com/getcapacitor/util/WebColor.java b/capacitor/src/main/java/com/getcapacitor/util/WebColor.java
+index e055021e..fe62763c 100644
+--- a/capacitor/src/main/java/com/getcapacitor/util/WebColor.java
++++ b/capacitor/src/main/java/com/getcapacitor/util/WebColor.java
+@@ -11,7 +11,7 @@ public class WebColor {
+      */
+     public static int parseColor(String colorString) {
+         String formattedColor = colorString;
+-        if (colorString.charAt(0) != '#') {
++        if (!colorString.isEmpty() && colorString.charAt(0) != '#') {
+             formattedColor = "#" + formattedColor;
+         }
+ 

package/patches/upstream-pr-7599-ios.patch

@@ -0,0 +1,86 @@
+diff --git a/Capacitor/Capacitor/CAPBridgeViewController.swift b/Capacitor/Capacitor/CAPBridgeViewController.swift
+index a7285213..5f70bc68 100644
+--- a/Capacitor/Capacitor/CAPBridgeViewController.swift
++++ b/Capacitor/Capacitor/CAPBridgeViewController.swift
+@@ -301,6 +301,7 @@ extension CAPBridgeViewController {
+         aWebView.scrollView.bounces = false
+         aWebView.scrollView.contentInsetAdjustmentBehavior = configuration.contentInsetAdjustmentBehavior
+         aWebView.allowsLinkPreview = configuration.allowLinkPreviews
++        aWebView.allowsBackForwardNavigationGestures = configuration.allowsBackForwardNavigationGestures
+         aWebView.scrollView.isScrollEnabled = configuration.scrollingEnabled
+         if let overrideUserAgent = configuration.overridenUserAgentString {
+             aWebView.customUserAgent = overrideUserAgent
+diff --git a/Capacitor/Capacitor/CAPInstanceConfiguration.h b/Capacitor/Capacitor/CAPInstanceConfiguration.h
+index 171dbb46..4177e542 100644
+--- a/Capacitor/Capacitor/CAPInstanceConfiguration.h
++++ b/Capacitor/Capacitor/CAPInstanceConfiguration.h
+@@ -19,6 +19,7 @@ NS_SWIFT_NAME(InstanceConfiguration)
+ @property (nonatomic, readonly) BOOL scrollingEnabled;
+ @property (nonatomic, readonly) BOOL zoomingEnabled;
+ @property (nonatomic, readonly) BOOL allowLinkPreviews;
++@property (nonatomic, readonly) BOOL allowsBackForwardNavigationGestures;
+ @property (nonatomic, readonly) BOOL handleApplicationNotifications;
+ @property (nonatomic, readonly) BOOL isWebDebuggable;
+ @property (nonatomic, readonly) BOOL hasInitialFocus;
+diff --git a/Capacitor/Capacitor/CAPInstanceConfiguration.m b/Capacitor/Capacitor/CAPInstanceConfiguration.m
+index d6b7785e..e22a89f4 100644
+--- a/Capacitor/Capacitor/CAPInstanceConfiguration.m
++++ b/Capacitor/Capacitor/CAPInstanceConfiguration.m
+@@ -31,6 +31,7 @@ - (instancetype)initWithDescriptor:(CAPInstanceDescriptor *)descriptor isDebug:(
+         _scrollingEnabled = descriptor.scrollingEnabled;
+         _zoomingEnabled =  descriptor.zoomingEnabled;
+         _allowLinkPreviews = descriptor.allowLinkPreviews;
++        _allowsBackForwardNavigationGestures = descriptor.allowsBackForwardNavigationGestures;
+         _handleApplicationNotifications = descriptor.handleApplicationNotifications;
+         _contentInsetAdjustmentBehavior = descriptor.contentInsetAdjustmentBehavior;
+         _appLocation = descriptor.appLocation;
+@@ -70,6 +71,7 @@ - (instancetype)initWithConfiguration:(CAPInstanceConfiguration*)configuration a
+         _scrollingEnabled = configuration.scrollingEnabled;
+         _zoomingEnabled = configuration.zoomingEnabled;
+         _allowLinkPreviews = configuration.allowLinkPreviews;
++        _allowsBackForwardNavigationGestures = configuration.allowsBackForwardNavigationGestures;
+         _handleApplicationNotifications = configuration.handleApplicationNotifications;
+         _isWebDebuggable = configuration.isWebDebuggable;
+         _hasInitialFocus = configuration.hasInitialFocus;
+diff --git a/Capacitor/Capacitor/CAPInstanceDescriptor.h b/Capacitor/Capacitor/CAPInstanceDescriptor.h
+index f477ef55..aa2b3c23 100644
+--- a/Capacitor/Capacitor/CAPInstanceDescriptor.h
++++ b/Capacitor/Capacitor/CAPInstanceDescriptor.h
+@@ -93,6 +93,11 @@ NS_SWIFT_NAME(InstanceDescriptor)
+  @discussion Set by @c ios.allowsLinkPreview in the configuration file. Corresponds to @c allowsLinkPreview on WKWebView.
+  */
+ @property (nonatomic, assign) BOOL allowLinkPreviews;
++/**
++ @brief Whether or not the web view will allow gesture navigation .
++ @discussion Set by @c ios.allowsBackForwardNavigationGestures in the configuration file. Corresponds to @c allowsBackForwardNavigationGestures on WKWebView.
++ */
++@property (nonatomic, assign) BOOL allowsBackForwardNavigationGestures;
+ /**
+  @brief Whether or not the Capacitor runtime will set itself as the @c UNUserNotificationCenter delegate.
+  @discussion Defaults to @c true. Required to be @c true for notification plugins to work correctly. Set to @c false if your application will handle notifications independently.
+diff --git a/Capacitor/Capacitor/CAPInstanceDescriptor.m b/Capacitor/Capacitor/CAPInstanceDescriptor.m
+index 2d7a4fba..fe8f08c8 100644
+--- a/Capacitor/Capacitor/CAPInstanceDescriptor.m
++++ b/Capacitor/Capacitor/CAPInstanceDescriptor.m
+@@ -39,6 +39,7 @@ - (void)_setDefaultsWithAppLocation:(NSURL*)location {
+     _scrollingEnabled = YES;
+     _zoomingEnabled = NO;
+     _allowLinkPreviews = YES;
++    _allowsBackForwardNavigationGestures = NO;
+     _handleApplicationNotifications = YES;
+     _isWebDebuggable = NO;
+     _hasInitialFocus = YES;
+diff --git a/Capacitor/Capacitor/CAPInstanceDescriptor.swift b/Capacitor/Capacitor/CAPInstanceDescriptor.swift
+index a7eff5f6..0958e3c2 100644
+--- a/Capacitor/Capacitor/CAPInstanceDescriptor.swift
++++ b/Capacitor/Capacitor/CAPInstanceDescriptor.swift
+@@ -111,6 +111,9 @@ internal extension InstanceDescriptor {
+             if let allowPreviews = config[keyPath: "ios.allowsLinkPreview"] as? Bool {
+                 allowLinkPreviews = allowPreviews
+             }
++            if let allowsNavigationGestures = config[keyPath: "ios.allowsBackForwardNavigationGestures"] as? Bool {
++                allowsBackForwardNavigationGestures = allowsNavigationGestures
++            }
+             if let scrollEnabled = config[keyPath: "ios.scrollEnabled"] as? Bool {
+                 scrollingEnabled = scrollEnabled
+             }

package/patches/upstream-pr-7732-android-native-bridge.patch

@@ -0,0 +1,12 @@
+diff --git a/capacitor/src/main/assets/native-bridge.js b/capacitor/src/main/assets/native-bridge.js
+index f5e7cc4..2cc3db4 100644
+--- a/capacitor/src/main/assets/native-bridge.js
++++ b/capacitor/src/main/assets/native-bridge.js
+@@ -782,6 +782,7 @@ var nativeBridge = (function (exports) {
+                         Object.setPrototypeOf(xhr, prototype);
+                         return xhr;
+                     };
++                    window.XMLHttpRequest.prototype = win.CapacitorWebXMLHttpRequest.prototype;
+                     Object.assign(window.XMLHttpRequest, win.CapacitorWebXMLHttpRequest.fullObject);
+                 }
+             }

package/patches/upstream-pr-7732-ios-native-bridge.patch

@@ -0,0 +1,12 @@
+diff --git a/Capacitor/Capacitor/assets/native-bridge.js b/Capacitor/Capacitor/assets/native-bridge.js
+index f5e7cc4..2cc3db4 100644
+--- a/Capacitor/Capacitor/assets/native-bridge.js
++++ b/Capacitor/Capacitor/assets/native-bridge.js
+@@ -782,6 +782,7 @@ var nativeBridge = (function (exports) {
+                         Object.setPrototypeOf(xhr, prototype);
+                         return xhr;
+                     };
++                    window.XMLHttpRequest.prototype = win.CapacitorWebXMLHttpRequest.prototype;
+                     Object.assign(window.XMLHttpRequest, win.CapacitorWebXMLHttpRequest.fullObject);
+                 }
+             }

package/patches/upstream-pr-7781-android.patch

@@ -0,0 +1,24 @@
+diff --git a/capacitor/src/main/java/com/getcapacitor/Bridge.java b/capacitor/src/main/java/com/getcapacitor/Bridge.java
+index dd623ae651..63c2741ca9 100644
+--- a/capacitor/src/main/java/com/getcapacitor/Bridge.java
++++ b/capacitor/src/main/java/com/getcapacitor/Bridge.java
+@@ -44,7 +44,6 @@ import java.net.SocketTimeoutException;
+ import java.net.URL;
+ import java.util.ArrayList;
+ import java.util.Arrays;
+-import java.util.Collections;
+ import java.util.HashMap;
+ import java.util.HashSet;
+ import java.util.LinkedList;
+@@ -264,9 +263,10 @@ public class Bridge {
+         // Start the local web server
+         JSInjector injector = getJSInjector();
+         if (WebViewFeature.isFeatureSupported(WebViewFeature.DOCUMENT_START_SCRIPT)) {
+-            String allowedOrigin = Uri.parse(appUrl).buildUpon().path(null).fragment(null).clearQuery().build().toString();
++            Set<String> allowedOrigins = new HashSet<>(
++                Arrays.asList(Uri.parse(appUrl).buildUpon().path(null).fragment(null).clearQuery().build().toString(), "https://localhost")
++            );
+             try {
+-                WebViewCompat.addDocumentStartJavaScript(webView, injector.getScriptString(), Collections.singleton(allowedOrigin));
++                WebViewCompat.addDocumentStartJavaScript(webView, injector.getScriptString(), allowedOrigins);
+                 injector = null;

package/patches/upstream-pr-7803-android.patch

@@ -0,0 +1,13 @@
+diff --git a/capacitor/src/main/java/com/getcapacitor/Bridge.java b/capacitor/src/main/java/com/getcapacitor/Bridge.java
+index 2a72a430..12720652 100644
+--- a/capacitor/src/main/java/com/getcapacitor/Bridge.java
++++ b/capacitor/src/main/java/com/getcapacitor/Bridge.java
+@@ -434,7 +434,7 @@ public class Bridge {
+             PackageManager pm = getContext().getPackageManager();
+             PackageInfo pInfo = InternalUtils.getPackageInfo(pm, getContext().getPackageName());
+             versionCode = Integer.toString((int) PackageInfoCompat.getLongVersionCode(pInfo));
+-            versionName = pInfo.versionName;
++            if (pInfo.versionName != null) versionName = pInfo.versionName;
+         } catch (Exception ex) {
+             Logger.error("Unable to get package info", ex);
+         }

package/patches/upstream-pr-7831-ios.patch

@@ -0,0 +1,13 @@
+diff --git a/Capacitor/Capacitor/Router.swift b/Capacitor/Capacitor/Router.swift
+index 68328f8c..8d5b4372 100644
+--- a/Capacitor/Capacitor/Router.swift
++++ b/Capacitor/Capacitor/Router.swift
+@@ -17,7 +17,7 @@ public struct CapacitorRouter: Router {
+     public init() {}
+     public var basePath: String = ""
+     public func route(for path: String) -> String {
+-        let pathUrl = URL(fileURLWithPath: path)
++        let pathUrl = URL(fileURLWithPath: basePath + path)
+ 
+         // If there's no path extension it also means the path is empty or a SPA route
+         if pathUrl.pathExtension.isEmpty {

package/patches/upstream-pr-7987-android.patch

@@ -0,0 +1,42 @@
+diff --git a/capacitor/src/main/java/com/getcapacitor/BridgeWebViewClient.java b/capacitor/src/main/java/com/getcapacitor/BridgeWebViewClient.java
+index c434247a27..24149aac1a 100644
+--- a/capacitor/src/main/java/com/getcapacitor/BridgeWebViewClient.java
++++ b/capacitor/src/main/java/com/getcapacitor/BridgeWebViewClient.java
+@@ -7,6 +7,7 @@ import android.webkit.WebResourceRequest;
+ import android.webkit.WebResourceResponse;
+ import android.webkit.WebView;
+ import android.webkit.WebViewClient;
++import android.widget.Toast;
+ import java.util.List;
+ 
+ public class BridgeWebViewClient extends WebViewClient {
+@@ -91,16 +92,29 @@ public class BridgeWebViewClient extends WebViewClient {
+     @Override
+     public boolean onRenderProcessGone(WebView view, RenderProcessGoneDetail detail) {
+         super.onRenderProcessGone(view, detail);
++
+         boolean result = false;
+ 
+         List<WebViewListener> webViewListeners = bridge.getWebViewListeners();
+         if (webViewListeners != null) {
+             for (WebViewListener listener : bridge.getWebViewListeners()) {
+                 result = listener.onRenderProcessGone(view, detail) || result;
+             }
+         }
+ 
++        if (!result) {
++            // If no one handled it, handle it ourselves!
++
++            view.post(() -> {
++                Toast.makeText(view.getContext(), "Reloading due to low memory issue", Toast.LENGTH_SHORT).show();
++            });
++
++            view.reload(); // Safely reload WebView
++
++            return true;
++        }
++
+         return result;
+     }
+ 
+     @Override

package/patches/upstream-pr-8087-android.patch

@@ -0,0 +1,64 @@
+diff --git a/capacitor/src/main/java/com/getcapacitor/plugin/util/HttpRequestHandler.java b/capacitor/src/main/java/com/getcapacitor/plugin/util/HttpRequestHandler.java
+index b47d57cf..46da6e1a 100644
+--- a/capacitor/src/main/java/com/getcapacitor/plugin/util/HttpRequestHandler.java
++++ b/capacitor/src/main/java/com/getcapacitor/plugin/util/HttpRequestHandler.java
+@@ -26,7 +26,7 @@ import java.util.Locale;
+ import java.util.Map;
+ import org.json.JSONArray;
+ import org.json.JSONException;
+-import org.json.JSONObject;
++import org.json.JSONTokener;
+ 
+ public class HttpRequestHandler {
+ 
+@@ -302,36 +302,25 @@ public class HttpRequestHandler {
+     /**
+      * Returns a JSObject or a JSArray based on a string-ified input
+      * @param input String-ified JSON that needs parsing
+-     * @return A JSObject or JSArray
+-     * @throws JSONException thrown if the JSON is malformed
++     * @return A JSObject, JSArray or literal
+      */
+-    public static Object parseJSON(String input) throws JSONException {
+-        JSONObject json = new JSONObject();
++    public static Object parseJSON(String input) {
+         try {
+-            if ("null".equals(input.trim())) {
+-                return JSONObject.NULL;
+-            } else if ("true".equals(input.trim())) {
+-                return true;
+-            } else if ("false".equals(input.trim())) {
+-                return false;
+-            } else if (input.trim().length() <= 0) {
+-                return "";
+-            } else if (input.trim().matches("^\".*\"$")) {
+-                // a string enclosed in " " is a json value, return the string without the quotes
+-                return input.trim().substring(1, input.trim().length() - 1);
+-            } else if (input.trim().matches("^-?\\d+$")) {
+-                return Integer.parseInt(input.trim());
+-            } else if (input.trim().matches("^-?\\d+(\\.\\d+)?$")) {
+-                return Double.parseDouble(input.trim());
+-            } else {
++            // try to parse input as an object
++            return new JSObject(input);
++        } catch (JSONException e) {
++            try {
++                // fall through to try to parse it as an array
++                return new JSArray(input);
++            } catch (JSONException e2) {
+                 try {
+-                    return new JSObject(input);
+-                } catch (JSONException e) {
+-                    return new JSArray(input);
++                    // the value is probably a literal, so we can try to have the JSONTokener parse it for us
++                    return new JSONTokener(input).nextValue();
++                } catch (JSONException e3) {
++                    // if nothing could be parsed, return the input as is
++                    return input;
+                 }
+             }
+-        } catch (JSONException e) {
+-            return input;
+         }
+     }
+ 

package/patches/upstream-pr-8188-cli.patch

@@ -0,0 +1,18 @@
+diff --git a/dist/ios/update.js b/dist/ios/update.js
+index 54456cd..10fcbf1 100644
+--- a/dist/ios/update.js
++++ b/dist/ios/update.js
+@@ -272,7 +272,12 @@ async function updatePodfile(config, plugins, deployment) {
+     }
+     const isXcodebuildAvailable = await (0, subprocess_1.isInstalled)('xcodebuild');
+     if (isXcodebuildAvailable) {
+-        await (0, subprocess_1.runCommand)('xcodebuild', ['-project', (0, path_1.basename)(`${config.ios.nativeXcodeProjDirAbs}`), 'clean'], {
++        await (0, subprocess_1.runCommand)('xcodebuild', [
++            '-project',
++            (0, path_1.basename)(`${config.ios.nativeXcodeProjDirAbs}`),
++            ...(config.ios.scheme ? ['-scheme', config.ios.scheme] : []),
++            'clean',
++        ], {
+             cwd: config.ios.nativeProjectDirAbs,
+         });
+     }

package/patches/upstream-pr-8190-android.patch

@@ -0,0 +1,13 @@
+diff --git a/capacitor/src/main/java/com/getcapacitor/WebViewLocalServer.java b/capacitor/src/main/java/com/getcapacitor/WebViewLocalServer.java
+index a044bfbe..b4aebfce 100755
+--- a/capacitor/src/main/java/com/getcapacitor/WebViewLocalServer.java
++++ b/capacitor/src/main/java/com/getcapacitor/WebViewLocalServer.java
+@@ -129,7 +129,7 @@ public class WebViewLocalServer {
+         }
+ 
+         public Map<String, String> getResponseHeaders() {
+-            return responseHeaders;
++            return new HashMap<>(responseHeaders);
+         }
+     }
+ 

package/patches/upstream-pr-8249-ios.patch

@@ -0,0 +1,32 @@
+diff --git a/Capacitor/Capacitor/Plugins/CapacitorCookieManager.swift b/Capacitor/Capacitor/Plugins/CapacitorCookieManager.swift
+index 782c245b..b5ab0cf6 100644
+--- a/Capacitor/Capacitor/Plugins/CapacitorCookieManager.swift
++++ b/Capacitor/Capacitor/Plugins/CapacitorCookieManager.swift
+@@ -46,14 +46,6 @@ public class CapacitorCookieManager {
+         return url
+     }
+ 
+-    public func encode(_ value: String) -> String {
+-        return value.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed)!
+-    }
+-
+-    public func decode(_ value: String) -> String {
+-        return value.removingPercentEncoding!
+-    }
+-
+     public func setCookie(_ domain: String, _ action: String) {
+         let url = getServerUrl(domain)!
+         let jar = HTTPCookieStorage.shared
+diff --git a/Capacitor/Capacitor/Plugins/CapacitorCookies.swift b/Capacitor/Capacitor/Plugins/CapacitorCookies.swift
+index 8d5efd3a..75ac0092 100644
+--- a/Capacitor/Capacitor/Plugins/CapacitorCookies.swift
++++ b/Capacitor/Capacitor/Plugins/CapacitorCookies.swift
+@@ -31,7 +31,7 @@ public class CAPCookiesPlugin: CAPPlugin, CAPBridgedPlugin {
+ 
+         let expires = call.getString("expires", "")
+         let path = call.getString("path", "")
+-        cookieManager!.setCookie(url, key, cookieManager!.encode(value), expires, path)
++        cookieManager!.setCookie(url, key, value, expires, path)
+         call.resolve()
+     }
+ 

package/patches/upstream-pr-8252-cli.patch

@@ -0,0 +1,31 @@
+diff --git a/dist/ios/update.js b/dist/ios/update.js
+index 54456cd..5fb1920 100644
+--- a/dist/ios/update.js
++++ b/dist/ios/update.js
+@@ -55,9 +55,9 @@ async function updatePluginFiles(config, plugins, deployment) {
+     (0, plugin_1.printPlugins)(incompatibleCordovaPlugins, platform, 'incompatible');
+ }
+ async function generateCordovaPackageFiles(cordovaPlugins, config) {
+-    cordovaPlugins.map((plugin) => {
+-        generateCordovaPackageFile(plugin, config);
+-    });
++    await Promise.all(cordovaPlugins.map(async (plugin) => {
++        await generateCordovaPackageFile(plugin, config);
++    }));
+ }
+ async function generateCordovaPackageFile(p, config) {
+     var _a;
+diff --git a/dist/tasks/update.js b/dist/tasks/update.js
+index 3aeb45b..04f66b6 100644
+--- a/dist/tasks/update.js
++++ b/dist/tasks/update.js
+@@ -69,7 +69,8 @@ function updateChecks(config, platforms) {
+     const checks = [];
+     for (const platformName of platforms) {
+         if (platformName === config.ios.name) {
+-            checks.push(() => (0, common_2.checkBundler)(config) || (0, common_2.checkCocoaPods)(config));
++            checks.push(() => (0, common_2.checkBundler)(config));
++            checks.push(() => (0, common_2.checkCocoaPods)(config));
+         }
+         else if (platformName === config.android.name) {
+             continue;

package/patches/upstream-pr-8271-core.patch

@@ -0,0 +1,30 @@
+diff --git a/dist/index.cjs.js b/dist/index.cjs.js
+index e48348e..12237d0 100644
+--- a/dist/index.cjs.js
++++ b/dist/index.cjs.js
+@@ -288,7 +288,9 @@ class WebPlugin {
+             return;
+         }
+         const index = listeners.indexOf(listenerFunc);
+-        this.listeners[eventName].splice(index, 1);
++        if (index !== -1) {
++            this.listeners[eventName].splice(index, 1);
++        }
+         // If there are no more listeners for this type of event,
+         // remove the window listener
+         if (!this.listeners[eventName].length) {
+diff --git a/dist/index.js b/dist/index.js
+index 2509854..d4532a5 100644
+--- a/dist/index.js
++++ b/dist/index.js
+@@ -284,7 +284,9 @@ class WebPlugin {
+             return;
+         }
+         const index = listeners.indexOf(listenerFunc);
+-        this.listeners[eventName].splice(index, 1);
++        if (index !== -1) {
++            this.listeners[eventName].splice(index, 1);
++        }
+         // If there are no more listeners for this type of event,
+         // remove the window listener
+         if (!this.listeners[eventName].length) {