@@ -26,6 +27,10 @@
{
BoxDecoration(border: Border.all(color: Colors.blueAccent)),
child: InAppWebView(
//initialUrl: "https://www.youtube.com/embed/M7lc1UVf-VE?playsinline=1",
- initialUrl: "https://github.com",
+ //initialUrl: "https://github.com",
//initialUrl: "chrome://safe-browsing/match?type=malware",
//initialUrl: "http://192.168.1.20:8081/",
//initialUrl: "https://192.168.1.20:4433/",
- //initialFile: "assets/index.html",
+ initialFile: "assets/index.html",
initialHeaders: {},
initialOptions: [
InAppWebViewOptions(
@@ -143,8 +143,8 @@ class _InlineExampleScreenState extends State {
controller.clearSslPreferences();
controller.clearClientCertPreferences();
}
- //controller.findAllAsync("a");
- controller.getFavicon();
+ //controller.findAllAsync("flutter");
+ print(await controller.getFavicons());
},
onLoadError: (InAppWebViewController controller, String url, int code, String message) async {
print("error $url: $code, $message");
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index c74f3797..ab86227d 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -48,6 +48,7 @@ flutter:
- assets/page-2.html
- assets/css/
- assets/images/
+ - assets/favicon.ico
# To add assets to your application, add an assets section, like this:
# assets:
diff --git a/ios/Classes/FlutterWebViewController.swift b/ios/Classes/FlutterWebViewController.swift
index 1588095e..9202af9d 100755
--- a/ios/Classes/FlutterWebViewController.swift
+++ b/ios/Classes/FlutterWebViewController.swift
@@ -301,25 +301,9 @@ public class FlutterWebViewController: NSObject, FlutterPlatformView {
}
result(true)
break
- case "dispose":
- dispose()
- result(true)
- break
default:
result(FlutterMethodNotImplemented)
break
}
}
-
- public func dispose() {
- if webView != nil {
- webView!.IABController = nil
- webView!.IAWController = nil
- webView!.uiDelegate = nil
- webView!.navigationDelegate = nil
- webView!.scrollView.delegate = nil
- webView!.stopLoading()
- webView = nil
- }
- }
}
diff --git a/ios/Classes/InAppWebView.swift b/ios/Classes/InAppWebView.swift
index dda0b4d0..601e15e5 100755
--- a/ios/Classes/InAppWebView.swift
+++ b/ios/Classes/InAppWebView.swift
@@ -238,7 +238,6 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate, WKNavi
var IAWController: FlutterWebViewController?
var options: InAppWebViewOptions?
var currentURL: URL?
- var WKNavigationMap: [String: [String: Any]] = [:]
var startPageTime: Int64 = 0
static var credentialsProposed: [URLCredential] = []
@@ -786,13 +785,6 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate, WKNavi
let app = UIApplication.shared
if let url = navigationAction.request.url {
- if url.absoluteString != url.absoluteString && (options?.useOnLoadResource)! {
- WKNavigationMap[url.absoluteString] = [
- "startTime": currentTimeInMilliSeconds(),
- "request": navigationAction.request
- ]
- }
-
// Handle target="_blank"
if navigationAction.targetFrame == nil && (options?.useOnTargetBlank)! {
onTargetBlank(url: url)
@@ -834,17 +826,6 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate, WKNavi
decidePolicyFor navigationResponse: WKNavigationResponse,
decisionHandler: @escaping (WKNavigationResponsePolicy) -> Void) {
-// if (options?.useOnLoadResource)! {
-// if let url = navigationResponse.response.url {
-// if WKNavigationMap[url.absoluteString] != nil {
-// let startResourceTime: Int64 = (WKNavigationMap[url.absoluteString]!["startTime"] as! Int64)
-// let startTime: Int64 = startResourceTime - startPageTime;
-// let duration: Int64 = currentTimeInMilliSeconds() - startResourceTime;
-// onLoadResource(response: navigationResponse.response, fromRequest: WKNavigationMap[url.absoluteString]!["request"] as? URLRequest, withData: Data(), startTime: startTime, duration: duration)
-// }
-// }
-// }
-
if (options?.useOnDownloadStart)! {
let mimeType = navigationResponse.response.mimeType
if let url = navigationResponse.response.url {
@@ -875,7 +856,6 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate, WKNavi
}
public func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
- self.WKNavigationMap = [:]
currentURL = url
InAppWebView.credentialsProposed = []
onLoadStop(url: (currentURL?.absoluteString)!)
diff --git a/ios/flutter_inappbrowser.podspec b/ios/flutter_inappbrowser.podspec
index 08581b88..0c88c439 100755
--- a/ios/flutter_inappbrowser.podspec
+++ b/ios/flutter_inappbrowser.podspec
@@ -17,7 +17,7 @@ A new Flutter plugin.
s.public_header_files = 'Classes/**/*.h'
s.dependency 'Flutter'
- s.ios.deployment_target = '8.0'
+ s.platform = '8.0'
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }
s.swift_version = '5.0'
end
diff --git a/lib/src/in_app_browser.dart b/lib/src/in_app_browser.dart
index 35d16e36..61025078 100644
--- a/lib/src/in_app_browser.dart
+++ b/lib/src/in_app_browser.dart
@@ -268,7 +268,8 @@ class InAppBrowser {
args.putIfAbsent('uuid', () => uuid);
args.putIfAbsent('optionsType', () => "InAppBrowserOptions");
Map options = await ChannelManager.channel.invokeMethod('getOptions', args);
- options = options.cast();
+ if (options != null)
+ options = options.cast();
return options;
}
diff --git a/lib/src/in_app_webview.dart b/lib/src/in_app_webview.dart
index ab9c7941..6eeaa6b9 100755
--- a/lib/src/in_app_webview.dart
+++ b/lib/src/in_app_webview.dart
@@ -10,9 +10,10 @@ import 'package:flutter/services.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter/gestures.dart';
+import 'package:html/parser.dart' show parse;
+
import 'types.dart';
import 'in_app_browser.dart';
-import 'channel_manager.dart';
import 'webview_options.dart';
/*
@@ -255,15 +256,6 @@ class _InAppWebViewState extends State {
InAppWebViewController _controller;
- @override
- void dispose() {
- super.dispose();
- if (_controller != null) {
- _controller._dispose();
- _controller = null;
- }
- }
-
@override
Widget build(BuildContext context) {
Map initialOptions = {};
@@ -273,7 +265,22 @@ class _InAppWebViewState extends State {
});
if (defaultTargetPlatform == TargetPlatform.android) {
- return GestureDetector(
+ return AndroidView(
+ viewType: 'com.pichillilorenzo/flutter_inappwebview',
+ onPlatformViewCreated: _onPlatformViewCreated,
+ gestureRecognizers: widget.gestureRecognizers,
+ layoutDirection: TextDirection.rtl,
+ creationParams: {
+ 'initialUrl': widget.initialUrl,
+ 'initialFile': widget.initialFile,
+ 'initialData': widget.initialData?.toMap(),
+ 'initialHeaders': widget.initialHeaders,
+ 'initialOptions': initialOptions
+ },
+ creationParamsCodec: const StandardMessageCodec(),
+ );
+ // onLongPress issue: https://github.com/flutter/plugins/blob/f31d16a6ca0c4bd6849cff925a00b6823973696b/packages/webview_flutter/lib/src/webview_android.dart#L31
+ /*return GestureDetector(
onLongPress: () {},
excludeFromSemantics: true,
child: AndroidView(
@@ -290,7 +297,7 @@ class _InAppWebViewState extends State {
},
creationParamsCodec: const StandardMessageCodec(),
),
- );
+ );*/
} else if (defaultTargetPlatform == TargetPlatform.iOS) {
return UiKitView(
viewType: 'com.pichillilorenzo/flutter_inappwebview',
@@ -593,105 +600,146 @@ class InAppWebViewController {
return await _channel.invokeMethod('getProgress', args);
}
- ///Gets the favicon for the current page.
- Future> getFavicon() async {
- List favicons = [];
- HttpClient client = new HttpClient();
- var url = Uri.parse(await getUrl());
-
- var htmlRequest = await client.getUrl(url);
- var html = await (await htmlRequest.close()).transform(Utf8Decoder()).join();
- /// TODO: parse HTML instead of using javascript code
-
- try {
- List faviconsJs = json.decode(await injectScriptCode("""
-function flutter_inappbrowser_ger_favicons() {
- var favicons = [];
- var links = document.getElementsByTagName('link');
- for (var i = 0; i < links.length; i++) {
- var link = links[i];
- if (link.rel.indexOf("icon") >= 0) {
- favicons.push({
- rel: link.rel,
- href: link.href,
- sizes: link.sizes
- });
- }
+ ///Gets the content html of the page. It first tries to get the content through javascript.
+ ///If this doesn't work, it tries to get the content reading the file:
+ ///- checking if it is an asset (`file:///`) or
+ ///- downloading it using an `HttpClient` through the WebView's current url.
+ Future getHtml() async {
+ var html = "";
+ Map options = await getOptions();
+ if (options != null && options["javaScriptEnabled"] == true) {
+ html = await injectScriptCode("window.document.getElementsByTagName('html')[0].outerHTML;");
+ if (html.isNotEmpty)
+ return html;
}
- return favicons;
-}
-flutter_inappbrowser_ger_favicons();
- """));
- for(Map favicon in faviconsJs) {
- String sizes = favicon["sizes"];
- if (sizes != null && sizes != "any") {
- List sizesSplitted = sizes.split(" ");
- for (String size in sizesSplitted) {
- int width = int.parse(size.split("x")[0]);
- int height = int.parse(size.split("x")[1]);
- favicons.add(Favicon(url: favicon["href"], rel: favicon["rel"], width: width, height: height));
- }
- } else {
- favicons.add(Favicon(url: favicon["href"], rel: favicon["rel"], width: null, height: null));
- }
+ var webviewUrl = await getUrl();
+ if (webviewUrl.startsWith("file:///")) {
+ var assetPathSplitted = webviewUrl.split("/flutter_assets/");
+ var assetPath = assetPathSplitted[assetPathSplitted.length - 1];
+ var bytes = await rootBundle.load(assetPath);
+ html = utf8.decode(bytes.buffer.asUint8List());
+ }
+ else {
+ HttpClient client = new HttpClient();
+ var url = Uri.parse(webviewUrl);
+ try {
+ var htmlRequest = await client.getUrl(url);
+ html = await (await htmlRequest.close()).transform(Utf8Decoder()).join();
+ } catch (e) {
+ print(e);
}
- } catch (e) {}
+ }
+ return html;
+ }
+ ///Gets the list of all favicons for the current page.
+ Future> getFavicons() async {
+ List favicons = [];
- var completer = new Completer>();
- var faviconData = new List();
+ HttpClient client = new HttpClient();
+ var webviewUrl = await getUrl();
+ var url = (webviewUrl.startsWith("file:///")) ? Uri.file(webviewUrl) : Uri.parse(webviewUrl);
+ String manifestUrl;
+ var html = await getHtml();
+ if (html.isEmpty) {
+ return favicons;
+ }
+
+ var assetPathBase;
+
+ if (webviewUrl.startsWith("file:///")) {
+ var assetPathSplitted = webviewUrl.split("/flutter_assets/");
+ assetPathBase = assetPathSplitted[0] + "/flutter_assets/";
+ }
+
+ // get all link html elements
+ var document = parse(html);
+ var links = document.getElementsByTagName('link');
+ for (var link in links) {
+ var attributes = link.attributes;
+ if (attributes["rel"] == "manifest") {
+ manifestUrl = attributes["href"];
+ if (!_isUrlAbsolute(manifestUrl)) {
+ if (manifestUrl.startsWith("/")) {
+ manifestUrl = manifestUrl.substring(1);
+ }
+ manifestUrl = ((assetPathBase == null) ? url.scheme + "://" + url.host + "/" : assetPathBase) + manifestUrl;
+ }
+ continue;
+ }
+ if (!attributes["rel"].contains("icon")) {
+ continue;
+ }
+ favicons.addAll(_createFavicons(url, assetPathBase, attributes["href"], attributes["rel"], attributes["sizes"], false));
+ }
+
+ // try to get /favicon.ico
try {
var faviconUrl = url.scheme + "://" + url.host + "/favicon.ico";
await client.headUrl(Uri.parse(faviconUrl));
favicons.add(Favicon(url: faviconUrl, rel: "shortcut icon"));
- } catch(e) {}
-
- var manifestRequest;
- try {
- var manifestJsonUrl = url.scheme + "://" + url.host + "/manifest.json";
- manifestRequest = await client.getUrl(Uri.parse(manifestJsonUrl));
} catch(e) {
- /// TODO: find manifest throught rel="manifest"
+ print("/favicon.ico file not found: " + e.toString());
}
- if (manifestRequest) {
- Map manifest = json.decode(await (await manifestRequest.close()).transform(Utf8Decoder()).join());
+ // try to get the manifest file
+ HttpClientRequest manifestRequest;
+ HttpClientResponse manifestResponse;
+ bool manifestFound = false;
+ if (manifestUrl == null) {
+ manifestUrl = url.scheme + "://" + url.host + "/manifest.json";
+ }
+ try {
+ manifestRequest = await client.getUrl(Uri.parse(manifestUrl));
+ manifestResponse = await manifestRequest.close();
+ manifestFound = manifestResponse.statusCode == 200 && manifestResponse.headers.contentType?.mimeType == "application/json";
+ } catch(e) {
+ print("Manifest file not found: " + e.toString());
+ }
+
+ if (manifestFound) {
+ Map manifest = json.decode(await manifestResponse.transform(Utf8Decoder()).join());
if (manifest.containsKey("icons")) {
for(Map icon in manifest["icons"]) {
- String url = icon["src"];
- List urlSplitted = url.split("/");
- String sizes = icon["sizes"];
- String rel = (sizes != null) ? urlSplitted[urlSplitted.length - 1].replaceFirst("-" + sizes, "").split(" ")[0].split(".")[0] : null;
- if (sizes != null && sizes != "any") {
- List sizesSplitted = sizes.split(" ");
- for (String size in sizesSplitted) {
- int width = int.parse(size.split("x")[0]);
- int height = int.parse(size.split("x")[1]);
- favicons.add(Favicon(url: url, rel: rel, width: width, height: height));
- }
- } else {
- favicons.add(Favicon(url: url, rel: rel, width: null, height: null));
- }
+ favicons.addAll(_createFavicons(url, assetPathBase, icon["src"], icon["rel"], icon["sizes"], true));
}
}
}
- //print(favicons);
+ return favicons;
+ }
- // solution found here: https://stackoverflow.com/a/15750809/4637638
- var googleFaviconUrl = Uri.parse("https://plus.google.com/_/favicon?domain_url=" + url.scheme + "://" + url.host);
- client.getUrl(googleFaviconUrl).then((HttpClientRequest request) {
- return request.close();
- }).then((HttpClientResponse response) {
- response.listen((List data) {
- faviconData = data;
- }, onDone: () => completer.complete(faviconData));
- }).catchError((error) {
- completer.completeError(error);
- });
- return completer.future;
+ bool _isUrlAbsolute(String url) {
+ return url.startsWith("http://") || url.startsWith("https://");
+ }
+
+ List _createFavicons(Uri url, String assetPathBase, String urlIcon, String rel, String sizes, bool isManifest) {
+ List favicons = [];
+
+ List urlSplitted = urlIcon.split("/");
+ if (!_isUrlAbsolute(urlIcon)) {
+ if (urlIcon.startsWith("/")) {
+ urlIcon = urlIcon.substring(1);
+ }
+ urlIcon = ((assetPathBase == null) ? url.scheme + "://" + url.host + "/" : assetPathBase) + urlIcon;
+ }
+ if (isManifest) {
+ rel = (sizes != null) ? urlSplitted[urlSplitted.length - 1].replaceFirst("-" + sizes, "").split(" ")[0].split(".")[0] : null;
+ }
+ if (sizes != null && sizes.isNotEmpty && sizes != "any") {
+ List sizesSplitted = sizes.split(" ");
+ for (String size in sizesSplitted) {
+ int width = int.parse(size.split("x")[0]);
+ int height = int.parse(size.split("x")[1]);
+ favicons.add(Favicon(url: urlIcon, rel: rel, width: width, height: height));
+ }
+ } else {
+ favicons.add(Favicon(url: urlIcon, rel: rel, width: null, height: null));
+ }
+
+ return favicons;
}
///Loads the given [url] with optional [headers] specified as a map from name to value.
@@ -1001,7 +1049,6 @@ flutter_inappbrowser_ger_favicons();
args.putIfAbsent('uuid', () => _inAppBrowserUuid);
}
args.putIfAbsent('options', () => options);
- args.putIfAbsent('optionsType', () => "InAppBrowserOptions");
await _channel.invokeMethod('setOptions', args);
}
@@ -1012,9 +1059,9 @@ flutter_inappbrowser_ger_favicons();
_inAppBrowser.throwIsNotOpened();
args.putIfAbsent('uuid', () => _inAppBrowserUuid);
}
- args.putIfAbsent('optionsType', () => "InAppBrowserOptions");
- Map options = await ChannelManager.channel.invokeMethod('getOptions', args);
- options = options.cast();
+ Map options = await _channel.invokeMethod('getOptions', args);
+ if (options != null)
+ options = options.cast();
return options;
}
@@ -1183,9 +1230,4 @@ flutter_inappbrowser_ger_favicons();
}
await _channel.invokeMethod('clearMatches', args);
}
-
- ///Dispose/Destroy the WebView.
- Future _dispose() async {
- await _channel.invokeMethod('dispose');
- }
}
diff --git a/lib/src/webview_options.dart b/lib/src/webview_options.dart
index f88a836f..518b7f55 100644
--- a/lib/src/webview_options.dart
+++ b/lib/src/webview_options.dart
@@ -43,6 +43,7 @@ class InAppWebViewOptions implements WebViewOptions, BrowserOptions, AndroidOpti
this.resourceCustomSchemes = const [], this.contentBlockers = const [], this.preferredContentMode = InAppWebViewUserPreferredContentMode.RECOMMENDED}) {
if (this.minimumFontSize == null)
this.minimumFontSize = Platform.isAndroid ? 8 : 0;
+ assert(!this.resourceCustomSchemes.contains("http") && !this.resourceCustomSchemes.contains("https"));
}
@override
diff --git a/nodejs_server_test_auth_basic_and_ssl/index.js b/nodejs_server_test_auth_basic_and_ssl/index.js
index d52404db..a6004761 100644
--- a/nodejs_server_test_auth_basic_and_ssl/index.js
+++ b/nodejs_server_test_auth_basic_and_ssl/index.js
@@ -23,7 +23,16 @@ appHttps.get('/', (req, res) => {
// `localhost`.
if (req.client.authorized) {
- res.send(`Hello ${cert.subject.CN}, your certificate was issued by ${cert.issuer.CN}!`)
+ res.send(`
+
+
+
+
+
+
homepage: https://github.com/pichillilorenzo/flutter_inappbrowser
environment:
- sdk: ">=2.0.0-dev <3.0.0"
- flutter: ">=0.10.1 <2.0.0"
+ sdk: ">=2.0.0-dev.68.0 <3.0.0"
+ flutter: ">=1.9.1+hotfix.5 <2.0.0"
dependencies:
flutter:
sdk: flutter
uuid: ^2.0.0
mime: ^0.9.6+2
+ html: ^0.14.0+3
# For information on the generic Dart part of this file, see the
# following page: https://www.dartlang.org/tools/pub/pubspec
Inline WebView
Cover is a one-page template for building simple and beautiful home pages. Download, edit the text, and add your own fullscreen background photo to make it your own.
+
Hello ${cert.subject.CN}, your certificate was issued by ${cert.issuer.CN}!
+ + + `) // They can still provide a certificate which is not accepted by us. Unfortunately, the `cert` object will be an empty // object instead of `null` if there is no certificate at all, so we have to check for a known field rather than // truthiness. @@ -34,6 +43,13 @@ appHttps.get('/', (req, res) => { } else { res.status(401).send(`Sorry, but you need to provide a client certificate to continue.`) } + res.end() +}) + +appHttps.get('/fakeResource', (req, res) => { + res.set("Content-Type", "text/javascript") + res.send(`alert("HI");`) + res.end() }) // Let's create our HTTPS server and we're ready to go. diff --git a/pubspec.yaml b/pubspec.yaml index 3923f656..efe4d795 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,14 +5,15 @@ author: Lorenzo Pichilli