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

[webview_flutter_wkwebview][webview_flutter_android] Fixes bug where the WebViews could not be released #6996

Merged
auto-submit merged 17 commits into from
Jan 31, 2023
Merged

[webview_flutter_wkwebview][webview_flutter_android] Fixes bug where the WebViews could not be released #6996

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
76f294c
fix and test non disposing webview
bparrishMines Jan 20, 2023
7c26cf6
combine boolean
bparrishMines Jan 20, 2023
2e374a4
version bump
bparrishMines Jan 20, 2023
26f90c3
more pumpAndSettles
bparrishMines Jan 20, 2023
abbd637
add more pumpAndSettles
bparrishMines Jan 20, 2023
2d782bd
Merge branch 'main' of github.com:flutter/plugins into webview_dispos…
bparrishMines Jan 23, 2023
1026284
Merge branch 'main' of github.com:flutter/plugins into webview_dispos…
bparrishMines Jan 27, 2023
88a660a
update int tests
bparrishMines Jan 28, 2023
2037a4b
android test
bparrishMines Jan 29, 2023
befe041
fix version bump and unchange compile files
bparrishMines Jan 29, 2023
15d8b76
make _currentNavigationDelegate nullable
bparrishMines Jan 30, 2023
23b820d
quick fix
bparrishMines Jan 30, 2023
043f89c
accidental letter
bparrishMines Jan 30, 2023
d4c7b0a
Merge branch 'main' of github.com:flutter/plugins into webview_dispos…
bparrishMines Jan 30, 2023
a8ca3b9
Merge branch 'main' of github.com:flutter/plugins into webview_dispos…
bparrishMines Jan 30, 2023
19f7fef
small tests fixes
bparrishMines Jan 30, 2023
6078f50
missing hashtag
bparrishMines Jan 31, 2023
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
Prev Previous commit
Next Next commit
update int tests
  • Loading branch information
@bparrishMines
bparrishMines committed Jan 28, 2023
commit 88a660a65b7b234793e8fbc933dfbec84acb69ed
162 changes: 72 additions & 90 deletions ...ebview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:integration_test/integration_test.dart';
import 'package:webview_flutter_android/src/android_webview.dart' as android;
import 'package:webview_flutter_android/src/android_webview_api_impls.dart';
import 'package:webview_flutter_android/src/instance_manager.dart';
import 'package:webview_flutter_android/src/weak_reference_utils.dart';
import 'package:webview_flutter_android/webview_flutter_android.dart';
Expand Down Expand Up @@ -58,15 +60,13 @@ Future<void> main() async {
)
..loadRequest(LoadRequestParams(uri: Uri.parse(primaryUrl)));

await tester.pumpWidget(
Builder(
builder: (BuildContext context) {
return PlatformWebViewWidget(
PlatformWebViewWidgetCreationParams(controller: controller),
).build(context);
},
),
);
await tester.pumpWidget(Builder(
builder: (BuildContext context) {
return PlatformWebViewWidget(
PlatformWebViewWidgetCreationParams(controller: controller),
).build(context);
},
));

await pageFinished.future;

Expand Down Expand Up @@ -110,15 +110,13 @@ Future<void> main() async {
)
..loadRequest(LoadRequestParams(uri: Uri.parse(primaryUrl)));

await tester.pumpWidget(
Builder(
builder: (BuildContext context) {
return PlatformWebViewWidget(
PlatformWebViewWidgetCreationParams(controller: controller),
).build(context);
},
),
);
await tester.pumpWidget(Builder(
builder: (BuildContext context) {
return PlatformWebViewWidget(
PlatformWebViewWidgetCreationParams(controller: controller),
).build(context);
},
));

await pageFinished.future;

Expand Down Expand Up @@ -151,15 +149,13 @@ Future<void> main() async {
),
);

await tester.pumpWidget(
Builder(
builder: (BuildContext context) {
return PlatformWebViewWidget(
PlatformWebViewWidgetCreationParams(controller: controller),
).build(context);
},
),
);
await tester.pumpWidget(Builder(
builder: (BuildContext context) {
return PlatformWebViewWidget(
PlatformWebViewWidgetCreationParams(controller: controller),
).build(context);
},
));

await pageLoads.stream.firstWhere((String url) => url == headersUrl);

Expand Down Expand Up @@ -195,15 +191,13 @@ Future<void> main() async {
'data:text/html;charset=utf-8;base64,PCFET0NUWVBFIGh0bWw+',
);

await tester.pumpWidget(
Builder(
builder: (BuildContext context) {
return PlatformWebViewWidget(
PlatformWebViewWidgetCreationParams(controller: controller),
).build(context);
},
),
);
await tester.pumpWidget(Builder(
builder: (BuildContext context) {
return PlatformWebViewWidget(
PlatformWebViewWidgetCreationParams(controller: controller),
).build(context);
},
));

await pageFinished.future;

Expand Down Expand Up @@ -258,15 +252,13 @@ Future<void> main() async {
..setUserAgent('Custom_User_Agent1')
..loadRequest(LoadRequestParams(uri: Uri.parse('about:blank')));

await tester.pumpWidget(
Builder(
builder: (BuildContext context) {
return PlatformWebViewWidget(
PlatformWebViewWidgetCreationParams(controller: controller),
).build(context);
},
),
);
await tester.pumpWidget(Builder(
builder: (BuildContext context) {
return PlatformWebViewWidget(
PlatformWebViewWidgetCreationParams(controller: controller),
).build(context);
},
));

await pageFinished.future;

Expand Down Expand Up @@ -335,15 +327,13 @@ Future<void> main() async {
),
);

await tester.pumpWidget(
Builder(
builder: (BuildContext context) {
return PlatformWebViewWidget(
PlatformWebViewWidgetCreationParams(controller: controller),
).build(context);
},
),
);
await tester.pumpWidget(Builder(
builder: (BuildContext context) {
return PlatformWebViewWidget(
PlatformWebViewWidgetCreationParams(controller: controller),
).build(context);
},
));

await pageLoaded.future;

Expand All @@ -369,15 +359,13 @@ Future<void> main() async {
),
);

await tester.pumpWidget(
Builder(
builder: (BuildContext context) {
return PlatformWebViewWidget(
PlatformWebViewWidgetCreationParams(controller: controller),
).build(context);
},
),
);
await tester.pumpWidget(Builder(
builder: (BuildContext context) {
return PlatformWebViewWidget(
PlatformWebViewWidgetCreationParams(controller: controller),
).build(context);
},
));

await pageLoaded.future;

Expand Down Expand Up @@ -491,15 +479,13 @@ Future<void> main() async {
),
);

await tester.pumpWidget(
Builder(
builder: (BuildContext context) {
return PlatformWebViewWidget(
PlatformWebViewWidgetCreationParams(controller: controller),
).build(context);
},
),
);
await tester.pumpWidget(Builder(
builder: (BuildContext context) {
return PlatformWebViewWidget(
PlatformWebViewWidgetCreationParams(controller: controller),
).build(context);
},
));

await pageLoaded.future;

Expand All @@ -525,15 +511,13 @@ Future<void> main() async {
),
);

await tester.pumpWidget(
Builder(
builder: (BuildContext context) {
return PlatformWebViewWidget(
PlatformWebViewWidgetCreationParams(controller: controller),
).build(context);
},
),
);
await tester.pumpWidget(Builder(
builder: (BuildContext context) {
return PlatformWebViewWidget(
PlatformWebViewWidgetCreationParams(controller: controller),
).build(context);
},
));

await pageLoaded.future;

Expand Down Expand Up @@ -573,15 +557,13 @@ Future<void> main() async {
),
);

await tester.pumpWidget(
Builder(
builder: (BuildContext context) {
return PlatformWebViewWidget(
PlatformWebViewWidgetCreationParams(controller: controller),
).build(context);
},
),
);
await tester.pumpWidget(Builder(
builder: (BuildContext context) {
return PlatformWebViewWidget(
PlatformWebViewWidgetCreationParams(controller: controller),
).build(context);
},
));

await pageLoaded.future;

Expand Down
23 changes: 12 additions & 11 deletions packages/webview_flutter/webview_flutter_android/lib/src/android_webview_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,28 +96,30 @@ class AndroidWebViewController extends PlatformWebViewController {
);

late final android_webview.WebChromeClient _webChromeClient =
withWeakReferenceTo(this,
(WeakReference<AndroidWebViewController> weakReference) {
return _androidWebViewParams.androidWebViewProxy
.createAndroidWebChromeClient(
onProgressChanged: (android_webview.WebView webView, int progress) {
_androidWebViewParams.androidWebViewProxy.createAndroidWebChromeClient(
onProgressChanged: withWeakReferenceTo(this,
(WeakReference<AndroidWebViewController> weakReference) {
return (android_webview.WebView webView, int progress) {
if (weakReference.target?._currentNavigationDelegate._onProgress !=
null) {
weakReference
.target!._currentNavigationDelegate._onProgress!(progress);
}
},
onShowFileChooser: (android_webview.WebView webView,
};
}),
onShowFileChooser: withWeakReferenceTo(this,
(WeakReference<AndroidWebViewController> weakReference) {
return (android_webview.WebView webView,
android_webview.FileChooserParams params) async {
if (weakReference.target?._onShowFileSelectorCallback != null) {
return weakReference.target!._onShowFileSelectorCallback!(
FileSelectorParams._fromFileChooserParams(params),
);
}
return <String>[];
},
);
});
};
}),
);

/// The native [android_webview.FlutterAssetManager] allows managing assets.
late final android_webview.FlutterAssetManager _flutterAssetManager =
Expand All @@ -128,7 +130,6 @@ class AndroidWebViewController extends PlatformWebViewController {

// The keeps a reference to the current NavigationDelegate so that the
// callback methods remain reachable.
// ignore: unused_field
late AndroidNavigationDelegate _currentNavigationDelegate;

Future<List<String>> Function(FileSelectorParams)?
Expand Down
Loading