Merge branch 'v6.0.0-beta.9'

pichillilorenzo · Oct 26, 2022 · 52fb4b3 · 52fb4b3
2 parents d5170c3 + cfd70fd
commit 52fb4b3
Show file tree

Hide file tree

Showing 64 changed files with 3,334 additions and 344 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,22 @@
+## 6.0.0-beta.9
+
+- Added `headers`, `otherLikelyURLs`, `referrer` arguments on `ChromeSafariBrowser.open` method for Android
+- Added `onNavigationEvent`, `onServiceConnected`, `onRelationshipValidationResult` events on `ChromeSafariBrowser` for Android
+- Added `mayLaunchUrl`, `launchUrl`, `updateActionButton`, `validateRelationship`, `setSecondaryToolbar`, `updateSecondaryToolbar` methods on `ChromeSafariBrowser` for Android
+- Added `startAnimations`, `exitAnimations`, `navigationBarColor`, `navigationBarDividerColor`, `secondaryToolbarColor`, `alwaysUseBrowserUI` ChromeSafariBrowser settings for Android
+- Added `ChromeSafariBrowserMenuItem.image` property for iOS
+- Added `didLoadSuccessfully` optional argument on `ChromeSafariBrowser.onCompletedInitialLoad` event for iOS
+- Added `onInitialLoadDidRedirect`, `onWillOpenInBrowser` events on `ChromeSafariBrowser` for iOS
+- Added `activityButton`, `eventAttribution` ChromeSafariBrowser settings for iOS
+- Added `clearWebsiteData`, `prewarmConnections`, `invalidatePrewarmingToken`, `getMaxToolbarItems` static methods on `ChromeSafariBrowser` for iOS
+- Added `getVariationsHeader` WebView static method
+
+### BREAKING CHANGES
+
+- `ChromeSafariBrowser.onCompletedInitialLoad` event has an optional argument
+- `ChromeSafariBrowserMenuItem.action` and `ChromeSafariBrowserActionButton.action` can be null
+- All `ChromeSafariBrowserSettings` properties are optionals
+
 ## 6.0.0-beta.8
 
 - Merged "Exposed "shared" property of HttpServer bind method to support more use-cases." [#1395](https://github.com/pichillilorenzo/flutter_inappwebview/pull/1395) (thanks to [LugonjaAleksandar](https://github.com/LugonjaAleksandar))
@@ -65,7 +84,7 @@
 - Added `PullToRefreshController.isEnabled` method
 - Updated `getMetaThemeColor` on iOS 15.0+
 - Deprecated `onLoadError` for `onReceivedError`. `onReceivedError` will be called also for subframes
-- Deprecated `onLoadHttpError` for `onReceivedError`. `onReceivedHttpError` will be called also for subframes
+- Deprecated `onLoadHttpError` for `onReceivedHttpError`. `onReceivedHttpError` will be called also for subframes
 
 ### BREAKING CHANGES
 

diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebViewFileProvider.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebViewFileProvider.java
@@ -4,6 +4,6 @@
 
 public class InAppWebViewFileProvider extends FileProvider {
 
-  // This class intentionally left blank.
+  public static final String fileProviderAuthorityExtension = "flutter_inappwebview.fileprovider";
 
 }
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebViewStatic.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebViewStatic.java
@@ -114,6 +114,14 @@ public void onReceiveValue(Boolean value) {
         }
         result.success(true);
         break;
+      case "getVariationsHeader":
+        if (WebViewFeature.isFeatureSupported(WebViewFeature.GET_VARIATIONS_HEADER)) {
+          result.success(WebViewCompat.getVariationsHeader());
+        }
+        else {
+          result.success(null);
+        }
+        break;
       default:
         result.notImplemented();
     }

diff --git a/.../com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ActionBroadcastReceiver.java b/.../com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ActionBroadcastReceiver.java
@@ -4,11 +4,9 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import io.flutter.plugin.common.MethodChannel;
+import androidx.browser.customtabs.CustomTabsIntent;
 
 public class ActionBroadcastReceiver extends BroadcastReceiver {
   protected static final String LOG_TAG = "ActionBroadcastReceiver";
@@ -18,16 +16,25 @@ public class ActionBroadcastReceiver extends BroadcastReceiver {
 
   @Override
   public void onReceive(Context context, Intent intent) {
+    int clickedId = intent.getIntExtra(CustomTabsIntent.EXTRA_REMOTEVIEWS_CLICKED_ID, -1);
     String url = intent.getDataString();
     if (url != null) {
       Bundle b = intent.getExtras();
       String viewId = b.getString(KEY_ACTION_VIEW_ID);
-      int id = b.getInt(KEY_ACTION_ID);
-      String title = b.getString(KEY_URL_TITLE);
 
-      ChromeCustomTabsActivity browser = ChromeSafariBrowserManager.browsers.get(viewId);
-      if (browser != null && browser.channelDelegate != null) {
-        browser.channelDelegate.onChromeSafariBrowserItemActionPerform(id, url, title);
+      if (clickedId == -1) {
+        int id = b.getInt(KEY_ACTION_ID);
+        String title = b.getString(KEY_URL_TITLE);
+
+        ChromeCustomTabsActivity browser = ChromeSafariBrowserManager.browsers.get(viewId);
+        if (browser != null && browser.channelDelegate != null) {
+          browser.channelDelegate.onItemActionPerform(id, url, title);
+        }
+      } else {
+        ChromeCustomTabsActivity browser = ChromeSafariBrowserManager.browsers.get(viewId);
+        if (browser != null && browser.channelDelegate != null) {
+          browser.channelDelegate.onSecondaryItemActionPerform(browser.getResources().getResourceName(clickedId), url);
+        }
       }
     }
   }