Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import android.content.Context;
import android.view.View;
import android.webkit.WebStorage;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import io.flutter.plugin.common.BinaryMessenger;
import io.flutter.plugin.common.MethodCall;
import io.flutter.plugin.common.MethodChannel;
Expand All @@ -21,8 +21,6 @@ public class FlutterWebView implements PlatformView, MethodCallHandler {
@SuppressWarnings("unchecked")
FlutterWebView(Context context, BinaryMessenger messenger, int id, Map<String, Object> params) {
webView = new WebView(context);
// Allow local storage.
webView.getSettings().setDomStorageEnabled(true);

methodChannel = new MethodChannel(messenger, "plugins.flutter.io/webview_" + id);
methodChannel.setMethodCallHandler(this);
Expand All @@ -37,6 +35,19 @@ public class FlutterWebView implements PlatformView, MethodCallHandler {
String url = (String) params.get("initialUrl");
webView.loadUrl(url);
}

if (params.containsKey("enableJavascriptRedirects")) {
boolean enableJavascriptRedirects = (boolean) params.get("enableJavascriptRedirects");
if (enableJavascriptRedirects) {
webView.setWebViewClient(
new WebViewClient() {
@Override
public boolean shouldOverrideUrlLoading(WebView view, String url) {
return false;
}
});
}
}
}

@Override
Expand Down Expand Up @@ -80,9 +91,6 @@ public void onMethodCall(MethodCall methodCall, Result result) {
case "removeJavascriptChannels":
removeJavaScriptChannels(methodCall, result);
break;
case "clearCache":
clearCache(result);
break;
default:
result.notImplemented();
}
Expand All @@ -94,6 +102,12 @@ private void loadUrl(MethodCall methodCall, Result result) {
result.success(null);
}

private void doJavascriptRedirect(MethodCall methodCall, Result result) {
String url = (String) methodCall.arguments;
webView.loadUrl(url);
result.success(null);
}

private void canGoBack(MethodCall methodCall, Result result) {
result.success(webView.canGoBack());
}
Expand Down Expand Up @@ -162,12 +176,6 @@ private void removeJavaScriptChannels(MethodCall methodCall, Result result) {
result.success(null);
}

private void clearCache(Result result) {
webView.clearCache(true);
WebStorage.getInstance().deleteAllData();
result.success(null);
}

private void applySettings(Map<String, Object> settings) {
for (String key : settings.keySet()) {
switch (key) {
Expand Down Expand Up @@ -201,7 +209,5 @@ private void registerJavaScriptChannelNames(List<String> channelNames) {
}

@Override
public void dispose() {
methodChannel.setMethodCallHandler(null);
}
public void dispose() {}
}
1 change: 1 addition & 0 deletions packages/webview_flutter/example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class WebViewExample extends StatelessWidget {
return WebView(
initialUrl: 'https://flutter.io',
javascriptMode: JavascriptMode.unrestricted,
enableJavascriptRedirects: true,
onWebViewCreated: (WebViewController webViewController) {
_controller.complete(webViewController);
},
Expand Down
22 changes: 16 additions & 6 deletions packages/webview_flutter/lib/webview_flutter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,13 @@ class WebView extends StatefulWidget {
this.javascriptMode = JavascriptMode.disabled,
this.javascriptChannels,
this.gestureRecognizers,
this.enableJavascriptRedirects,
}) : assert(javascriptMode != null),
super(key: key);

/// enables javascript redirect if sets to true
final bool enableJavascriptRedirects;

/// If not null invoked once the web view is created.
final WebViewCreatedCallback onWebViewCreated;

Expand Down Expand Up @@ -229,15 +233,18 @@ Set<String> _extractChannelNames(Set<JavascriptChannel> channels) {

class _CreationParams {
_CreationParams(
{this.initialUrl, this.settings, this.javascriptChannelNames});
{this.initialUrl,
this.settings,
this.javascriptChannelNames,
this.enableJavascriptRedirects});

static _CreationParams fromWidget(WebView widget) {
return _CreationParams(
initialUrl: widget.initialUrl,
settings: _WebSettings.fromWidget(widget),
javascriptChannelNames:
_extractChannelNames(widget.javascriptChannels).toList(),
);
initialUrl: widget.initialUrl,
settings: _WebSettings.fromWidget(widget),
javascriptChannelNames:
_extractChannelNames(widget.javascriptChannels).toList(),
enableJavascriptRedirects: widget.enableJavascriptRedirects);
}

final String initialUrl;
Expand All @@ -246,11 +253,14 @@ class _CreationParams {

final List<String> javascriptChannelNames;

final bool enableJavascriptRedirects;

Map<String, dynamic> toMap() {
return <String, dynamic>{
'initialUrl': initialUrl,
'settings': settings.toMap(),
'javascriptChannelNames': javascriptChannelNames,
'enableJavascriptRedirects': enableJavascriptRedirects
};
}
}
Expand Down