From 6fcf757df61eb2170dcc0cd9338f9786f6b9f35f Mon Sep 17 00:00:00 2001 From: Carlos Erazo Date: Mon, 7 Mar 2022 18:16:25 +0100 Subject: [PATCH 1/4] Android 12 support --- android/src/main/AndroidManifest.xml | 2 ++ .../chrome_custom_tabs/ChromeCustomTabsActivity.java | 9 +++++++-- example/android/app/src/main/AndroidManifest.xml | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 40dc1267..c5d3bbfb 100755 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -4,10 +4,12 @@ = android.os.Build.VERSION_CODES.M) { + return PendingIntent.getBroadcast( + this, actionSourceId, actionIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); + } else { + return PendingIntent.getBroadcast( + this, actionSourceId, actionIntent, PendingIntent.FLAG_UPDATE_CURRENT); + } } public void dispose() { diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index fefd2bec..fe6dd2d3 100755 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -56,6 +56,7 @@ android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density" android:hardwareAccelerated="true" android:launchMode="singleTop" + android:exported="false" android:name="io.flutter.embedding.android.FlutterActivity" android:theme="@style/LaunchTheme" android:windowSoftInputMode="adjustResize"> From aa1e90735696c49af2eb81ec682363c9095fe7c1 Mon Sep 17 00:00:00 2001 From: C E <83635384+carloserazo47@users.noreply.github.com> Date: Tue, 8 Mar 2022 10:03:29 +0100 Subject: [PATCH 2/4] Version upgraded 5.3.3 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index f810981b..75f6d3ca 100755 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ 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. -version: 5.3.2 +version: 5.3.3 homepage: https://github.com/pichillilorenzo/flutter_inappwebview environment: From 4f28ba5bbe6db9e47a129a4aeff3ae0207222605 Mon Sep 17 00:00:00 2001 From: Carlos Erazo Date: Tue, 8 Mar 2022 10:18:51 +0100 Subject: [PATCH 3/4] compileSdkVersion and targetSdkVersion upgraded to 31 --- android/build.gradle | 8 ++++---- example/android/app/build.gradle | 4 ++-- example/android/build.gradle | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index a5e831c4..f0408fc9 100755 --- a/android/build.gradle +++ b/android/build.gradle @@ -4,25 +4,25 @@ version '1.0-SNAPSHOT' buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.3' + classpath 'com.android.tools.build:gradle:3.6.4' } } rootProject.allprojects { repositories { google() - jcenter() + mavenCentral() } } apply plugin: 'com.android.library' android { - compileSdkVersion 30 + compileSdkVersion 31 defaultConfig { minSdkVersion 17 diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 11d4dbf2..e97f43d0 100755 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -30,7 +30,7 @@ android { targetCompatibility 1.8 } - compileSdkVersion 30 + compileSdkVersion 31 lintOptions { disable 'InvalidPackage' @@ -40,7 +40,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.pichillilorenzo.flutter_inappwebviewexample" minSdkVersion 17 - targetSdkVersion 30 + targetSdkVersion 31 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/example/android/build.gradle b/example/android/build.gradle index 205da3d3..46c5d224 100755 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,18 +1,18 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.android.tools.build:gradle:4.0.2' } } allprojects { repositories { google() - jcenter() + mavenCentral() } } From 1325e6623c14dff1953fd8280fa482c8e9ce3ab3 Mon Sep 17 00:00:00 2001 From: Lorenzo Pichilli Date: Sun, 17 Apr 2022 18:15:49 +0200 Subject: [PATCH 4/4] merge --- android/src/main/AndroidManifest.xml | 3 ++- example/android/app/src/main/AndroidManifest.xml | 2 +- example/pubspec.yaml | 14 +++++++------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index fbaf1980..52fb1c85 100755 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -9,10 +9,11 @@ android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density" /> diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index f1038725..8e93da90 100755 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -55,7 +55,7 @@ android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density" android:hardwareAccelerated="true" android:launchMode="singleTop" - android:exported="false" + android:exported="true" android:name="io.flutter.embedding.android.FlutterActivity" android:theme="@style/LaunchTheme" android:windowSoftInputMode="adjustResize"> diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 2ce18c4a..aa1622d8 100755 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -10,8 +10,8 @@ description: Demonstrates how to use the flutter_inappwebview plugin. version: 1.0.0+1 environment: - sdk: ">=2.12.0-0 <3.0.0" - flutter: ">=1.22.2" + sdk: ">=2.14.0 <3.0.0" + flutter: ">=2.5.0" dependencies: flutter: @@ -19,11 +19,11 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.2 - flutter_downloader: ^1.5.2 - path_provider: ^2.0.0-nullsafety - permission_handler: ^5.1.0+2 - url_launcher: ^6.0.0-nullsafety.4 + cupertino_icons: ^1.0.4 + flutter_downloader: ^1.7.3 + path_provider: ^2.0.9 + permission_handler: ^9.2.0 + url_launcher: ^6.0.20 # connectivity: ^0.4.5+6 flutter_inappwebview: path: ../