rogalikkkkkk/iosWebViewFix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed Android Hybrid Composition constraint to use the pull-to-refresh feature, Removed Android com.squareup.okhttp3:okhttp dependency

Browse Source
This commit is contained in:
Lorenzo Pichilli 2022-11-23 17:06:14 +01:00
parent b82baaa061
commit 962fc35ff7
9 changed files with 162 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@ -1,3 +1,8 @@
## 6.0.0-beta.16
- Removed Android Hybrid Composition constraint to use the pull-to-refresh feature
- Removed Android `com.squareup.okhttp3:okhttp` dependency
## 6.0.0-beta.15 ## 6.0.0-beta.15
- Automatically infer `useShouldOverrideUrlLoading`, `useOnLoadResource`, `useOnDownloadStart`, `useShouldInterceptAjaxRequest`, `useShouldInterceptFetchRequest`, `useShouldInterceptRequest`, `useOnRenderProcessGone`, `useOnNavigationResponse` settings if their value is `null` and the corresponding event is implemented by the WebView (`InAppWebView` and `HeadlessInAppWebView`, not `InAppBrowser`) before it's native initialization - Automatically infer `useShouldOverrideUrlLoading`, `useOnLoadResource`, `useOnDownloadStart`, `useShouldInterceptAjaxRequest`, `useShouldInterceptFetchRequest`, `useShouldInterceptRequest`, `useOnRenderProcessGone`, `useOnNavigationResponse` settings if their value is `null` and the corresponding event is implemented by the WebView (`InAppWebView` and `HeadlessInAppWebView`, not `InAppBrowser`) before it's native initialization
@ -145,6 +150,10 @@
- Removed `URLProtectionSpace.iosIsProxy` property - Removed `URLProtectionSpace.iosIsProxy` property
- `historyUrl` and `baseUrl` of `InAppWebViewInitialData` can be `null` - `historyUrl` and `baseUrl` of `InAppWebViewInitialData` can be `null`
## 5.7.2
- Removed Android Hybrid Composition constraint to use the pull-to-refresh feature
## 5.7.1+2 ## 5.7.1+2
- Fixed Android `NullPointerException` on `InAppBrowserActivity.dispose` - Fixed Android `NullPointerException` on `InAppBrowserActivity.dispose`

1
android/build.gradle
View File

@ -48,7 +48,6 @@ android {
implementation 'androidx.webkit:webkit:1.5.0' implementation 'androidx.webkit:webkit:1.5.0'
implementation 'androidx.browser:browser:1.4.0' implementation 'androidx.browser:browser:1.4.0'
implementation 'androidx.appcompat:appcompat:1.5.1' implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'com.squareup.okhttp3:okhttp:3.14.9'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
} }
} }

49
android/src/main/java/com/pichillilorenzo/flutter_inappwebview/Util.java
View File

@ -33,8 +33,10 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.net.HttpURLConnection;
import java.net.Inet6Address; import java.net.Inet6Address;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.URL;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.security.Key; import java.security.Key;
import java.security.KeyStore; import java.security.KeyStore;
@ -47,18 +49,11 @@ import java.util.Enumeration;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLHandshakeException;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
import io.flutter.plugin.common.MethodChannel; import io.flutter.plugin.common.MethodChannel;
import okhttp3.OkHttpClient;
public class Util { public class Util {
@ -171,12 +166,38 @@ public class Util {
} }
} }
public static OkHttpClient getBasicOkHttpClient() { @Nullable
return new OkHttpClient.Builder() public static HttpURLConnection makeHttpRequest(String urlString, String method, @Nullable Map<String, String> headers) {
.connectTimeout(15, TimeUnit.SECONDS) HttpURLConnection urlConnection = null;
.writeTimeout(15, TimeUnit.SECONDS) try {
.readTimeout(15, TimeUnit.SECONDS) URL url = new URL(urlString);
.build(); urlConnection = (HttpURLConnection) url.openConnection();
urlConnection.setRequestMethod(method);
if (headers != null) {
for (Map.Entry<String, String> header : headers.entrySet()) {
urlConnection.setRequestProperty(header.getKey(), header.getValue());
}
}
urlConnection.setConnectTimeout(15000); // 15 seconds
urlConnection.setReadTimeout(15000); // 15 seconds
urlConnection.setDoInput(true);
urlConnection.setInstanceFollowRedirects(true);
if ("GET".equalsIgnoreCase(method)) {
urlConnection.setDoOutput(false);
}
urlConnection.connect();
return urlConnection;
}
catch (Exception e) {
if (!(e instanceof SSLHandshakeException)) {
e.printStackTrace();
Log.e(LOG_TAG, e.getMessage());
}
if (urlConnection != null) {
urlConnection.disconnect();
}
}
return null;
} }
/** /**

169
android/src/main/java/com/pichillilorenzo/flutter_inappwebview/content_blocker/ContentBlockerHandler.java
View File

@ -2,32 +2,34 @@ package com.pichillilorenzo.flutter_inappwebview.content_blocker;
import android.os.Build; import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.webkit.WebResourceResponse; import android.webkit.WebResourceResponse;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview.InAppWebView;
import com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js.JavaScriptBridgeJS;
import com.pichillilorenzo.flutter_inappwebview.Util; import com.pichillilorenzo.flutter_inappwebview.Util;
import com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js.JavaScriptBridgeJS;
import com.pichillilorenzo.flutter_inappwebview.types.WebResourceRequestExt;
import com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview.InAppWebView;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.InputStream; import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import javax.net.ssl.SSLHandshakeException; import javax.net.ssl.SSLHandshakeException;
import okhttp3.Request;
import okhttp3.Response;
public class ContentBlockerHandler { public class ContentBlockerHandler {
protected static final String LOG_TAG = "ContentBlockerHandler"; protected static final String LOG_TAG = "ContentBlockerHandler";
@ -48,10 +50,14 @@ public class ContentBlockerHandler {
} }
@Nullable @Nullable
public WebResourceResponse checkUrl(final InAppWebView webView, String url, ContentBlockerTriggerResourceType responseResourceType) throws URISyntaxException, InterruptedException, MalformedURLException { public WebResourceResponse checkUrl(final InAppWebView webView, WebResourceRequestExt request,
ContentBlockerTriggerResourceType responseResourceType)
throws URISyntaxException, InterruptedException, MalformedURLException {
if (webView.customSettings.contentBlockers == null) if (webView.customSettings.contentBlockers == null)
return null; return null;
String url = request.getUrl();
URI u; URI u;
try { try {
u = new URI(url); u = new URI(url);
@ -182,36 +188,85 @@ public class ContentBlockerHandler {
if (scheme.equals("http") && (port == -1 || port == 80)) { if (scheme.equals("http") && (port == -1 || port == 80)) {
String urlHttps = url.replace("http://", "https://"); String urlHttps = url.replace("http://", "https://");
Request mRequest = new Request.Builder().url(urlHttps).build(); HttpURLConnection urlConnection = Util.makeHttpRequest(urlHttps, request.getMethod(), request.getHeaders());
Response response = null; if (urlConnection != null) {
try {
byte[] dataBytes = Util.readAllBytes(urlConnection.getInputStream());
if (dataBytes == null) {
return null;
}
InputStream dataStream = new ByteArrayInputStream(dataBytes);
try { String encoding = urlConnection.getContentEncoding();
response = Util.getBasicOkHttpClient().newCall(mRequest).execute(); String contentType = urlConnection.getContentType();
byte[] dataBytes = response.body().bytes(); if (contentType == null) {
InputStream dataStream = new ByteArrayInputStream(dataBytes); contentType = "text/plain";
} else {
String[] contentTypeSplitted = contentType.split(";");
contentType = contentTypeSplitted[0].trim();
if (encoding == null) {
encoding = (contentTypeSplitted.length > 1 && contentTypeSplitted[1].contains("charset="))
? contentTypeSplitted[1].replace("charset=", "").trim()
: "utf-8";
}
}
String[] contentTypeSplitted = response.header("content-type", "text/plain").split(";"); String reasonPhrase = urlConnection.getResponseMessage();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && reasonPhrase != null) {
String contentType = contentTypeSplitted[0].trim(); Map<String, String> responseHeaders = new HashMap<>();
String encoding = (contentTypeSplitted.length > 1 && contentTypeSplitted[1].contains("charset=")) for (Map.Entry<String, List<String>> responseHeader : urlConnection.getHeaderFields().entrySet()) {
? contentTypeSplitted[1].replace("charset=", "").trim() responseHeaders.put(responseHeader.getKey(), TextUtils.join(",", responseHeader.getValue()));
: "utf-8"; }
return new WebResourceResponse(contentType,
response.body().close(); encoding,
response.close(); urlConnection.getResponseCode(),
reasonPhrase,
return new WebResourceResponse(contentType, encoding, dataStream); responseHeaders,
dataStream);
} catch (Exception e) { } else {
if (response != null) { return new WebResourceResponse(contentType,
response.body().close(); encoding,
response.close(); dataStream);
} }
if (!(e instanceof SSLHandshakeException)) { } catch (Exception e) {
e.printStackTrace(); if (!(e instanceof SSLHandshakeException)) {
Log.e(LOG_TAG, e.getMessage()); e.printStackTrace();
}
} finally {
urlConnection.disconnect();
} }
} }
// Request mRequest = new Request.Builder().url(urlHttps).build();
// Response response = null;
//
// try {
// response = Util.getBasicOkHttpClient().newCall(mRequest).execute();
// byte[] dataBytes = response.body().bytes();
// InputStream dataStream = new ByteArrayInputStream(dataBytes);
//
// String[] contentTypeSplitted = response.header("content-type", "text/plain").split(";");
//
// String contentType = contentTypeSplitted[0].trim();
// String encoding = (contentTypeSplitted.length > 1 && contentTypeSplitted[1].contains("charset="))
// ? contentTypeSplitted[1].replace("charset=", "").trim()
// : "utf-8";
//
// response.body().close();
// response.close();
//
// return new WebResourceResponse(contentType, encoding, dataStream);
//
// } catch (Exception e) {
// if (response != null) {
// response.body().close();
// response.close();
// }
// if (!(e instanceof SSLHandshakeException)) {
// e.printStackTrace();
// Log.e(LOG_TAG, e.getMessage());
// }
// }
} }
break; break;
} }
@ -221,48 +276,36 @@ public class ContentBlockerHandler {
} }
@Nullable @Nullable
public WebResourceResponse checkUrl(final InAppWebView webView, String url) throws URISyntaxException, InterruptedException, MalformedURLException { public WebResourceResponse checkUrl(final InAppWebView webView, WebResourceRequestExt request) throws URISyntaxException, InterruptedException, MalformedURLException {
ContentBlockerTriggerResourceType responseResourceType = getResourceTypeFromUrl(url); ContentBlockerTriggerResourceType responseResourceType = getResourceTypeFromUrl(request);
return checkUrl(webView, url, responseResourceType); return checkUrl(webView, request, responseResourceType);
} }
@Nullable @Nullable
public WebResourceResponse checkUrl(final InAppWebView webView, String url, String contentType) throws URISyntaxException, InterruptedException, MalformedURLException { public WebResourceResponse checkUrl(final InAppWebView webView, WebResourceRequestExt request, String contentType) throws URISyntaxException, InterruptedException, MalformedURLException {
ContentBlockerTriggerResourceType responseResourceType = getResourceTypeFromContentType(contentType); ContentBlockerTriggerResourceType responseResourceType = getResourceTypeFromContentType(contentType);
return checkUrl(webView, url, responseResourceType); return checkUrl(webView, request, responseResourceType);
} }
public ContentBlockerTriggerResourceType getResourceTypeFromUrl(String url) { public ContentBlockerTriggerResourceType getResourceTypeFromUrl(WebResourceRequestExt request) {
ContentBlockerTriggerResourceType responseResourceType = ContentBlockerTriggerResourceType.RAW; ContentBlockerTriggerResourceType responseResourceType = ContentBlockerTriggerResourceType.RAW;
String url = request.getUrl();
if (url.startsWith("http://") || url.startsWith("https://")) { if (url.startsWith("http://") || url.startsWith("https://")) {
// make an HTTP "HEAD" request to the server for that URL. This will not return the full content of the URL. // make an HTTP "HEAD" request to the server for that URL. This will not return the full content of the URL.
Request mRequest = new Request.Builder().url(url).head().build(); HttpURLConnection urlConnection = Util.makeHttpRequest(url, "HEAD", request.getHeaders());
Response response = null; if (urlConnection != null) {
try { try {
response = Util.getBasicOkHttpClient().newCall(mRequest).execute(); String contentType = urlConnection.getContentType();
if (contentType != null) {
if (response.header("content-type") != null) { String[] contentTypeSplitted = contentType.split(";");
String[] contentTypeSplitted = response.header("content-type").split(";"); contentType = contentTypeSplitted[0].trim();
responseResourceType = getResourceTypeFromContentType(contentType);
String contentType = contentTypeSplitted[0].trim(); }
String encoding = (contentTypeSplitted.length > 1 && contentTypeSplitted[1].contains("charset=")) } catch (Exception e) {
? contentTypeSplitted[1].replace("charset=", "").trim()
: "utf-8";
response.body().close();
response.close();
responseResourceType = getResourceTypeFromContentType(contentType);
}
} catch (Exception e) {
if (response != null) {
response.body().close();
response.close();
}
if (!(e instanceof SSLHandshakeException)) {
e.printStackTrace(); e.printStackTrace();
Log.e(LOG_TAG, e.getMessage()); } finally {
urlConnection.disconnect();
} }
} }
} }

16
android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/FlutterWebView.java
View File

@ -68,15 +68,13 @@ public class FlutterWebView implements PlatformWebView {
customSettings.useHybridComposition ? null : plugin.flutterView, userScripts); customSettings.useHybridComposition ? null : plugin.flutterView, userScripts);
displayListenerProxy.onPostWebViewInitialization(displayManager); displayListenerProxy.onPostWebViewInitialization(displayManager);
if (customSettings.useHybridComposition) { // set MATCH_PARENT layout params to the WebView, otherwise it won't take all the available space!
// set MATCH_PARENT layout params to the WebView, otherwise it won't take all the available space! webView.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
webView.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); PullToRefreshSettings pullToRefreshSettings = new PullToRefreshSettings();
PullToRefreshSettings pullToRefreshSettings = new PullToRefreshSettings(); pullToRefreshSettings.parse(pullToRefreshInitialSettings);
pullToRefreshSettings.parse(pullToRefreshInitialSettings); pullToRefreshLayout = new PullToRefreshLayout(context, plugin, id, pullToRefreshSettings);
pullToRefreshLayout = new PullToRefreshLayout(context, plugin, id, pullToRefreshSettings); pullToRefreshLayout.addView(webView);
pullToRefreshLayout.addView(webView); pullToRefreshLayout.prepare();
pullToRefreshLayout.prepare();
}
FindInteractionController findInteractionController = new FindInteractionController(webView, plugin, id, null); FindInteractionController findInteractionController = new FindInteractionController(webView, plugin, id, null);
webView.findInteractionController = findInteractionController; webView.findInteractionController = findInteractionController;

4
android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebViewClient.java
View File

@ -690,7 +690,7 @@ public class InAppWebViewClient extends WebViewClient {
if (customSchemeResponse != null) { if (customSchemeResponse != null) {
WebResourceResponse response = null; WebResourceResponse response = null;
try { try {
response = webView.contentBlockerHandler.checkUrl(webView, url, customSchemeResponse.getContentType()); response = webView.contentBlockerHandler.checkUrl(webView, request, customSchemeResponse.getContentType());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -705,7 +705,7 @@ public class InAppWebViewClient extends WebViewClient {
WebResourceResponse response = null; WebResourceResponse response = null;
if (webView.contentBlockerHandler.getRuleList().size() > 0) { if (webView.contentBlockerHandler.getRuleList().size() > 0) {
try { try {
response = webView.contentBlockerHandler.checkUrl(webView, url); response = webView.contentBlockerHandler.checkUrl(webView, request);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }

4
example/ios/Flutter/flutter_export_environment.sh
View File

@ -3,11 +3,11 @@
export "FLUTTER_ROOT=/Users/lorenzopichilli/fvm/versions/3.3.6" export "FLUTTER_ROOT=/Users/lorenzopichilli/fvm/versions/3.3.6"
export "FLUTTER_APPLICATION_PATH=/Users/lorenzopichilli/Desktop/flutter_inappwebview/example" export "FLUTTER_APPLICATION_PATH=/Users/lorenzopichilli/Desktop/flutter_inappwebview/example"
export "COCOAPODS_PARALLEL_CODE_SIGN=true" export "COCOAPODS_PARALLEL_CODE_SIGN=true"
export "FLUTTER_TARGET=integration_test/webview_flutter_test.dart" export "FLUTTER_TARGET=/Users/lorenzopichilli/Desktop/flutter_inappwebview/example/lib/main.dart"
export "FLUTTER_BUILD_DIR=build" export "FLUTTER_BUILD_DIR=build"
export "FLUTTER_BUILD_NAME=1.0.0" export "FLUTTER_BUILD_NAME=1.0.0"
export "FLUTTER_BUILD_NUMBER=1" export "FLUTTER_BUILD_NUMBER=1"
export "DART_DEFINES=RkxVVFRFUl9XRUJfQVVUT19ERVRFQ1Q9dHJ1ZQ==" export "DART_DEFINES=Zmx1dHRlci5pbnNwZWN0b3Iuc3RydWN0dXJlZEVycm9ycz10cnVl,RkxVVFRFUl9XRUJfQVVUT19ERVRFQ1Q9dHJ1ZQ=="
export "DART_OBFUSCATION=false" export "DART_OBFUSCATION=false"
export "TRACK_WIDGET_CREATION=true" export "TRACK_WIDGET_CREATION=true"
export "TREE_SHAKE_ICONS=false" export "TREE_SHAKE_ICONS=false"

5
lib/src/in_app_webview/in_app_webview.dart
View File

@ -668,11 +668,6 @@ class _InAppWebViewState extends State<InAppWebView> {
widget.initialOptions?.android.useHybridComposition) ?? widget.initialOptions?.android.useHybridComposition) ??
true; true;
if (!useHybridComposition && widget.pullToRefreshController != null) {
throw new Exception(
"To use the pull-to-refresh feature, InAppWebViewSettings.useHybridComposition setting MUST be true!");
}
return PlatformViewLink( return PlatformViewLink(
viewType: 'com.pichillilorenzo/flutter_inappwebview', viewType: 'com.pichillilorenzo/flutter_inappwebview',
surfaceFactory: ( surfaceFactory: (

2
pubspec.yaml
View File

@ -1,6 +1,6 @@
name: flutter_inappwebview name: flutter_inappwebview
description: A Flutter plugin that allows you to add an inline webview, to use an headless webview, and to open an in-app browser window. description: A Flutter plugin that allows you to add an inline webview, to use an headless webview, and to open an in-app browser window.
version: 6.0.0-beta.15 version: 6.0.0-beta.16
homepage: https://inappwebview.dev/ homepage: https://inappwebview.dev/
repository: https://github.com/pichillilorenzo/flutter_inappwebview repository: https://github.com/pichillilorenzo/flutter_inappwebview
issue_tracker: https://github.com/pichillilorenzo/flutter_inappwebview/issues issue_tracker: https://github.com/pichillilorenzo/flutter_inappwebview/issues