Skip to content

Commit 6351fa4

Browse files
Revert "[webview_flutter_wkwebview] Tear down ProxyAPIRegistrar in applicationWillTerminate" (#11564)
Reverts #11484 Fixes flutter/flutter#185407
1 parent 4a2091d commit 6351fa4

5 files changed

Lines changed: 8 additions & 121 deletions

File tree

packages/webview_flutter/webview_flutter_wkwebview/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 3.24.5
2+
3+
* Reverts `3.24.4` to prevent missing `FlutterSceneLifeCycleDelegate` build error.
4+
15
## 3.24.4
26

37
* Updates plugin to prevent message calls when application will terminate.

packages/webview_flutter/webview_flutter_wkwebview/darwin/Tests/WebViewFlutterPluginTests.swift

Lines changed: 0 additions & 85 deletions
This file was deleted.

packages/webview_flutter/webview_flutter_wkwebview/darwin/webview_flutter_wkwebview/Sources/webview_flutter_wkwebview/WebViewFlutterPlugin.swift

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -28,37 +28,13 @@ public class WebViewFlutterPlugin: NSObject, FlutterPlugin {
2828
let plugin = WebViewFlutterPlugin(binaryMessenger: binaryMessenger)
2929

3030
let viewFactory = FlutterViewFactory(instanceManager: plugin.proxyApiRegistrar!.instanceManager)
31-
32-
#if os(iOS)
33-
registrar.addApplicationDelegate(plugin)
34-
registrar.addSceneDelegate(plugin)
35-
#endif
36-
3731
registrar.register(viewFactory, withId: "plugins.flutter.io/webview")
3832
registrar.publish(plugin)
3933
}
4034

4135
public func detachFromEngine(for registrar: FlutterPluginRegistrar) {
42-
tearDownProxyAPIRegistrar()
43-
}
44-
45-
private func tearDownProxyAPIRegistrar() {
46-
proxyApiRegistrar?.ignoreCallsToDart = true
47-
proxyApiRegistrar?.tearDown()
48-
try? proxyApiRegistrar?.instanceManager.removeAllObjects()
36+
proxyApiRegistrar!.ignoreCallsToDart = true
37+
proxyApiRegistrar!.tearDown()
4938
proxyApiRegistrar = nil
5039
}
5140
}
52-
53-
#if os(iOS)
54-
extension WebViewFlutterPlugin: FlutterApplicationLifeCycleDelegate, FlutterSceneLifeCycleDelegate
55-
{
56-
public func applicationWillTerminate(_ application: UIApplication) {
57-
tearDownProxyAPIRegistrar()
58-
}
59-
60-
public func sceneDidDisconnect(_ scene: UIScene) {
61-
tearDownProxyAPIRegistrar()
62-
}
63-
}
64-
#endif

packages/webview_flutter/webview_flutter_wkwebview/example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 60;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -42,8 +42,6 @@
4242
8F1488FE2D2DE27000191744 /* HTTPCookieProxyAPITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F1488C82D2DE27000191744 /* HTTPCookieProxyAPITests.swift */; };
4343
8F1488FF2D2DE27000191744 /* NavigationActionProxyAPITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F1488CB2D2DE27000191744 /* NavigationActionProxyAPITests.swift */; };
4444
8F1489012D2DE91C00191744 /* AuthenticationChallengeResponseProxyAPITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F1489002D2DE91C00191744 /* AuthenticationChallengeResponseProxyAPITests.swift */; };
45-
8F63D06B2F8812E400EC5076 /* WebViewFlutterPluginTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F63D06A2F8812E400EC5076 /* WebViewFlutterPluginTests.swift */; };
46-
8F63D06C2F8812E400EC5076 /* PlatformViewImplTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F63D0692F8812E400EC5076 /* PlatformViewImplTests.swift */; };
4745
8FEC64852DA2C6DC00C48569 /* GetTrustResultResponseProxyAPITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FEC64812DA2C6DC00C48569 /* GetTrustResultResponseProxyAPITests.swift */; };
4846
8FEC64862DA2C6DC00C48569 /* WebpagePreferencesProxyAPITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FEC64842DA2C6DC00C48569 /* WebpagePreferencesProxyAPITests.swift */; };
4947
8FEC64872DA2C6DC00C48569 /* SecCertificateProxyAPITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FEC64822DA2C6DC00C48569 /* SecCertificateProxyAPITests.swift */; };
@@ -130,8 +128,6 @@
130128
8F1488E02D2DE27000191744 /* WebViewConfigurationProxyAPITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = WebViewConfigurationProxyAPITests.swift; path = ../../darwin/Tests/WebViewConfigurationProxyAPITests.swift; sourceTree = SOURCE_ROOT; };
131129
8F1488E12D2DE27000191744 /* WebViewProxyAPITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = WebViewProxyAPITests.swift; path = ../../darwin/Tests/WebViewProxyAPITests.swift; sourceTree = SOURCE_ROOT; };
132130
8F1489002D2DE91C00191744 /* AuthenticationChallengeResponseProxyAPITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AuthenticationChallengeResponseProxyAPITests.swift; path = ../../darwin/Tests/AuthenticationChallengeResponseProxyAPITests.swift; sourceTree = SOURCE_ROOT; };
133-
8F63D0692F8812E400EC5076 /* PlatformViewImplTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PlatformViewImplTests.swift; path = ../../darwin/Tests/PlatformViewImplTests.swift; sourceTree = SOURCE_ROOT; };
134-
8F63D06A2F8812E400EC5076 /* WebViewFlutterPluginTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = WebViewFlutterPluginTests.swift; path = ../../darwin/Tests/WebViewFlutterPluginTests.swift; sourceTree = SOURCE_ROOT; };
135131
8FEC64812DA2C6DC00C48569 /* GetTrustResultResponseProxyAPITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = GetTrustResultResponseProxyAPITests.swift; path = ../../darwin/Tests/GetTrustResultResponseProxyAPITests.swift; sourceTree = SOURCE_ROOT; };
136132
8FEC64822DA2C6DC00C48569 /* SecCertificateProxyAPITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SecCertificateProxyAPITests.swift; path = ../../darwin/Tests/SecCertificateProxyAPITests.swift; sourceTree = SOURCE_ROOT; };
137133
8FEC64832DA2C6DC00C48569 /* SecTrustProxyAPITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SecTrustProxyAPITests.swift; path = ../../darwin/Tests/SecTrustProxyAPITests.swift; sourceTree = SOURCE_ROOT; };
@@ -178,8 +174,6 @@
178174
68BDCAEA23C3F7CB00D9C032 /* RunnerTests */ = {
179175
isa = PBXGroup;
180176
children = (
181-
8F63D0692F8812E400EC5076 /* PlatformViewImplTests.swift */,
182-
8F63D06A2F8812E400EC5076 /* WebViewFlutterPluginTests.swift */,
183177
8F0E23512EEB5D6B002AB342 /* ColorProxyAPITests.swift */,
184178
8F0EDFD22E1F4967001938E6 /* ProxyAPIRegistrarTests.swift */,
185179
8FEC64812DA2C6DC00C48569 /* GetTrustResultResponseProxyAPITests.swift */,
@@ -504,8 +498,6 @@
504498
8F1488F42D2DE27000191744 /* URLCredentialProxyAPITests.swift in Sources */,
505499
8F1488F52D2DE27000191744 /* URLAuthenticationChallengeProxyAPITests.swift in Sources */,
506500
8F1488F62D2DE27000191744 /* NavigationDelegateProxyAPITests.swift in Sources */,
507-
8F63D06B2F8812E400EC5076 /* WebViewFlutterPluginTests.swift in Sources */,
508-
8F63D06C2F8812E400EC5076 /* PlatformViewImplTests.swift in Sources */,
509501
8F1488F72D2DE27000191744 /* UIDelegateProxyAPITests.swift in Sources */,
510502
8F1488F82D2DE27000191744 /* ScrollViewDelegateProxyAPITests.swift in Sources */,
511503
8F1488FA2D2DE27000191744 /* FWFWebViewFlutterWKWebViewExternalAPITests.swift in Sources */,

packages/webview_flutter/webview_flutter_wkwebview/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: webview_flutter_wkwebview
22
description: A Flutter plugin that provides a WebView widget based on Apple's WKWebView control.
33
repository: https://github.com/flutter/packages/tree/main/packages/webview_flutter/webview_flutter_wkwebview
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+webview%22
5-
version: 3.24.4
5+
version: 3.24.5
66

77
environment:
88
sdk: ^3.9.0

0 commit comments

Comments
 (0)