Merge branch 'maxmitz-master'

This commit is contained in:
Lorenzo Pichilli 2023-11-10 14:22:32 +01:00
commit 43c03a07b1
3 changed files with 15 additions and 9 deletions

View File

@ -4,6 +4,7 @@
- Merged "feat(ios): optional tradeoff to fix ios input delay" [#1665](https://github.com/pichillilorenzo/flutter_inappwebview/pull/1665) (thanks to [andreasgangso](https://github.com/andreasgangso)) - Merged "feat(ios): optional tradeoff to fix ios input delay" [#1665](https://github.com/pichillilorenzo/flutter_inappwebview/pull/1665) (thanks to [andreasgangso](https://github.com/andreasgangso))
- Merged "Fix ios multiple flutter presenting error" [#1736](https://github.com/pichillilorenzo/flutter_inappwebview/pull/1736) (thanks to [AlexT84](https://github.com/AlexT84)) - Merged "Fix ios multiple flutter presenting error" [#1736](https://github.com/pichillilorenzo/flutter_inappwebview/pull/1736) (thanks to [AlexT84](https://github.com/AlexT84))
- Merged "fix cert parsing for ios 12" [#1822](https://github.com/pichillilorenzo/flutter_inappwebview/pull/1822) (thanks to [darkang3lz92](https://github.com/darkang3lz92)) - Merged "fix cert parsing for ios 12" [#1822](https://github.com/pichillilorenzo/flutter_inappwebview/pull/1822) (thanks to [darkang3lz92](https://github.com/darkang3lz92))
- Merged "Fix iOS and macOS Forced unwrap null value HTTPCookie for CookieManager.setCookie" [#1677](https://github.com/pichillilorenzo/flutter_inappwebview/pull/1677) (thanks to [maxmitz](https://github.com/maxmitz))
## 6.0.0-beta.25 ## 6.0.0-beta.25

View File

@ -131,11 +131,14 @@ public class MyCookieManager: ChannelDelegate {
} }
} }
let cookie = HTTPCookie(properties: properties)!
if let cookie = HTTPCookie(properties: properties) {
MyCookieManager.httpCookieStore.setCookie(cookie, completionHandler: {() in MyCookieManager.httpCookieStore.setCookie(cookie, completionHandler: {() in
result(true) result(true)
}) })
} else {
result(false)
}
} }
public static func getCookies(url: String, result: @escaping FlutterResult) { public static func getCookies(url: String, result: @escaping FlutterResult) {

View File

@ -132,11 +132,13 @@ public class MyCookieManager: ChannelDelegate {
} }
} }
let cookie = HTTPCookie(properties: properties)! if let cookie = HTTPCookie(properties: properties) {
MyCookieManager.httpCookieStore.setCookie(cookie, completionHandler: {() in MyCookieManager.httpCookieStore.setCookie(cookie, completionHandler: {() in
result(true) result(true)
}) })
} else {
result(false)
}
} }
public static func getCookies(url: String, result: @escaping FlutterResult) { public static func getCookies(url: String, result: @escaping FlutterResult) {