rogalikkkkkk
/
iosWebViewFix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1936 from michalsrutek/feature/swift-code-improvements 

Swift code improvements
This commit is contained in:
Lorenzo Pichilli 2023-12-23 14:10:33 +01:00 committed by GitHub
parent 93bc6ca1ed 7077320f95
commit bccd7535ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
79 changed files with 183 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
flutter_inappwebview_ios/ios/Classes/CredentialDatabase.swift
View File

@ -9,8 +9,9 @@ import Foundation
public class CredentialDatabase: ChannelDelegate {
static let METHOD_CHANNEL_NAME = "com.pichillilorenzo/flutter_inappwebview_credential_database"
var plugin: SwiftFlutterPlugin?
static var credentialStore = URLCredentialStorage.shared
static let credentialStore = URLCredentialStorage.shared
private var plugin: SwiftFlutterPlugin?
init(plugin: SwiftFlutterPlugin) {
super.init(channel: FlutterMethodChannel(name: CredentialDatabase.METHOD_CHANNEL_NAME, binaryMessenger: plugin.registrar!.messenger()))
@ -44,7 +45,7 @@ public class CredentialDatabase: ChannelDelegate {
let host = arguments!["host"] as! String
let urlProtocol = arguments!["protocol"] as? String
let urlPort = arguments!["port"] as? Int ?? 0
var realm = arguments!["realm"] as? String;
var realm = arguments!["realm"] as? String
if let r = realm, r.isEmpty {
realm = nil
}
@ -64,7 +65,7 @@ public class CredentialDatabase: ChannelDelegate {
let host = arguments!["host"] as! String
let urlProtocol = arguments!["protocol"] as? String
let urlPort = arguments!["port"] as? Int ?? 0
var realm = arguments!["realm"] as? String;
var realm = arguments!["realm"] as? String
if let r = realm, r.isEmpty {
realm = nil
}
@ -80,14 +81,14 @@ public class CredentialDatabase: ChannelDelegate {
let host = arguments!["host"] as! String
let urlProtocol = arguments!["protocol"] as? String
let urlPort = arguments!["port"] as? Int ?? 0
var realm = arguments!["realm"] as? String;
var realm = arguments!["realm"] as? String
if let r = realm, r.isEmpty {
realm = nil
}
let username = arguments!["username"] as! String
let password = arguments!["password"] as! String
var credential: URLCredential? = nil;
var credential: URLCredential? = nil
var protectionSpaceCredential: URLProtectionSpace? = nil
for (protectionSpace, credentials) in CredentialDatabase.credentialStore.allCredentials {
@ -116,12 +117,12 @@ public class CredentialDatabase: ChannelDelegate {
let host = arguments!["host"] as! String
let urlProtocol = arguments!["protocol"] as? String
let urlPort = arguments!["port"] as? Int ?? 0
var realm = arguments!["realm"] as? String;
var realm = arguments!["realm"] as? String
if let r = realm, r.isEmpty {
realm = nil
}
var credentialsToRemove: [URLCredential] = [];
var credentialsToRemove: [URLCredential] = []
var protectionSpaceCredential: URLProtectionSpace? = nil
for (protectionSpace, credentials) in CredentialDatabase.credentialStore.allCredentials {

2
flutter_inappwebview_ios/ios/Classes/FindInteraction/FindInteractionChannelDelegate.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class FindInteractionChannelDelegate : ChannelDelegate {
public class FindInteractionChannelDelegate: ChannelDelegate {
private weak var findInteractionController: FindInteractionController?
public init(findInteractionController: FindInteractionController, channel: FlutterMethodChannel) {

12
flutter_inappwebview_ios/ios/Classes/FindInteraction/FindInteractionController.swift
View File

@ -8,14 +8,14 @@
import Foundation
import Flutter
public class FindInteractionController : NSObject, Disposable {
static var METHOD_CHANNEL_NAME_PREFIX = "com.pichillilorenzo/flutter_inappwebview_find_interaction_";
var plugin: SwiftFlutterPlugin?
public class FindInteractionController: NSObject, Disposable {
static let METHOD_CHANNEL_NAME_PREFIX = "com.pichillilorenzo/flutter_inappwebview_find_interaction_"
var webView: InAppWebView?
var channelDelegate: FindInteractionChannelDelegate?
var settings: FindInteractionSettings?
var shouldCallOnRefresh = false
private var plugin: SwiftFlutterPlugin?
private var settings: FindInteractionSettings?
private var _searchText: String? = nil
var searchText: String? {

2
flutter_inappwebview_ios/ios/Classes/FindInteraction/FindInteractionSettings.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class FindInteractionSettings : ISettings<FindInteractionController> {
public class FindInteractionSettings: ISettings<FindInteractionController> {
override init(){
super.init()

5
flutter_inappwebview_ios/ios/Classes/HeadlessInAppWebView/HeadlessInAppWebView.swift
View File

@ -7,8 +7,9 @@
import Foundation
public class HeadlessInAppWebView : Disposable {
public class HeadlessInAppWebView: Disposable {
static let METHOD_CHANNEL_NAME_PREFIX = "com.pichillilorenzo/flutter_headless_inappwebview_"
var id: String
var channelDelegate: HeadlessWebViewChannelDelegate?
var flutterWebView: FlutterWebViewController?
@ -24,7 +25,7 @@ public class HeadlessInAppWebView : Disposable {
}
public func onWebViewCreated() {
channelDelegate?.onWebViewCreated();
channelDelegate?.onWebViewCreated()
}
public func prepare(params: NSDictionary) {

2
flutter_inappwebview_ios/ios/Classes/HeadlessInAppWebView/HeadlessWebViewChannelDelegate.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class HeadlessWebViewChannelDelegate : ChannelDelegate {
public class HeadlessWebViewChannelDelegate: ChannelDelegate {
private weak var headlessWebView: HeadlessInAppWebView?
public init(headlessWebView: HeadlessInAppWebView, channel: FlutterMethodChannel) {

2
flutter_inappwebview_ios/ios/Classes/InAppBrowser/InAppBrowserChannelDelegate.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class InAppBrowserChannelDelegate : ChannelDelegate {
public class InAppBrowserChannelDelegate: ChannelDelegate {
public override init(channel: FlutterMethodChannel) {
super.init(channel: channel)
}

2
flutter_inappwebview_ios/ios/Classes/InAppBrowser/InAppBrowserWebViewController.swift
View File

@ -11,7 +11,7 @@ import WebKit
import Foundation
public class InAppBrowserWebViewController: UIViewController, InAppBrowserDelegate, UIScrollViewDelegate, UISearchBarDelegate, Disposable {
static var METHOD_CHANNEL_NAME_PREFIX = "com.pichillilorenzo/flutter_inappbrowser_";
static let METHOD_CHANNEL_NAME_PREFIX = "com.pichillilorenzo/flutter_inappbrowser_"
var closeButton: UIBarButtonItem!
var reloadButton: UIBarButtonItem!

4
flutter_inappwebview_ios/ios/Classes/InAppWebView/ContextMenuSettings.swift
View File

@ -8,8 +8,8 @@
import Foundation
public class ContextMenuSettings: ISettings<NSObject> {
var hideDefaultSystemContextMenuItems = false;
var hideDefaultSystemContextMenuItems = false
override init(){
super.init()

4
flutter_inappwebview_ios/ios/Classes/InAppWebView/CustomSchemeHandler.swift
View File

@ -10,8 +10,8 @@ import Foundation
import WebKit
@available(iOS 11.0, *)
public class CustomSchemeHandler : NSObject, WKURLSchemeHandler {
var schemeHandlers: [Int:WKURLSchemeTask] = [:]
public class CustomSchemeHandler: NSObject, WKURLSchemeHandler {
var schemeHandlers: [Int: WKURLSchemeTask] = [:]
public func webView(_ webView: WKWebView, start urlSchemeTask: WKURLSchemeTask) {
schemeHandlers[urlSchemeTask.hash] = urlSchemeTask

73
flutter_inappwebview_ios/ios/Classes/InAppWebView/InAppWebView.swift
View File

@ -14,7 +14,7 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate,
WKDownloadDelegate,
PullToRefreshDelegate,
Disposable {
static var METHOD_CHANNEL_NAME_PREFIX = "com.pichillilorenzo/flutter_inappwebview_"
static let METHOD_CHANNEL_NAME_PREFIX = "com.pichillilorenzo/flutter_inappwebview_"
var id: Any? // viewId
var plugin: SwiftFlutterPlugin?
@ -26,14 +26,14 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate,
var settings: InAppWebViewSettings?
var pullToRefreshControl: PullToRefreshControl?
var findInteractionController: FindInteractionController?
var webMessageChannels: [String:WebMessageChannel] = [:]
var webMessageChannels: [String: WebMessageChannel] = [:]
var webMessageListeners: [WebMessageListener] = []
var currentOriginalUrl: URL?
var inFullscreen = false
var preventGestureDelay = false
static var sslCertificatesMap: [String: SslCertificate] = [:] // [URL host name : SslCertificate]
static var credentialsProposed: [URLCredential] = []
private static var sslCertificatesMap: [String: SslCertificate] = [:] // [URL host name : SslCertificate]
private static var credentialsProposed: [URLCredential] = []
var lastScrollX: CGFloat = 0
var lastScrollY: CGFloat = 0
@ -103,14 +103,14 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate,
set {
super.frame = newValue
self.scrollView.contentInset = UIEdgeInsets.zero;
self.scrollView.contentInset = .zero
if #available(iOS 11, *) {
// Above iOS 11, adjust contentInset to compensate the adjustedContentInset so the sum will
// always be 0.
if (scrollView.adjustedContentInset != UIEdgeInsets.zero) {
let insetToAdjust = self.scrollView.adjustedContentInset;
let insetToAdjust = self.scrollView.adjustedContentInset
scrollView.contentInset = UIEdgeInsets(top: -insetToAdjust.top, left: -insetToAdjust.left,
bottom: -insetToAdjust.bottom, right: -insetToAdjust.right);
bottom: -insetToAdjust.bottom, right: -insetToAdjust.right)
}
}
}
@ -2190,17 +2190,16 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate,
}
struct IdentityAndTrust {
var identityRef:SecIdentity
var trust:SecTrust
var certArray:AnyObject
var identityRef: SecIdentity
var trust: SecTrust
var certArray: AnyObject
}
func extractIdentity(PKCS12Data:NSData, password: String) -> IdentityAndTrust? {
var identityAndTrust:IdentityAndTrust?
var securityError:OSStatus = errSecSuccess
func extractIdentity(PKCS12Data: NSData, password: String) -> IdentityAndTrust? {
var identityAndTrust: IdentityAndTrust?
var securityError: OSStatus = errSecSuccess
var importResult: CFArray? = nil
var importResult: CFArray?
securityError = SecPKCS12Import(
PKCS12Data as NSData,
[kSecImportExportPassphrase as String: password] as NSDictionary,
@ -2208,27 +2207,27 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate,
)
if securityError == errSecSuccess {
let certItems:CFArray = importResult! as CFArray;
let certItemsArray:Array = certItems as Array
let dict:AnyObject? = certItemsArray.first;
if let certEntry:Dictionary = dict as? Dictionary<String, AnyObject> {
let certItems: CFArray = importResult! as CFArray
let certItemsArray: Array = certItems as Array
let dict: AnyObject? = certItemsArray.first
if let certEntry: Dictionary = dict as? Dictionary<String, AnyObject> {
// grab the identity
let identityPointer:AnyObject? = certEntry["identity"];
let secIdentityRef:SecIdentity = (identityPointer as! SecIdentity?)!;
let identityPointer: AnyObject? = certEntry["identity"]
let secIdentityRef:SecIdentity = (identityPointer as! SecIdentity?)!
// grab the trust
let trustPointer:AnyObject? = certEntry["trust"];
let trustRef:SecTrust = trustPointer as! SecTrust;
let trustPointer: AnyObject? = certEntry["trust"]
let trustRef:SecTrust = trustPointer as! SecTrust
// grab the cert
let chainPointer:AnyObject? = certEntry["chain"];
identityAndTrust = IdentityAndTrust(identityRef: secIdentityRef, trust: trustRef, certArray: chainPointer!);
let chainPointer: AnyObject? = certEntry["chain"]
identityAndTrust = IdentityAndTrust(identityRef: secIdentityRef, trust: trustRef, certArray: chainPointer!)
}
} else {
print("Security Error: " + securityError.description)
if #available(iOS 11.3, *) {
print(SecCopyErrorMessageString(securityError,nil) ?? "")
print(SecCopyErrorMessageString(securityError, nil) ?? "")
}
}
return identityAndTrust;
return identityAndTrust
}
func createAlertDialog(message: String?, responseMessage: String?, confirmButtonTitle: String?, completionHandler: @escaping () -> Void) {
@ -2239,7 +2238,7 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate,
alertController.addAction(UIAlertAction(title: okButton, style: UIAlertAction.Style.default) {
_ in completionHandler()}
);
)
guard let presentingViewController = inAppBrowserDelegate != nil ? inAppBrowserDelegate as? InAppBrowserWebViewController : window?.rootViewController else {
completionHandler()
@ -2463,16 +2462,16 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate,
let disableHorizontalScroll = settings?.disableHorizontalScroll ?? false
if startedByUser {
if disableVerticalScroll && disableHorizontalScroll {
scrollView.contentOffset = CGPoint(x: lastScrollX, y: lastScrollY);
scrollView.contentOffset = CGPoint(x: lastScrollX, y: lastScrollY)
}
else if disableVerticalScroll {
if scrollView.contentOffset.y >= 0 || scrollView.contentOffset.y < 0 {
scrollView.contentOffset = CGPoint(x: scrollView.contentOffset.x, y: lastScrollY);
scrollView.contentOffset = CGPoint(x: scrollView.contentOffset.x, y: lastScrollY)
}
}
else if disableHorizontalScroll {
if scrollView.contentOffset.x >= 0 || scrollView.contentOffset.x < 0 {
scrollView.contentOffset = CGPoint(x: lastScrollX, y: scrollView.contentOffset.y);
scrollView.contentOffset = CGPoint(x: lastScrollX, y: scrollView.contentOffset.y)
}
}
}
@ -2789,24 +2788,24 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate,
switch (message.name) {
case "consoleLog":
messageLevel = 1
break;
break
case "consoleDebug":
// on Android, console.debug is TIP
messageLevel = 0
break;
break
case "consoleError":
messageLevel = 3
break;
break
case "consoleInfo":
// on Android, console.info is LOG
messageLevel = 1
break;
break
case "consoleWarn":
messageLevel = 2
break;
break
default:
messageLevel = 1
break;
break
}
let consoleMessage = body["message"] as? String ?? ""

2
flutter_inappwebview_ios/ios/Classes/InAppWebView/WebMessage/WebMessageChannel.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class WebMessageChannel : FlutterMethodCallDelegate {
public class WebMessageChannel: FlutterMethodCallDelegate {
static var METHOD_CHANNEL_NAME_PREFIX = "com.pichillilorenzo/flutter_inappwebview_web_message_channel_"
var id: String
var plugin: SwiftFlutterPlugin?

2
flutter_inappwebview_ios/ios/Classes/InAppWebView/WebMessage/WebMessageChannelChannelDelegate.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class WebMessageChannelChannelDelegate : ChannelDelegate {
public class WebMessageChannelChannelDelegate: ChannelDelegate {
private weak var webMessageChannel: WebMessageChannel?
public init(webMessageChannel: WebMessageChannel, channel: FlutterMethodChannel) {

2
flutter_inappwebview_ios/ios/Classes/InAppWebView/WebMessage/WebMessageListener.swift
View File

@ -8,7 +8,7 @@
import Foundation
import WebKit
public class WebMessageListener : FlutterMethodCallDelegate {
public class WebMessageListener: FlutterMethodCallDelegate {
static var METHOD_CHANNEL_NAME_PREFIX = "com.pichillilorenzo/flutter_inappwebview_web_message_listener_"
var id: String
var jsObjectName: String

2
flutter_inappwebview_ios/ios/Classes/InAppWebView/WebMessage/WebMessageListenerChannelDelegate.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class WebMessageListenerChannelDelegate : ChannelDelegate {
public class WebMessageListenerChannelDelegate: ChannelDelegate {
private weak var webMessageListener: WebMessageListener?
public init(webMessageListener: WebMessageListener, channel: FlutterMethodChannel) {

30
flutter_inappwebview_ios/ios/Classes/InAppWebView/WebViewChannelDelegate.swift
View File

@ -8,7 +8,7 @@
import Foundation
import WebKit
public class WebViewChannelDelegate : ChannelDelegate {
public class WebViewChannelDelegate: ChannelDelegate {
private weak var webView: InAppWebView?
public init(webView: InAppWebView, channel: FlutterMethodChannel) {
@ -743,7 +743,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
channel?.invokeMethod("onExitFullscreen", arguments: arguments)
}
public class JsAlertCallback : BaseCallbackResult<JsAlertResponse> {
public class JsAlertCallback: BaseCallbackResult<JsAlertResponse> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -769,7 +769,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
channel?.invokeMethod("onJsAlert", arguments: arguments, callback: callback)
}
public class JsConfirmCallback : BaseCallbackResult<JsConfirmResponse> {
public class JsConfirmCallback: BaseCallbackResult<JsConfirmResponse> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -795,7 +795,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
channel?.invokeMethod("onJsConfirm", arguments: arguments, callback: callback)
}
public class JsPromptCallback : BaseCallbackResult<JsPromptResponse> {
public class JsPromptCallback: BaseCallbackResult<JsPromptResponse> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -822,7 +822,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
channel?.invokeMethod("onJsPrompt", arguments: arguments, callback: callback)
}
public class CreateWindowCallback : BaseCallbackResult<Bool> {
public class CreateWindowCallback: BaseCallbackResult<Bool> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -866,7 +866,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
channel?.invokeMethod("onTitleChanged", arguments: arguments)
}
public class PermissionRequestCallback : BaseCallbackResult<PermissionResponse> {
public class PermissionRequestCallback: BaseCallbackResult<PermissionResponse> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -887,7 +887,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
channel?.invokeMethod("onPermissionRequest", arguments: request.toMap(), callback: callback)
}
public class ShouldOverrideUrlLoadingCallback : BaseCallbackResult<WKNavigationActionPolicy> {
public class ShouldOverrideUrlLoadingCallback: BaseCallbackResult<WKNavigationActionPolicy> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -945,7 +945,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
channel?.invokeMethod("onReceivedHttpError", arguments: arguments)
}
public class ReceivedHttpAuthRequestCallback : BaseCallbackResult<HttpAuthResponse> {
public class ReceivedHttpAuthRequestCallback: BaseCallbackResult<HttpAuthResponse> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -977,7 +977,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
}
}
public class ReceivedServerTrustAuthRequestCallback : BaseCallbackResult<ServerTrustAuthResponse> {
public class ReceivedServerTrustAuthRequestCallback: BaseCallbackResult<ServerTrustAuthResponse> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -1009,7 +1009,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
}
}
public class ReceivedClientCertRequestCallback : BaseCallbackResult<ClientCertResponse> {
public class ReceivedClientCertRequestCallback: BaseCallbackResult<ClientCertResponse> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -1056,7 +1056,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
channel?.invokeMethod("onPageCommitVisible", arguments: arguments)
}
public class LoadResourceWithCustomSchemeCallback : BaseCallbackResult<CustomSchemeResponse> {
public class LoadResourceWithCustomSchemeCallback: BaseCallbackResult<CustomSchemeResponse> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -1074,7 +1074,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
channel?.invokeMethod("onLoadResourceWithCustomScheme", arguments: arguments, callback: callback)
}
public class CallJsHandlerCallback : BaseCallbackResult<Any> {
public class CallJsHandlerCallback: BaseCallbackResult<Any> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -1095,7 +1095,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
channel?.invokeMethod("onCallJsHandler", arguments: arguments, callback: callback)
}
public class NavigationResponseCallback : BaseCallbackResult<WKNavigationResponsePolicy> {
public class NavigationResponseCallback: BaseCallbackResult<WKNavigationResponsePolicy> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -1119,7 +1119,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
channel?.invokeMethod("onNavigationResponse", arguments: navigationResponse.toMap(), callback: callback)
}
public class ShouldAllowDeprecatedTLSCallback : BaseCallbackResult<Bool> {
public class ShouldAllowDeprecatedTLSCallback: BaseCallbackResult<Bool> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -1182,7 +1182,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
channel?.invokeMethod("onMicrophoneCaptureStateChanged", arguments: arguments)
}
public class PrintRequestCallback : BaseCallbackResult<Bool> {
public class PrintRequestCallback: BaseCallbackResult<Bool> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in

9
flutter_inappwebview_ios/ios/Classes/MyCookieManager.swift
View File

@ -11,8 +11,9 @@ import WebKit
@available(iOS 11.0, *)
public class MyCookieManager: ChannelDelegate {
static let METHOD_CHANNEL_NAME = "com.pichillilorenzo/flutter_inappwebview_cookiemanager"
var plugin: SwiftFlutterPlugin?
static var httpCookieStore = WKWebsiteDataStore.default().httpCookieStore
static let httpCookieStore = WKWebsiteDataStore.default().httpCookieStore
private var plugin: SwiftFlutterPlugin?
init(plugin: SwiftFlutterPlugin) {
super.init(channel: FlutterMethodChannel(name: MyCookieManager.METHOD_CHANNEL_NAME, binaryMessenger: plugin.registrar!.messenger()))
@ -64,13 +65,13 @@ public class MyCookieManager: ChannelDelegate {
let path = arguments!["path"] as! String
let domain = arguments!["domain"] as? String
MyCookieManager.deleteCookie(url: url, name: name, path: path, domain: domain, result: result)
break;
break
case "deleteCookies":
let url = arguments!["url"] as! String
let path = arguments!["path"] as! String
let domain = arguments!["domain"] as? String
MyCookieManager.deleteCookies(url: url, path: path, domain: domain, result: result)
break;
break
case "deleteAllCookies":
MyCookieManager.deleteAllCookies(result: result)
break

5
flutter_inappwebview_ios/ios/Classes/MyWebStorageManager.swift
View File

@ -11,8 +11,9 @@ import WebKit
@available(iOS 9.0, *)
public class MyWebStorageManager: ChannelDelegate {
static let METHOD_CHANNEL_NAME = "com.pichillilorenzo/flutter_inappwebview_webstoragemanager"
var plugin: SwiftFlutterPlugin?
static var websiteDataStore = WKWebsiteDataStore.default()
static let websiteDataStore = WKWebsiteDataStore.default()
private var plugin: SwiftFlutterPlugin?
init(plugin: SwiftFlutterPlugin) {
super.init(channel: FlutterMethodChannel(name: MyWebStorageManager.METHOD_CHANNEL_NAME, binaryMessenger: plugin.registrar!.messenger()))

2
flutter_inappwebview_ios/ios/Classes/PrintJob/CustomUIPrintPageRenderer.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class CustomUIPrintPageRenderer : UIPrintPageRenderer {
public class CustomUIPrintPageRenderer: UIPrintPageRenderer {
private var _numberOfPages: Int?
private var forceRenderingQuality: Int?

2
flutter_inappwebview_ios/ios/Classes/PrintJob/PrintAttributes.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class PrintAttributes : NSObject {
public class PrintAttributes: NSObject {
var orientation: UIPrintInfo.Orientation?
var duplex: UIPrintInfo.Duplex?
var outputType: UIPrintInfo.OutputType?

2
flutter_inappwebview_ios/ios/Classes/PrintJob/PrintJobChannelDelegate.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class PrintJobChannelDelegate : ChannelDelegate {
public class PrintJobChannelDelegate: ChannelDelegate {
private weak var printJobController: PrintJobController?
public init(printJobController: PrintJobController, channel: FlutterMethodChannel) {

2
flutter_inappwebview_ios/ios/Classes/PrintJob/PrintJobController.swift
View File

@ -15,7 +15,7 @@ public enum PrintJobState: Int {
case canceled = 7
}
public class PrintJobController : NSObject, Disposable, UIPrintInteractionControllerDelegate {
public class PrintJobController: NSObject, Disposable, UIPrintInteractionControllerDelegate {
static let METHOD_CHANNEL_NAME_PREFIX = "com.pichillilorenzo/flutter_inappwebview_printjobcontroller_"
var id: String
var plugin: SwiftFlutterPlugin?

2
flutter_inappwebview_ios/ios/Classes/PrintJob/PrintJobInfo.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class PrintJobInfo : NSObject {
public class PrintJobInfo: NSObject {
var state: PrintJobState
var attributes: PrintAttributes
var creationTime: Int64

2
flutter_inappwebview_ios/ios/Classes/PullToRefresh/PullToRefreshChannelDelegate.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class PullToRefreshChannelDelegate : ChannelDelegate {
public class PullToRefreshChannelDelegate: ChannelDelegate {
private weak var pullToRefreshControl: PullToRefreshControl?
public init(pullToRefreshControl: PullToRefreshControl, channel: FlutterMethodChannel) {

5
flutter_inappwebview_ios/ios/Classes/PullToRefresh/PullToRefreshControl.swift
View File

@ -8,8 +8,9 @@
import Foundation
import Flutter
public class PullToRefreshControl : UIRefreshControl, Disposable {
static var METHOD_CHANNEL_NAME_PREFIX = "com.pichillilorenzo/flutter_inappwebview_pull_to_refresh_";
public class PullToRefreshControl: UIRefreshControl, Disposable {
static let METHOD_CHANNEL_NAME_PREFIX = "com.pichillilorenzo/flutter_inappwebview_pull_to_refresh_"
var plugin: SwiftFlutterPlugin?
var channelDelegate: PullToRefreshChannelDelegate?
var settings: PullToRefreshSettings?

2
flutter_inappwebview_ios/ios/Classes/PullToRefresh/PullToRefreshSettings.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class PullToRefreshSettings : ISettings<PullToRefreshControl> {
public class PullToRefreshSettings: ISettings<PullToRefreshControl> {
var enabled = true
var color: String?

2
flutter_inappwebview_ios/ios/Classes/SafariViewController/CustomUIActivity.swift
View File

@ -7,7 +7,7 @@
import Foundation
class CustomUIActivity : UIActivity {
class CustomUIActivity: UIActivity {
var plugin: SwiftFlutterPlugin
var viewId: String
var id: Int64

2
flutter_inappwebview_ios/ios/Classes/SafariViewController/SafariViewControllerChannelDelegate.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class SafariViewControllerChannelDelegate : ChannelDelegate {
public class SafariViewControllerChannelDelegate: ChannelDelegate {
private weak var safariViewController: SafariViewController?
public init(safariViewController: SafariViewController, channel: FlutterMethodChannel) {

2
flutter_inappwebview_ios/ios/Classes/Types/BaseCallbackResult.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class BaseCallbackResult<T> : CallbackResult<T> {
public class BaseCallbackResult<T>: CallbackResult<T> {
override init() {
super.init()

2
flutter_inappwebview_ios/ios/Classes/Types/CallbackResult.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class CallbackResult<T> : MethodChannelResult {
public class CallbackResult<T>: MethodChannelResult {
public var notImplemented: () -> Void = {}
public var success: (Any?) -> Void = {_ in }
public var error: (String, String?, Any?) -> Void = {_,_,_ in }

2
flutter_inappwebview_ios/ios/Classes/Types/ChannelDelegate.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class ChannelDelegate : FlutterMethodCallDelegate, Disposable {
public class ChannelDelegate: FlutterMethodCallDelegate, Disposable {
var channel: FlutterMethodChannel?
public init(channel: FlutterMethodChannel) {

2
flutter_inappwebview_ios/ios/Classes/Types/ClientCertResponse.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class ClientCertResponse : NSObject {
public class ClientCertResponse: NSObject {
var certificatePath: String
var certificatePassword: String?
var keyStoreType: String?

2
flutter_inappwebview_ios/ios/Classes/Types/CreateWindowAction.swift
View File

@ -8,7 +8,7 @@
import Foundation
import WebKit
public class CreateWindowAction : NSObject {
public class CreateWindowAction: NSObject {
var navigationAction: WKNavigationAction
var windowId: Int64
var windowFeatures: WKWindowFeatures

2
flutter_inappwebview_ios/ios/Classes/Types/CustomSchemeResponse.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class CustomSchemeResponse : NSObject {
public class CustomSchemeResponse: NSObject {
var data: Data
var contentType: String
var contentEncoding: String

2
flutter_inappwebview_ios/ios/Classes/Types/HttpAuthResponse.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class HttpAuthResponse : NSObject {
public class HttpAuthResponse: NSObject {
var username: String
var password: String
var permanentPersistence: Bool

2
flutter_inappwebview_ios/ios/Classes/Types/PermissionResponse.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class PermissionResponse : NSObject {
public class PermissionResponse: NSObject {
var resources: [Any]
var action: Int?

2
flutter_inappwebview_ios/ios/Classes/Types/PluginScript.swift
View File

@ -8,7 +8,7 @@
import Foundation
import WebKit
public class PluginScript : UserScript {
public class PluginScript: UserScript {
var requiredInAllContentWorlds = false
var messageHandlerNames: [String] = []

2
flutter_inappwebview_ios/ios/Classes/Types/ServerTrustAuthResponse.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class ServerTrustAuthResponse : NSObject {
public class ServerTrustAuthResponse: NSObject {
var action: Int?
public init(action: Int? = nil) {

2
flutter_inappwebview_ios/ios/Classes/Types/Size2D.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class Size2D : NSObject {
public class Size2D: NSObject {
var width: Double
var height: Double

2
flutter_inappwebview_ios/ios/Classes/Types/UserScript.swift
View File

@ -8,7 +8,7 @@
import Foundation
import WebKit
public class UserScript : WKUserScript {
public class UserScript: WKUserScript {
var groupName: String?
private var contentWorldWrapper: Any?

2
flutter_inappwebview_ios/ios/Classes/Types/WebMessage.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class WebMessage : NSObject, Disposable {
public class WebMessage: NSObject, Disposable {
var data: Any?
var type: WebMessageType
var ports: [WebMessagePort]?

2
flutter_inappwebview_ios/ios/Classes/Types/WebMessagePort.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class WebMessagePort : NSObject {
public class WebMessagePort: NSObject {
var name: String
var index: Int64
var webMessageChannelId: String

2
flutter_inappwebview_ios/ios/Classes/WebAuthenticationSession/WebAuthenticationSession.swift
View File

@ -9,7 +9,7 @@ import Foundation
import AuthenticationServices
import SafariServices
public class WebAuthenticationSession : NSObject, ASWebAuthenticationPresentationContextProviding, Disposable {
public class WebAuthenticationSession: NSObject, ASWebAuthenticationPresentationContextProviding, Disposable {
static let METHOD_CHANNEL_NAME_PREFIX = "com.pichillilorenzo/flutter_webauthenticationsession_"
var id: String
var plugin: SwiftFlutterPlugin?

2
flutter_inappwebview_ios/ios/Classes/WebAuthenticationSession/WebAuthenticationSessionChannelDelegate.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class WebAuthenticationSessionChannelDelegate : ChannelDelegate {
public class WebAuthenticationSessionChannelDelegate: ChannelDelegate {
private weak var webAuthenticationSession: WebAuthenticationSession?
public init(webAuthenticationSession: WebAuthenticationSession, channel: FlutterMethodChannel) {

2
flutter_inappwebview_macos/macos/Classes/FindInteraction/FindInteractionChannelDelegate.swift
View File

@ -8,7 +8,7 @@
import Foundation
import FlutterMacOS
public class FindInteractionChannelDelegate : ChannelDelegate {
public class FindInteractionChannelDelegate: ChannelDelegate {
private weak var findInteractionController: FindInteractionController?
public init(findInteractionController: FindInteractionController, channel: FlutterMethodChannel) {

2
flutter_inappwebview_macos/macos/Classes/FindInteraction/FindInteractionController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import FlutterMacOS
public class FindInteractionController : NSObject, Disposable {
public class FindInteractionController: NSObject, Disposable {
static var METHOD_CHANNEL_NAME_PREFIX = "com.pichillilorenzo/flutter_inappwebview_find_interaction_";
var plugin: InAppWebViewFlutterPlugin?

2
flutter_inappwebview_macos/macos/Classes/FindInteraction/FindInteractionSettings.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class FindInteractionSettings : ISettings<FindInteractionController> {
public class FindInteractionSettings: ISettings<FindInteractionController> {
override init(){
super.init()

2
flutter_inappwebview_macos/macos/Classes/HeadlessInAppWebView/HeadlessInAppWebView.swift
View File

@ -8,7 +8,7 @@
import Foundation
import FlutterMacOS
public class HeadlessInAppWebView : Disposable {
public class HeadlessInAppWebView: Disposable {
static let METHOD_CHANNEL_NAME_PREFIX = "com.pichillilorenzo/flutter_headless_inappwebview_"
var id: String
var channelDelegate: HeadlessWebViewChannelDelegate?

2
flutter_inappwebview_macos/macos/Classes/HeadlessInAppWebView/HeadlessWebViewChannelDelegate.swift
View File

@ -8,7 +8,7 @@
import Foundation
import FlutterMacOS
public class HeadlessWebViewChannelDelegate : ChannelDelegate {
public class HeadlessWebViewChannelDelegate: ChannelDelegate {
private weak var headlessWebView: HeadlessInAppWebView?
public init(headlessWebView: HeadlessInAppWebView, channel: FlutterMethodChannel) {

2
flutter_inappwebview_macos/macos/Classes/InAppBrowser/InAppBrowserChannelDelegate.swift
View File

@ -8,7 +8,7 @@
import Foundation
import FlutterMacOS
public class InAppBrowserChannelDelegate : ChannelDelegate {
public class InAppBrowserChannelDelegate: ChannelDelegate {
public override init(channel: FlutterMethodChannel) {
super.init(channel: channel)
}

2
flutter_inappwebview_macos/macos/Classes/InAppBrowser/InAppBrowserWindow.swift
View File

@ -15,7 +15,7 @@ struct ToolbarIdentifiers {
static let menuButton = NSToolbarItem.Identifier(rawValue: "MenuButton")
}
public class InAppBrowserWindow : NSWindow, NSWindowDelegate, NSToolbarDelegate, NSSearchFieldDelegate {
public class InAppBrowserWindow: NSWindow, NSWindowDelegate, NSToolbarDelegate, NSSearchFieldDelegate {
var searchItem: NSToolbarItem?
var backItem: NSToolbarItem?
var forwardItem: NSToolbarItem?

4
flutter_inappwebview_macos/macos/Classes/InAppWebView/CustomSchemeHandler.swift
View File

@ -10,8 +10,8 @@ import Foundation
import WebKit
@available(macOS 10.13, *)
public class CustomSchemeHandler : NSObject, WKURLSchemeHandler {
var schemeHandlers: [Int:WKURLSchemeTask] = [:]
public class CustomSchemeHandler: NSObject, WKURLSchemeHandler {
var schemeHandlers: [Int: WKURLSchemeTask] = [:]
public func webView(_ webView: WKWebView, start urlSchemeTask: WKURLSchemeTask) {
schemeHandlers[urlSchemeTask.hash] = urlSchemeTask

33
flutter_inappwebview_macos/macos/Classes/InAppWebView/InAppWebView.swift
View File

@ -1571,15 +1571,14 @@ public class InAppWebView: WKWebView, WKUIDelegate,
}
struct IdentityAndTrust {
var identityRef:SecIdentity
var trust:SecTrust
var certArray:AnyObject
var identityRef: SecIdentity
var trust: SecTrust
var certArray: AnyObject
}
func extractIdentity(PKCS12Data:NSData, password: String) -> IdentityAndTrust? {
var identityAndTrust:IdentityAndTrust?
var securityError:OSStatus = errSecSuccess
func extractIdentity(PKCS12Data: NSData, password: String) -> IdentityAndTrust? {
var identityAndTrust: IdentityAndTrust?
var securityError: OSStatus = errSecSuccess
var importResult: CFArray? = nil
securityError = SecPKCS12Import(
@ -1589,19 +1588,19 @@ public class InAppWebView: WKWebView, WKUIDelegate,
)
if securityError == errSecSuccess {
let certItems:CFArray = importResult! as CFArray;
let certItemsArray:Array = certItems as Array
let dict:AnyObject? = certItemsArray.first;
if let certEntry:Dictionary = dict as? Dictionary<String, AnyObject> {
let certItems: CFArray = importResult! as CFArray;
let certItemsArray: Array = certItems as Array
let dict: AnyObject? = certItemsArray.first;
if let certEntry: Dictionary = dict as? Dictionary<String, AnyObject> {
// grab the identity
let identityPointer:AnyObject? = certEntry["identity"];
let secIdentityRef:SecIdentity = (identityPointer as! SecIdentity?)!;
let identityPointer: AnyObject? = certEntry["identity"]
let secIdentityRef:SecIdentity = (identityPointer as! SecIdentity?)!
// grab the trust
let trustPointer:AnyObject? = certEntry["trust"];
let trustRef:SecTrust = trustPointer as! SecTrust;
let trustPointer: AnyObject? = certEntry["trust"]
let trustRef:SecTrust = trustPointer as! SecTrust
// grab the cert
let chainPointer:AnyObject? = certEntry["chain"];
identityAndTrust = IdentityAndTrust(identityRef: secIdentityRef, trust: trustRef, certArray: chainPointer!);
let chainPointer: AnyObject? = certEntry["chain"]
identityAndTrust = IdentityAndTrust(identityRef: secIdentityRef, trust: trustRef, certArray: chainPointer!)
}
} else {
print("Security Error: " + securityError.description)

2
flutter_inappwebview_macos/macos/Classes/InAppWebView/WebMessage/WebMessageChannel.swift
View File

@ -8,7 +8,7 @@
import Foundation
import FlutterMacOS
public class WebMessageChannel : FlutterMethodCallDelegate {
public class WebMessageChannel: FlutterMethodCallDelegate {
static var METHOD_CHANNEL_NAME_PREFIX = "com.pichillilorenzo/flutter_inappwebview_web_message_channel_"
var id: String
var plugin: InAppWebViewFlutterPlugin?

2
flutter_inappwebview_macos/macos/Classes/InAppWebView/WebMessage/WebMessageChannelChannelDelegate.swift
View File

@ -8,7 +8,7 @@
import Foundation
import FlutterMacOS
public class WebMessageChannelChannelDelegate : ChannelDelegate {
public class WebMessageChannelChannelDelegate: ChannelDelegate {
private weak var webMessageChannel: WebMessageChannel?
public init(webMessageChannel: WebMessageChannel, channel: FlutterMethodChannel) {

2
flutter_inappwebview_macos/macos/Classes/InAppWebView/WebMessage/WebMessageListener.swift
View File

@ -9,7 +9,7 @@ import Foundation
import WebKit
import FlutterMacOS
public class WebMessageListener : FlutterMethodCallDelegate {
public class WebMessageListener: FlutterMethodCallDelegate {
static var METHOD_CHANNEL_NAME_PREFIX = "com.pichillilorenzo/flutter_inappwebview_web_message_listener_"
var id: String
var jsObjectName: String

2
flutter_inappwebview_macos/macos/Classes/InAppWebView/WebMessage/WebMessageListenerChannelDelegate.swift
View File

@ -8,7 +8,7 @@
import Foundation
import FlutterMacOS
public class WebMessageListenerChannelDelegate : ChannelDelegate {
public class WebMessageListenerChannelDelegate: ChannelDelegate {
private weak var webMessageListener: WebMessageListener?
public init(webMessageListener: WebMessageListener, channel: FlutterMethodChannel) {

30
flutter_inappwebview_macos/macos/Classes/InAppWebView/WebViewChannelDelegate.swift
View File

@ -9,7 +9,7 @@ import Foundation
import WebKit
import FlutterMacOS
public class WebViewChannelDelegate : ChannelDelegate {
public class WebViewChannelDelegate: ChannelDelegate {
private weak var webView: InAppWebView?
public init(webView: InAppWebView, channel: FlutterMethodChannel) {
@ -718,7 +718,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
channel?.invokeMethod("onExitFullscreen", arguments: arguments)
}
public class JsAlertCallback : BaseCallbackResult<JsAlertResponse> {
public class JsAlertCallback: BaseCallbackResult<JsAlertResponse> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -740,7 +740,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
channel?.invokeMethod("onJsAlert", arguments: arguments, callback: callback)
}
public class JsConfirmCallback : BaseCallbackResult<JsConfirmResponse> {
public class JsConfirmCallback: BaseCallbackResult<JsConfirmResponse> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -762,7 +762,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
channel?.invokeMethod("onJsConfirm", arguments: arguments, callback: callback)
}
public class JsPromptCallback : BaseCallbackResult<JsPromptResponse> {
public class JsPromptCallback: BaseCallbackResult<JsPromptResponse> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -785,7 +785,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
channel?.invokeMethod("onJsPrompt", arguments: arguments, callback: callback)
}
public class CreateWindowCallback : BaseCallbackResult<Bool> {
public class CreateWindowCallback: BaseCallbackResult<Bool> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -829,7 +829,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
channel?.invokeMethod("onTitleChanged", arguments: arguments)
}
public class PermissionRequestCallback : BaseCallbackResult<PermissionResponse> {
public class PermissionRequestCallback: BaseCallbackResult<PermissionResponse> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -850,7 +850,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
channel?.invokeMethod("onPermissionRequest", arguments: request.toMap(), callback: callback)
}
public class ShouldOverrideUrlLoadingCallback : BaseCallbackResult<WKNavigationActionPolicy> {
public class ShouldOverrideUrlLoadingCallback: BaseCallbackResult<WKNavigationActionPolicy> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -908,7 +908,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
channel?.invokeMethod("onReceivedHttpError", arguments: arguments)
}
public class ReceivedHttpAuthRequestCallback : BaseCallbackResult<HttpAuthResponse> {
public class ReceivedHttpAuthRequestCallback: BaseCallbackResult<HttpAuthResponse> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -940,7 +940,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
}
}
public class ReceivedServerTrustAuthRequestCallback : BaseCallbackResult<ServerTrustAuthResponse> {
public class ReceivedServerTrustAuthRequestCallback: BaseCallbackResult<ServerTrustAuthResponse> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -972,7 +972,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
}
}
public class ReceivedClientCertRequestCallback : BaseCallbackResult<ClientCertResponse> {
public class ReceivedClientCertRequestCallback: BaseCallbackResult<ClientCertResponse> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -1019,7 +1019,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
channel?.invokeMethod("onPageCommitVisible", arguments: arguments)
}
public class LoadResourceWithCustomSchemeCallback : BaseCallbackResult<CustomSchemeResponse> {
public class LoadResourceWithCustomSchemeCallback: BaseCallbackResult<CustomSchemeResponse> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -1037,7 +1037,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
channel?.invokeMethod("onLoadResourceWithCustomScheme", arguments: arguments, callback: callback)
}
public class CallJsHandlerCallback : BaseCallbackResult<Any> {
public class CallJsHandlerCallback: BaseCallbackResult<Any> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -1058,7 +1058,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
channel?.invokeMethod("onCallJsHandler", arguments: arguments, callback: callback)
}
public class NavigationResponseCallback : BaseCallbackResult<WKNavigationResponsePolicy> {
public class NavigationResponseCallback: BaseCallbackResult<WKNavigationResponsePolicy> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -1082,7 +1082,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
channel?.invokeMethod("onNavigationResponse", arguments: navigationResponse.toMap(), callback: callback)
}
public class ShouldAllowDeprecatedTLSCallback : BaseCallbackResult<Bool> {
public class ShouldAllowDeprecatedTLSCallback: BaseCallbackResult<Bool> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in
@ -1145,7 +1145,7 @@ public class WebViewChannelDelegate : ChannelDelegate {
channel?.invokeMethod("onMicrophoneCaptureStateChanged", arguments: arguments)
}
public class PrintRequestCallback : BaseCallbackResult<Bool> {
public class PrintRequestCallback: BaseCallbackResult<Bool> {
override init() {
super.init()
self.decodeResult = { (obj: Any?) in

2
flutter_inappwebview_macos/macos/Classes/PrintJob/CustomUIPrintPageRenderer.swift
View File

@ -7,7 +7,7 @@
import Foundation
//
//public class CustomUIPrintPageRenderer : UIPrintPageRenderer {
//public class CustomUIPrintPageRenderer: UIPrintPageRenderer {
// private var _numberOfPages: Int?
// private var forceRenderingQuality: Int?
//

2
flutter_inappwebview_macos/macos/Classes/PrintJob/PrintAttributes.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class PrintAttributes : NSObject {
public class PrintAttributes: NSObject {
var orientation: NSPrintInfo.PaperOrientation?
var margins: NSEdgeInsets?
var paperRect: CGRect?

2
flutter_inappwebview_macos/macos/Classes/PrintJob/PrintJobChannelDelegate.swift
View File

@ -8,7 +8,7 @@
import Foundation
import FlutterMacOS
public class PrintJobChannelDelegate : ChannelDelegate {
public class PrintJobChannelDelegate: ChannelDelegate {
private weak var printJobController: PrintJobController?
public init(printJobController: PrintJobController, channel: FlutterMethodChannel) {

2
flutter_inappwebview_macos/macos/Classes/PrintJob/PrintJobController.swift
View File

@ -15,7 +15,7 @@ public enum PrintJobState: Int {
case canceled = 7
}
public class PrintJobController : NSObject, Disposable {
public class PrintJobController: NSObject, Disposable {
static let METHOD_CHANNEL_NAME_PREFIX = "com.pichillilorenzo/flutter_inappwebview_printjobcontroller_"
var id: String
var plugin: InAppWebViewFlutterPlugin?

2
flutter_inappwebview_macos/macos/Classes/PrintJob/PrintJobInfo.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class PrintJobInfo : NSObject {
public class PrintJobInfo: NSObject {
var state: PrintJobState
var attributes: PrintAttributes
var creationTime: Int64

2
flutter_inappwebview_macos/macos/Classes/Types/BaseCallbackResult.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class BaseCallbackResult<T> : CallbackResult<T> {
public class BaseCallbackResult<T>: CallbackResult<T> {
override init() {
super.init()

2
flutter_inappwebview_macos/macos/Classes/Types/CallbackResult.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class CallbackResult<T> : MethodChannelResult {
public class CallbackResult<T>: MethodChannelResult {
public var notImplemented: () -> Void = {}
public var success: (Any?) -> Void = {_ in }
public var error: (String, String?, Any?) -> Void = {_,_,_ in }

2
flutter_inappwebview_macos/macos/Classes/Types/ChannelDelegate.swift
View File

@ -8,7 +8,7 @@
import Foundation
import FlutterMacOS
public class ChannelDelegate : FlutterMethodCallDelegate, Disposable {
public class ChannelDelegate: FlutterMethodCallDelegate, Disposable {
var channel: FlutterMethodChannel?
public init(channel: FlutterMethodChannel) {

2
flutter_inappwebview_macos/macos/Classes/Types/ClientCertResponse.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class ClientCertResponse : NSObject {
public class ClientCertResponse: NSObject {
var certificatePath: String
var certificatePassword: String?
var keyStoreType: String?

2
flutter_inappwebview_macos/macos/Classes/Types/CreateWindowAction.swift
View File

@ -8,7 +8,7 @@
import Foundation
import WebKit
public class CreateWindowAction : NSObject {
public class CreateWindowAction: NSObject {
var navigationAction: WKNavigationAction
var windowId: Int64
var windowFeatures: WKWindowFeatures

2
flutter_inappwebview_macos/macos/Classes/Types/CustomSchemeResponse.swift
View File

@ -8,7 +8,7 @@
import Foundation
import FlutterMacOS
public class CustomSchemeResponse : NSObject {
public class CustomSchemeResponse: NSObject {
var data: Data
var contentType: String
var contentEncoding: String

2
flutter_inappwebview_macos/macos/Classes/Types/HttpAuthResponse.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class HttpAuthResponse : NSObject {
public class HttpAuthResponse: NSObject {
var username: String
var password: String
var permanentPersistence: Bool

2
flutter_inappwebview_macos/macos/Classes/Types/PermissionResponse.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class PermissionResponse : NSObject {
public class PermissionResponse: NSObject {
var resources: [Any]
var action: Int?

2
flutter_inappwebview_macos/macos/Classes/Types/PluginScript.swift
View File

@ -8,7 +8,7 @@
import Foundation
import WebKit
public class PluginScript : UserScript {
public class PluginScript: UserScript {
var requiredInAllContentWorlds = false
var messageHandlerNames: [String] = []

2
flutter_inappwebview_macos/macos/Classes/Types/ServerTrustAuthResponse.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class ServerTrustAuthResponse : NSObject {
public class ServerTrustAuthResponse: NSObject {
var action: Int?
public init(action: Int? = nil) {

2
flutter_inappwebview_macos/macos/Classes/Types/Size2D.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class Size2D : NSObject {
public class Size2D: NSObject {
var width: Double
var height: Double

2
flutter_inappwebview_macos/macos/Classes/Types/UserScript.swift
View File

@ -8,7 +8,7 @@
import Foundation
import WebKit
public class UserScript : WKUserScript {
public class UserScript: WKUserScript {
var groupName: String?
private var contentWorldWrapper: Any?

2
flutter_inappwebview_macos/macos/Classes/Types/WebMessage.swift
View File

@ -8,7 +8,7 @@
import Foundation
import FlutterMacOS
public class WebMessage : NSObject, Disposable {
public class WebMessage: NSObject, Disposable {
var data: Any?
var type: WebMessageType
var ports: [WebMessagePort]?

2
flutter_inappwebview_macos/macos/Classes/Types/WebMessagePort.swift
View File

@ -7,7 +7,7 @@
import Foundation
public class WebMessagePort : NSObject {
public class WebMessagePort: NSObject {
var name: String
var index: Int64
var webMessageChannelId: String

2
flutter_inappwebview_macos/macos/Classes/WebAuthenticationSession/WebAuthenticationSession.swift
View File

@ -10,7 +10,7 @@ import AuthenticationServices
import SafariServices
import FlutterMacOS
public class WebAuthenticationSession : NSObject, ASWebAuthenticationPresentationContextProviding, Disposable {
public class WebAuthenticationSession: NSObject, ASWebAuthenticationPresentationContextProviding, Disposable {
static let METHOD_CHANNEL_NAME_PREFIX = "com.pichillilorenzo/flutter_webauthenticationsession_"
var id: String
var plugin: InAppWebViewFlutterPlugin?

2
flutter_inappwebview_macos/macos/Classes/WebAuthenticationSession/WebAuthenticationSessionChannelDelegate.swift
View File

@ -8,7 +8,7 @@
import Foundation
import FlutterMacOS
public class WebAuthenticationSessionChannelDelegate : ChannelDelegate {
public class WebAuthenticationSessionChannelDelegate: ChannelDelegate {
private weak var webAuthenticationSession: WebAuthenticationSession?
public init(webAuthenticationSession: WebAuthenticationSession, channel: FlutterMethodChannel) {