Skip to content

Fix: keepAlive not working when URL changed #2614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: keepAlive not working when URL changed #2614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions flutter_inappwebview_android/lib/src/in_app_webview/in_app_webview_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,10 @@ class AndroidInAppWebViewController extends PlatformInAppWebViewController
props.webMessageChannels as Set<AndroidWebMessageChannel>;
_webMessageListeners =
props.webMessageListeners as Set<AndroidWebMessageListener>;
// restore the last URL if available
if (props.currentUrl != null) {
loadUrl(urlRequest: URLRequest(url: props.currentUrl));
}
}
}
}
Expand Down Expand Up @@ -214,6 +218,18 @@ class AndroidInAppWebViewController extends PlatformInAppWebViewController
_inAppBrowserEventHandler != null) {
String? url = call.arguments["url"];
WebUri? uri = url != null ? WebUri(url) : null;

// Update the current URL in the keepAlive properties
final keepAlive = webviewParams is PlatformInAppWebViewWidgetCreationParams ?
(webviewParams as PlatformInAppWebViewWidgetCreationParams).keepAlive : null;
if (keepAlive != null && uri != null) {
InAppWebViewControllerKeepAliveProps? props = _keepAliveMap[keepAlive];
if (props != null) {
props.currentUrl = uri;
_keepAliveMap[keepAlive] = props;
}
}

if (webviewParams != null && webviewParams!.onLoadStop != null)
webviewParams!.onLoadStop!(_controllerFromPlatform, uri);
else
Expand Down
18 changes: 17 additions & 1 deletion flutter_inappwebview_ios/lib/src/in_app_webview/in_app_webview_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,10 @@ class IOSInAppWebViewController extends PlatformInAppWebViewController
props.webMessageChannels as Set<IOSWebMessageChannel>;
_webMessageListeners =
props.webMessageListeners as Set<IOSWebMessageListener>;
// restore the last URL if available
if (props.currentUrl != null) {
loadUrl(urlRequest: URLRequest(url: props.currentUrl));
}
}
}
}
Expand Down Expand Up @@ -212,6 +216,18 @@ class IOSInAppWebViewController extends PlatformInAppWebViewController
_inAppBrowserEventHandler != null) {
String? url = call.arguments["url"];
WebUri? uri = url != null ? WebUri(url) : null;

// Update the current URL in the keepAlive properties
final keepAlive = webviewParams is PlatformInAppWebViewWidgetCreationParams ?
(webviewParams as PlatformInAppWebViewWidgetCreationParams).keepAlive : null;
if (keepAlive != null && uri != null) {
InAppWebViewControllerKeepAliveProps? props = _keepAliveMap[keepAlive];
if (props != null) {
props.currentUrl = uri;
_keepAliveMap[keepAlive] = props;
}
}

if (webviewParams != null && webviewParams!.onLoadStop != null)
webviewParams!.onLoadStop!(_controllerFromPlatform, uri);
else
Expand Down Expand Up @@ -1605,7 +1621,7 @@ class IOSInAppWebViewController extends PlatformInAppWebViewController
html =
await (await htmlRequest.close()).transform(Utf8Decoder()).join();
} catch (e) {
developer.log(e.toString(), name: this.runtimeType.toString());
developer.log(e.toString(), name: runtimeType.toString());
}
}

Expand Down
4 changes: 3 additions & 1 deletion ...ter_inappwebview_platform_interface/lib/src/in_app_webview/in_app_webview_keep_alive.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class InAppWebViewControllerKeepAliveProps {
Set<PlatformWebMessageChannel> webMessageChannels = Set();
Set<PlatformWebMessageListener> webMessageListeners = Set();
Map<String, Function(dynamic data)> devToolsProtocolEventListenerMap;
WebUri? currentUrl;

InAppWebViewControllerKeepAliveProps(
{this.javaScriptHandlersMap = const {},
Expand All @@ -37,5 +38,6 @@ class InAppWebViewControllerKeepAliveProps {
this.injectedScriptsFromURL = const {},
this.webMessageChannels = const {},
this.webMessageListeners = const {},
this.devToolsProtocolEventListenerMap = const {}});
this.devToolsProtocolEventListenerMap = const {},
this.currentUrl});
}