release 6.0.0-beta.9

CHANGELOG.md

@@ -1,17 +1,20 @@
 ## 6.0.0-beta.9
 
-- Added `headers`, `otherLikelyURLs` arguments on `ChromeSafariBrowser.open` method for Android
+- 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` methods on `ChromeSafariBrowser` for Android
-- Added `startAnimations`, `exitAnimations`, `navigationBarColor`, `navigationBarDividerColor`, `secondaryToolbarColor` ChromeSafariBrowser settings 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 `clearWebsiteData`, `prewarmConnections`, `invalidatePrewarmingToken` static methods 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

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";
 
 }

android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ActionBroadcastReceiver.java

@@ -4,6 +4,9 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
+
+import androidx.browser.customtabs.CustomTabsIntent;
 
 public class ActionBroadcastReceiver extends BroadcastReceiver {
   protected static final String LOG_TAG = "ActionBroadcastReceiver";
@@ -13,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.onItemActionPerform(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);
+        }
       }
     }
   }

android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ChromeCustomTabsActivity.java

@@ -9,7 +9,7 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
+import android.widget.RemoteViews;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
@@ -24,6 +24,7 @@
 import com.pichillilorenzo.flutter_inappwebview.types.AndroidResource;
 import com.pichillilorenzo.flutter_inappwebview.types.CustomTabsActionButton;
 import com.pichillilorenzo.flutter_inappwebview.types.CustomTabsMenuItem;
+import com.pichillilorenzo.flutter_inappwebview.types.CustomTabsSecondaryToolbar;
 import com.pichillilorenzo.flutter_inappwebview.types.Disposable;
 
 import java.util.ArrayList;
@@ -55,10 +56,14 @@ public class ChromeCustomTabsActivity extends Activity implements Disposable {
   public List<String> initialOtherLikelyURLs;
   @Nullable
   public Map<String, String> initialHeaders;
+  @Nullable
+  public String initialReferrer;
   public List<CustomTabsMenuItem> menuItems = new ArrayList<>();
   @Nullable
   public CustomTabsActionButton actionButton;
   @Nullable
+  public CustomTabsSecondaryToolbar secondaryToolbar;
+  @Nullable
   public ChromeCustomTabsChannelDelegate channelDelegate;
 
   @CallSuper
@@ -84,11 +89,13 @@ protected void onCreate(Bundle savedInstanceState) {
 
     initialUrl = b.getString("url");
     initialHeaders = (Map<String, String>) b.getSerializable("headers");
+    initialReferrer = b.getString("referrer");
     initialOtherLikelyURLs = b.getStringArrayList("otherLikelyURLs");
 
     customSettings = new ChromeCustomTabsSettings();
     customSettings.parse((HashMap<String, Object>) b.getSerializable("settings"));
     actionButton = CustomTabsActionButton.fromMap((Map<String, Object>) b.getSerializable("actionButton"));
+    secondaryToolbar = CustomTabsSecondaryToolbar.fromMap((Map<String, Object>) b.getSerializable("secondaryToolbar"));
     List<Map<String, Object>> menuItemList = (List<Map<String, Object>>) b.getSerializable("menuItemList");
     for (Map<String, Object> menuItem : menuItemList) {
       menuItems.add(CustomTabsMenuItem.fromMap(menuItem));
@@ -155,16 +162,18 @@ public void onRelationshipValidationResult(@CustomTabsService.Relation int relat
   }
 
   public void launchUrl(@NonNull String url,
-                          @Nullable Map<String, String> headers,
-                          @Nullable List<String> otherLikelyURLs) {
+                        @Nullable Map<String, String> headers,
+                        @Nullable String referrer,
+                        @Nullable List<String> otherLikelyURLs) {
     mayLaunchUrl(url, otherLikelyURLs);
     builder = new CustomTabsIntent.Builder(customTabsSession);
     prepareCustomTabs();
 
     CustomTabsIntent customTabsIntent = builder.build();
     prepareCustomTabsIntent(customTabsIntent);
 
-    CustomTabActivityHelper.openCustomTab(this, customTabsIntent, Uri.parse(url), headers, CHROME_CUSTOM_TAB_REQUEST_CODE);
+    CustomTabActivityHelper.openCustomTab(this, customTabsIntent, Uri.parse(url), headers,
+            referrer != null ? Uri.parse(referrer) : null, CHROME_CUSTOM_TAB_REQUEST_CODE);
   }
 
   public boolean mayLaunchUrl(@Nullable String url, @Nullable List<String> otherLikelyURLs) {
@@ -183,7 +192,7 @@ public boolean mayLaunchUrl(@Nullable String url, @Nullable List<String> otherLi
   public void customTabsConnected() {
     customTabsSession = customTabActivityHelper.getSession();
     if (initialUrl != null) {
-      launchUrl(initialUrl, initialHeaders, initialOtherLikelyURLs);
+      launchUrl(initialUrl, initialHeaders, initialReferrer, initialOtherLikelyURLs);
     }
   }
 
@@ -244,6 +253,33 @@ private void prepareCustomTabs() {
               createPendingIntent(actionButton.getId()),
               actionButton.isShouldTint());
     }
+
+    if (secondaryToolbar != null) {
+      AndroidResource layout = secondaryToolbar.getLayout();
+      RemoteViews remoteViews = new RemoteViews(layout.getDefPackage(), layout.getIdentifier(this));
+      int[] clickableIDs = new int[secondaryToolbar.getClickableIDs().size()];
+      for (int i = 0, length = secondaryToolbar.getClickableIDs().size(); i < length; i++) {
+        AndroidResource clickableID = secondaryToolbar.getClickableIDs().get(i);
+        clickableIDs[i] = clickableID.getIdentifier(this);
+      }
+      builder.setSecondaryToolbarViews(remoteViews, clickableIDs, getSecondaryToolbarOnClickPendingIntent());
+    }
+  }
+
+  public PendingIntent getSecondaryToolbarOnClickPendingIntent() {
+    Intent broadcastIntent = new Intent(this, ActionBroadcastReceiver.class);
+
+    Bundle extras = new Bundle();
+    extras.putString(ActionBroadcastReceiver.KEY_ACTION_VIEW_ID, id);
+    broadcastIntent.putExtras(extras);
+
+    if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+      return PendingIntent.getBroadcast(
+              this, 0, broadcastIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);
+    } else {
+      return PendingIntent.getBroadcast(
+              this, 0, broadcastIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+    }
   }
 
   private void prepareCustomTabsIntent(CustomTabsIntent customTabsIntent) {
@@ -254,6 +290,9 @@ private void prepareCustomTabsIntent(CustomTabsIntent customTabsIntent) {
 
     if (customSettings.keepAliveEnabled)
       CustomTabsHelper.addKeepAliveExtra(this, customTabsIntent.intent);
+
+    if (customSettings.alwaysUseBrowserUI)
+      CustomTabsIntent.setAlwaysUseBrowserUI(customTabsIntent.intent);
   }
 
   public void updateActionButton(@NonNull byte[] icon, @NonNull String description) {
@@ -270,6 +309,21 @@ public void updateActionButton(@NonNull byte[] icon, @NonNull String description
     actionButton.setDescription(description);
   }
 
+  public void updateSecondaryToolbar(CustomTabsSecondaryToolbar secondaryToolbar) {
+    if (customTabsSession == null) {
+      return;
+    }
+    AndroidResource layout = secondaryToolbar.getLayout();
+    RemoteViews remoteViews = new RemoteViews(layout.getDefPackage(), layout.getIdentifier(this));
+    int[] clickableIDs = new int[secondaryToolbar.getClickableIDs().size()];
+    for (int i = 0, length = secondaryToolbar.getClickableIDs().size(); i < length; i++) {
+      AndroidResource clickableID = secondaryToolbar.getClickableIDs().get(i);
+      clickableIDs[i] = clickableID.getIdentifier(this);
+    }
+    customTabsSession.setSecondaryToolbarViews(remoteViews, clickableIDs, getSecondaryToolbarOnClickPendingIntent());
+    this.secondaryToolbar = secondaryToolbar;
+  }
+
   @Override
   protected void onStart() {
     super.onStart();

android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ChromeCustomTabsChannelDelegate.java

@@ -9,6 +9,7 @@
 
 import com.pichillilorenzo.flutter_inappwebview.types.ChannelDelegateImpl;
 import com.pichillilorenzo.flutter_inappwebview.types.CustomTabsActionButton;
+import com.pichillilorenzo.flutter_inappwebview.types.CustomTabsSecondaryToolbar;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -35,8 +36,9 @@ public void onMethodCall(@NonNull final MethodCall call, @NonNull final MethodCh
           String url = (String) call.argument("url");
           if (url != null) {
             Map<String, String> headers = (Map<String, String>) call.argument("headers");
+            String referrer = (String) call.argument("referrer");
             List<String> otherLikelyURLs = (List<String>) call.argument("otherLikelyURLs");
-            chromeCustomTabsActivity.launchUrl(url, headers, otherLikelyURLs);
+            chromeCustomTabsActivity.launchUrl(url, headers, referrer, otherLikelyURLs);
             result.success(true);
           } else {
             result.success(false);
@@ -73,6 +75,15 @@ public void onMethodCall(@NonNull final MethodCall call, @NonNull final MethodCh
           result.success(false);
         }
         break;
+      case "updateSecondaryToolbar":
+        if (chromeCustomTabsActivity != null) {
+          CustomTabsSecondaryToolbar secondaryToolbar = CustomTabsSecondaryToolbar.fromMap((Map<String, Object>) call.argument("secondaryToolbar"));
+          chromeCustomTabsActivity.updateSecondaryToolbar(secondaryToolbar);
+          result.success(true);
+        } else {
+          result.success(false);
+        }
+        break;
       case "close":
         if (chromeCustomTabsActivity != null) {
           chromeCustomTabsActivity.onStop();
@@ -145,6 +156,15 @@ public void onItemActionPerform(int id, String url, String title) {
     channel.invokeMethod("onItemActionPerform", obj);
   }
 
+  public void onSecondaryItemActionPerform(String name, String url) {
+    MethodChannel channel = getChannel();
+    if (channel == null) return;
+    Map<String, Object> obj = new HashMap<>();
+    obj.put("name", name);
+    obj.put("url", url);
+    channel.invokeMethod("onSecondaryItemActionPerform", obj);
+  }
+
   public void onRelationshipValidationResult(int relation, @NonNull Uri requestedOrigin, boolean result) {
     MethodChannel channel = getChannel();
     if (channel == null) return;

android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ChromeCustomTabsSettings.java

@@ -44,6 +44,7 @@ public class ChromeCustomTabsSettings implements ISettings<ChromeCustomTabsActiv
   public Integer screenOrientation = ScreenOrientation.DEFAULT;
   public List<AndroidResource> startAnimations = new ArrayList<>();
   public List<AndroidResource> exitAnimations = new ArrayList<>();
+  public Boolean alwaysUseBrowserUI = false;
 
   @NonNull
   @Override
@@ -138,6 +139,9 @@ public ChromeCustomTabsSettings parse(@NonNull Map<String, Object> options) {
             }
           }
           break;
+        case "alwaysUseBrowserUI":
+          alwaysUseBrowserUI = (Boolean) value;
+          break;
       }
     }
 
@@ -163,6 +167,7 @@ public Map<String, Object> toMap() {
     options.put("isTrustedWebActivity", isTrustedWebActivity);
     options.put("additionalTrustedOrigins", additionalTrustedOrigins);
     options.put("screenOrientation", screenOrientation);
+    options.put("alwaysUseBrowserUI", alwaysUseBrowserUI);
     return options;
   }
 

android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ChromeSafariBrowserManager.java

@@ -5,6 +5,7 @@
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
+import androidx.browser.customtabs.CustomTabsIntent;
 
 import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
 import com.pichillilorenzo.flutter_inappwebview.Util;
@@ -48,11 +49,13 @@ public void onMethodCall(final MethodCall call, final MethodChannel.Result resul
         if (plugin != null && plugin.activity != null) {
           String url = (String) call.argument("url");
           HashMap<String, Object> headers = (HashMap<String, Object>) call.argument("headers");
+          String referrer = (String) call.argument("referrer");
           ArrayList<String> otherLikelyURLs = (ArrayList<String>) call.argument("otherLikelyURLs");
           HashMap<String, Object> settings = (HashMap<String, Object>) call.argument("settings");
           HashMap<String, Object> actionButton = (HashMap<String, Object>) call.argument("actionButton");
+          HashMap<String, Object> secondaryToolbar = (HashMap<String, Object>) call.argument("secondaryToolbar");
           List<HashMap<String, Object>> menuItemList = (List<HashMap<String, Object>>) call.argument("menuItemList");
-          open(plugin.activity, viewId, url, headers, otherLikelyURLs, settings, actionButton, menuItemList, result);
+          open(plugin.activity, viewId, url, headers, referrer, otherLikelyURLs, settings, actionButton, secondaryToolbar, menuItemList, result);
         } else {
           result.success(false);
         }
@@ -64,26 +67,31 @@ public void onMethodCall(final MethodCall call, final MethodChannel.Result resul
           result.success(false);
         }
         break;
+      case "getMaxToolbarItems":
+        result.success(CustomTabsIntent.getMaxToolbarItems());
+        break;
       default:
         result.notImplemented();
     }
   }
 
   public void open(Activity activity, String viewId, @Nullable String url, @Nullable HashMap<String, Object> headers,
-                   @Nullable ArrayList<String> otherLikelyURLs,
+                   @Nullable String referrer, @Nullable ArrayList<String> otherLikelyURLs,
                    HashMap<String, Object> settings, HashMap<String, Object> actionButton,
+                   HashMap<String, Object> secondaryToolbar,
                    List<HashMap<String, Object>> menuItemList, MethodChannel.Result result) {
 
     Intent intent = null;
     Bundle extras = new Bundle();
     extras.putString("url", url);
-    extras.putBoolean("isData", false);
     extras.putString("id", viewId);
     extras.putString("managerId", this.id);
     extras.putSerializable("headers", headers);
+    extras.putString("referrer", referrer);
     extras.putSerializable("otherLikelyURLs", otherLikelyURLs);
     extras.putSerializable("settings", settings);
     extras.putSerializable("actionButton", (Serializable) actionButton);
+    extras.putSerializable("secondaryToolbar", (Serializable) secondaryToolbar);
     extras.putSerializable("menuItemList", (Serializable) menuItemList);
 
     Boolean isSingleInstance = Util.<Boolean>getOrDefault(settings, "isSingleInstance", false);