@capacitor-plus/ios 8.0.7 → 8.3.3

package/Capacitor/Capacitor/CAPBridgeProtocol.swift

@@ -81,7 +81,9 @@ import WebKit
 
     // MARK: - View Presentation
     func showAlertWith(title: String, message: String, buttonTitle: String)
+    @available(*, deprecated, message: "Use self?.bridge?.viewController?.present")
     func presentVC(_ viewControllerToPresent: UIViewController, animated flag: Bool, completion: (() -> Void)?)
+    @available(*, deprecated, message: "Use self?.bridge?.viewController?.dismiss")
     func dismissVC(animated flag: Bool, completion: (() -> Void)?)
 }
 

package/Capacitor/Capacitor/CAPBridgedJSTypes.h

@@ -10,6 +10,7 @@
 - (NSString * _Nullable)getString:(NSString * _Nonnull)key defaultValue:(NSString * _Nullable)defaultValue;
 - (NSDate * _Nullable)getDate:(NSString * _Nonnull)key defaultValue:(NSDate * _Nullable)defaultValue;
 - (NSDictionary * _Nullable)getObject:(NSString * _Nonnull)key defaultValue:(NSDictionary * _Nullable)defaultValue;
+- (NSArray * _Nullable)getArray:(NSString * _Nonnull)key defaultValue:(NSArray * _Nullable)defaultValue;
 - (NSNumber * _Nullable)getNumber:(NSString * _Nonnull)key defaultValue:(NSNumber * _Nullable)defaultValue;
 - (BOOL)getBool:(NSString * _Nonnull)key defaultValue:(BOOL)defaultValue;
 @end

package/Capacitor/Capacitor/CAPBridgedJSTypes.m

@@ -29,6 +29,14 @@
     return defaultValue;
 }
 
+- (NSArray * _Nullable)getArray:(NSString * _Nonnull)key defaultValue:(NSArray * _Nullable)defaultValue {
+    id value = [[self dictionaryRepresentation] objectForKey:key];
+    if (value != nil && [value isKindOfClass:[NSArray class]]) {
+        return value;
+    }
+    return defaultValue;
+}
+
 - (NSNumber * _Nullable)getNumber:(NSString * _Nonnull)key defaultValue:(NSNumber * _Nullable)defaultValue {
     id value = [[self dictionaryRepresentation] objectForKey:key];
     if (value != nil && [value isKindOfClass:[NSNumber class]]) {

package/Capacitor/Capacitor/CapacitorBridge.swift

@@ -93,8 +93,9 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
             }
         }
     }
-
+    @available(*, deprecated, message: "obsolete")
     var tmpWindow: UIWindow?
+    @available(*, deprecated, message: "obsolete")
     static let tmpVCAppeared = Notification(name: Notification.Name(rawValue: "tmpViewControllerAppeared"))
     public static let capacitorSite = "https://capacitorjs.com/"
     public static let fileStartIdentifier = "/_capacitor_file_"
@@ -747,22 +748,10 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
     }
 
     @objc open func presentVC(_ viewControllerToPresent: UIViewController, animated flag: Bool, completion: (() -> Void)? = nil) {
-        if viewControllerToPresent.modalPresentationStyle == .popover {
-            self.viewController?.present(viewControllerToPresent, animated: flag, completion: completion)
-        } else {
-            self.tmpWindow = UIWindow.init(frame: UIScreen.main.bounds)
-            self.tmpWindow?.rootViewController = TmpViewController.init()
-            self.tmpWindow?.makeKeyAndVisible()
-            self.tmpWindow?.rootViewController?.present(viewControllerToPresent, animated: flag, completion: completion)
-        }
+        self.viewController?.present(viewControllerToPresent, animated: flag, completion: completion)
     }
 
     @objc open func dismissVC(animated flag: Bool, completion: (() -> Void)? = nil) {
-        if self.tmpWindow == nil {
-            self.viewController?.dismiss(animated: flag, completion: completion)
-        } else {
-            self.tmpWindow?.rootViewController?.dismiss(animated: flag, completion: completion)
-            self.tmpWindow = nil
-        }
+        self.viewController?.dismiss(animated: flag, completion: completion)
     }
 }

package/Capacitor/Capacitor/Plugins/CapacitorUrlRequest.swift

@@ -66,7 +66,7 @@ open class CapacitorUrlRequest: NSObject, URLSessionTaskDelegate {
 
         var data = Data()
         var boundary = UUID().uuidString
-        if contentType.contains("="), let contentBoundary = contentType.components(separatedBy: "=").last {
+        if contentType.contains("boundary="), let contentBoundary = extractBoundary(from: contentType) {
             boundary = contentBoundary
         } else {
             overrideContentType(boundary)
@@ -87,6 +87,27 @@ open class CapacitorUrlRequest: NSObject, URLSessionTaskDelegate {
         headers["Content-Type"] = contentType
     }
 
+    /**
+     Extracts the boundary value of the `content-type` header for multiplart/form-data requests, if provided
+     The boundary value might be surrounded by double quotes (") which will be stripped away.
+     */
+    private func extractBoundary(from contentType: String) -> String? {
+        if let boundaryRange = contentType.range(of: "boundary=") {
+            var boundary = contentType[boundaryRange.upperBound...]
+            if let endRange = boundary.range(of: ";") {
+                boundary = boundary[..<endRange.lowerBound]
+            }
+
+            if boundary.hasPrefix("\"") && boundary.hasSuffix("\"") {
+                return String(boundary.dropFirst().dropLast())
+            } else {
+                return String(boundary)
+            }
+        }
+
+        return nil
+    }
+
     public func getRequestDataAsString(_ data: JSValue) throws -> Data {
         guard let stringData = data as? String else {
             throw CapacitorUrlRequestError.serializationError("[ data ] argument could not be parsed as string")
@@ -110,7 +131,7 @@ open class CapacitorUrlRequest: NSObject, URLSessionTaskDelegate {
         }
         var data = Data()
         var boundary = UUID().uuidString
-        if contentType.contains("="), let contentBoundary = contentType.components(separatedBy: "=").last {
+        if contentType.contains("boundary="), let contentBoundary = extractBoundary(from: contentType) {
             boundary = contentBoundary
         } else {
             overrideContentType(boundary)

package/Capacitor/Capacitor/assets/native-bridge.js

@@ -505,6 +505,10 @@ var nativeBridge = (function (exports) {
                             if (typeof resource === 'string') {
                                 return await win.CapacitorWebFetch(createProxyUrl(resource, win), options);
                             }
+                            else if (resource instanceof URL) {
+                                const modifiedURL = new URL(createProxyUrl(resource.toString(), win));
+                                return await win.CapacitorWebFetch(modifiedURL, options);
+                            }
                             else if (resource instanceof Request) {
                                 const modifiedRequest = new Request(createProxyUrl(resource.url, win), resource);
                                 return await win.CapacitorWebFetch(modifiedRequest, options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-plus/ios",
-  "version": "8.0.7",
+  "version": "8.3.3",
   "description": "Capacitor+: Enhanced Capacitor with automated upstream sync - Cross-platform apps with JavaScript and the web",
   "homepage": "https://capgo.app/docs/plugins/capacitor-plus/",
   "author": "Capgo Team <support@capgo.app> (https://capgo.app)",
@@ -21,12 +21,12 @@
   ],
   "scripts": {
     "verify": "npm run xc:build:Capacitor && npm run xc:build:CapacitorCordova",
-    "xc:build:Capacitor": "cd Capacitor && xcodebuild clean test -workspace Capacitor.xcworkspace -scheme Capacitor -destination 'platform=iOS Simulator,name=iPhone 16,OS=26.0.1' && cd ..",
+    "xc:build:Capacitor": "cd Capacitor && xcodebuild clean test -workspace Capacitor.xcworkspace -scheme Capacitor -destination 'platform=iOS Simulator,name=iPhone 17,OS=latest' && cd ..",
     "xc:build:CapacitorCordova": "cd CapacitorCordova && xcodebuild && cd .."
   },
   "peerDependencies": {
-    "@capacitor-plus/core": "^8.0.0",
-    "@capacitor/core": "^8.0.0"
+    "@capacitor-plus/core": "^8.3.0",
+    "@capacitor/core": "^8.3.0"
   },
   "publishConfig": {
     "access": "public"