[google_maps_flutter] Android cluster pin info window onTap callback not firing (#11390)

As described in flutter/flutter#184338, Google Maps Flutter Android has an issue where the cluster pin info window doesn't fire the `onTap` callback. That's the info window that shows when you tap a clustered pin (a pin which is part of a cluster manager). While the info window shows properly, the `onTap` doesn't fire in Android, but properly fires in other platforms.

Fixes flutter/flutter#184338

## Pre-Review Checklist

**Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.

[^1]: Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling.

Author: elitree

packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.19.6
+
+* Fixes the onTap callback for clustered pin info window taps.
+
 ## 2.19.5
 
 * Fixes a crash when using the legacy map renderer by adding the `org.apache.http.legacy` library.

packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/ClusterManagersController.java

@@ -46,6 +46,10 @@ class ClusterManagersController
   @Nullable
   private ClusterManager.OnClusterItemClickListener<MarkerBuilder> clusterItemClickListener;
 
+  @Nullable
+  private ClusterManager.OnClusterItemInfoWindowClickListener<MarkerBuilder>
+      clusterItemInfoWindowClickListener;
+
   @Nullable
   private ClusterManagersController.OnClusterItemRendered<MarkerBuilder>
       clusterItemRenderedListener;
@@ -71,6 +75,12 @@ void setClusterItemClickListener(
     initListenersForClusterManagers();
   }
 
+  void setClusterItemInfoWindowClickListener(
+      @Nullable ClusterManager.OnClusterItemInfoWindowClickListener<MarkerBuilder> listener) {
+    clusterItemInfoWindowClickListener = listener;
+    initListenersForClusterManagers();
+  }
+
   void setClusterItemRenderedListener(
       @Nullable ClusterManagersController.OnClusterItemRendered<MarkerBuilder> listener) {
     clusterItemRenderedListener = listener;
@@ -79,16 +89,21 @@ void setClusterItemRenderedListener(
   private void initListenersForClusterManagers() {
     for (Map.Entry<String, ClusterManager<MarkerBuilder>> entry :
         clusterManagerIdToManager.entrySet()) {
-      initListenersForClusterManager(entry.getValue(), this, clusterItemClickListener);
+      initListenersForClusterManager(
+          entry.getValue(), this, clusterItemClickListener, clusterItemInfoWindowClickListener);
     }
   }
 
   private void initListenersForClusterManager(
       ClusterManager<MarkerBuilder> clusterManager,
       @Nullable ClusterManager.OnClusterClickListener<MarkerBuilder> clusterClickListener,
-      @Nullable ClusterManager.OnClusterItemClickListener<MarkerBuilder> clusterItemClickListener) {
+      @Nullable ClusterManager.OnClusterItemClickListener<MarkerBuilder> clusterItemClickListener,
+      @Nullable
+          ClusterManager.OnClusterItemInfoWindowClickListener<MarkerBuilder>
+              clusterItemInfoWindowClickListener) {
     clusterManager.setOnClusterClickListener(clusterClickListener);
     clusterManager.setOnClusterItemClickListener(clusterItemClickListener);
+    clusterManager.setOnClusterItemInfoWindowClickListener(clusterItemInfoWindowClickListener);
   }
 
   /** Adds new ClusterManagers to the controller. */
@@ -123,7 +138,8 @@ private void initializeRenderer(ClusterManager<MarkerBuilder> clusterManager) {
         break;
     }
     clusterManager.setRenderer(clusterRenderer);
-    initListenersForClusterManager(clusterManager, this, clusterItemClickListener);
+    initListenersForClusterManager(
+        clusterManager, this, clusterItemClickListener, clusterItemInfoWindowClickListener);
   }
 
   /** Removes ClusterManagers by given cluster manager IDs from the controller. */
@@ -145,7 +161,7 @@ private void removeClusterManager(Object clusterManagerId) {
     if (clusterManager == null) {
       return;
     }
-    initListenersForClusterManager(clusterManager, null, null);
+    initListenersForClusterManager(clusterManager, null, null, null);
     clusterManager.clearItems();
     clusterManager.cluster();
   }

packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java

@@ -62,6 +62,7 @@
 class GoogleMapController
     implements ActivityPluginBinding.OnSaveInstanceStateListener,
         ClusterManager.OnClusterItemClickListener<MarkerBuilder>,
+        ClusterManager.OnClusterItemInfoWindowClickListener<MarkerBuilder>,
         ClusterManagersController.OnClusterItemRendered<MarkerBuilder>,
         DefaultLifecycleObserver,
         GoogleMapListener,
@@ -223,6 +224,7 @@ public void onMapReady(@NonNull GoogleMap googleMap) {
     groundOverlaysController.setGoogleMap(googleMap);
     setMarkerCollectionListener(this);
     setClusterItemClickListener(this);
+    setClusterItemInfoWindowClickListener(this);
     setClusterItemRenderedListener(this);
     updateInitialClusterManagers();
     updateInitialMarkers();
@@ -398,6 +400,7 @@ public void dispose() {
     setGoogleMapListener(null);
     setMarkerCollectionListener(null);
     setClusterItemClickListener(null);
+    setClusterItemInfoWindowClickListener(null);
     setClusterItemRenderedListener(null);
     destroyMapViewIfNecessary();
     Lifecycle lifecycle = lifecycleProvider.getLifecycle();
@@ -445,6 +448,17 @@ public void setClusterItemClickListener(
     clusterManagersController.setClusterItemClickListener(listener);
   }
 
+  @VisibleForTesting
+  public void setClusterItemInfoWindowClickListener(
+      @Nullable ClusterManager.OnClusterItemInfoWindowClickListener<MarkerBuilder> listener) {
+    if (googleMap == null) {
+      Log.v(TAG, "Controller was disposed before GoogleMap was ready.");
+      return;
+    }
+
+    clusterManagersController.setClusterItemInfoWindowClickListener(listener);
+  }
+
   @VisibleForTesting
   public void setClusterItemRenderedListener(
       @Nullable ClusterManagersController.OnClusterItemRendered<MarkerBuilder> listener) {
@@ -827,6 +841,11 @@ public boolean onClusterItemClick(MarkerBuilder item) {
     return markersController.onMarkerTap(item.markerId());
   }
 
+  @Override
+  public void onClusterItemInfoWindowClick(MarkerBuilder item) {
+    markersController.onClusterItemInfoWindowTap(item.markerId());
+  }
+
   public void setMapStyle(@Nullable String style) {
     if (googleMap == null) {
       initialMapStyle = style;

packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/MarkersController.java

@@ -307,6 +307,14 @@ void onInfoWindowTap(String googleMarkerId) {
     flutterApi.onInfoWindowTap(markerId, new NoOpVoidResult());
   }
 
+  /**
+   * Called when a cluster-managed marker's info window is tapped. Takes the Dart marker ID
+   * directly.
+   */
+  void onClusterItemInfoWindowTap(String markerId) {
+    flutterApi.onInfoWindowTap(markerId, new NoOpVoidResult());
+  }
+
   /**
    * Called each time clusterManager adds new visible marker to the map. Creates markerController
    * for marker for realtime marker updates.

packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/GoogleMapControllerTest.java

@@ -185,6 +185,21 @@ public void OnMapReadySetsClusterItemClickListener() {
     verify(spyGoogleMapController, times(1)).setClusterItemClickListener(null);
   }
 
+  @Test
+  @SuppressWarnings("unchecked")
+  public void OnMapReadySetsClusterItemInfoWindowClickListener() {
+    GoogleMapController googleMapController = getGoogleMapController();
+    GoogleMapController spyGoogleMapController = spy(googleMapController);
+    spyGoogleMapController.onMapReady(mockGoogleMap);
+
+    verify(spyGoogleMapController, times(1))
+        .setClusterItemInfoWindowClickListener(
+            any(ClusterManager.OnClusterItemInfoWindowClickListener.class));
+
+    spyGoogleMapController.dispose();
+    verify(spyGoogleMapController, times(1)).setClusterItemInfoWindowClickListener(null);
+  }
+
   @Test
   @SuppressWarnings("unchecked")
   public void OnMapReadySetsClusterItemRenderedListener() {
@@ -235,6 +250,15 @@ public void OnClusterItemClickCallsMarkersController() {
     verify(mockMarkersController, times(1)).onMarkerTap(markerBuilder.markerId());
   }
 
+  @Test
+  public void OnClusterItemInfoWindowClickCallsMarkersController() {
+    GoogleMapController googleMapController = getGoogleMapControllerWithMockedDependencies();
+    MarkerBuilder markerBuilder = new MarkerBuilder("m_1", "cm_1", PlatformMarkerType.MARKER);
+
+    googleMapController.onClusterItemInfoWindowClick(markerBuilder);
+    verify(mockMarkersController, times(1)).onClusterItemInfoWindowTap(markerBuilder.markerId());
+  }
+
   @Test
   public void SetInitialHeatmaps() {
     GoogleMapController googleMapController = getGoogleMapControllerWithMockedDependencies();

packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml

@@ -2,7 +2,7 @@ name: google_maps_flutter_android
 description: Android implementation of the google_maps_flutter plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
-version: 2.19.5
+version: 2.19.6
 
 environment:
   sdk: ^3.9.0