Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[webview_flutter_wkwebview] Prevents NSObject.removeObserver from being called without calling addObserver first #5975

Merged
merged 3 commits into from
Jun 15, 2022
Merged

[webview_flutter_wkwebview] Prevents NSObject.removeObserver from being called without calling addObserver first #5975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
286a6f1
fix error call to remove observer
bparrishMines Jun 14, 2022
c054497
Merge branch 'main' of github.com:flutter/plugins into progress_tracking
bparrishMines Jun 14, 2022
57d7cb6
remove _dispose
bparrishMines Jun 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit_webview_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ class WebKitWebViewPlatformController extends WebViewPlatformController {

bool _zoomEnabled = true;
bool _hasNavigationDelegate = false;
bool _progressObserverSet = false;

final Map<String, WKScriptMessageHandler> _scriptMessageHandlers =
<String, WKScriptMessageHandler>{};
Expand Down Expand Up @@ -452,17 +453,20 @@ class WebKitWebViewPlatformController extends WebViewPlatformController {
await _resetUserScripts(removedJavaScriptChannels: javascriptChannelNames);
}

Future<void> _setHasProgressTracking(bool hasProgressTracking) {
Future<void> _setHasProgressTracking(bool hasProgressTracking) async {
if (hasProgressTracking) {
return webView.addObserver(
_progressObserverSet = true;
await webView.addObserver(
webView,
keyPath: 'estimatedProgress',
options: <NSKeyValueObservingOptions>{
NSKeyValueObservingOptions.newValue,
},
);
} else {
return webView.removeObserver(webView, keyPath: 'estimatedProgress');
} else if (_progressObserverSet) {
// Calls to removeObserver before addObserver causes a crash.
_progressObserverSet = false;
await webView.removeObserver(webView, keyPath: 'estimatedProgress');
}
}

Expand Down
10 changes: 10 additions & 0 deletions packages/webview_flutter/webview_flutter_wkwebview/test/src/web_kit_webview_widget_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1151,6 +1151,16 @@ void main() {

verify(mockCallbacksHandler.onProgress(32));
});

testWidgets('progress observer is not removed without being set first',
(WidgetTester tester) async {
await buildWidget(tester, hasProgressTracking: false);

verifyNever(mockWebView.removeObserver(
mockWebView,
keyPath: 'estimatedProgress',
));
});
});

group('JavascriptChannelRegistry', () {
Expand Down