Merge branch 'main' into dependabot/gradle/packages/camera/camera_android/android/gradle-plugin-0c79ee2477

jmagman · web-flow · commit 166452b18682 · 2025-09-16T16:03:49.000-07:00
diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version
@@ -1 +1 @@
-f331a555e20cf7c3db78c72d55ca046eadf0ebcd
+8d0b31d81a02d13ee37d17c9387d7bbcd1c2baba
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -6,15 +6,15 @@
 
 packages/animations/**                                   @hannah-hyj
 packages/camera/**                                       @bparrishMines
-packages/cross_file/**                                   @ditman
-packages/extension_google_sign_in_as_googleapis_auth/**  @ditman
+packages/cross_file/**                                   @stuartmorgan
+packages/extension_google_sign_in_as_googleapis_auth/**  @stuartmorgan
 packages/file_selector/**                                @stuartmorgan-g
 packages/flutter_lints/**                                @chunhtai
 packages/flutter_template_images/**                      @stuartmorgan-g
 packages/go_router/**                                    @chunhtai
 packages/go_router_builder/**                            @chunhtai
 packages/google_adsense/**                               @sokoloff06 @ditman
-packages/google_identity_services_web/**                 @ditman
+packages/google_identity_services_web/**                 @mdebbar
 packages/google_fonts/**                                 @Piinks
 packages/google_maps_flutter/**                          @stuartmorgan-g
 packages/google_sign_in/**                               @stuartmorgan-g
@@ -53,16 +53,16 @@ third_party/packages/path_parsing/**                     @domesticmouse
 # matching entry takes precedence.
 
 # - Web
-packages/camera/camera_web/**                                 @ditman
-packages/file_selector/file_selector_web/**                   @ditman
-packages/google_maps_flutter/google_maps_flutter_web/**       @ditman
-packages/google_sign_in/google_sign_in_web/**                 @ditman
-packages/image_picker/image_picker_for_web/**                 @ditman
-packages/pointer_interceptor/pointer_interceptor_web/**       @ditman
-packages/shared_preferences/shared_preferences_web/**         @ditman
-packages/url_launcher/url_launcher_web/**                     @ditman
-packages/video_player/video_player_web/**                     @ditman
-packages/webview_flutter/webview_flutter_web/**               @ditman
+packages/camera/camera_web/**                                 @mdebbar
+packages/file_selector/file_selector_web/**                   @mdebbar
+packages/google_maps_flutter/google_maps_flutter_web/**       @mdebbar
+packages/google_sign_in/google_sign_in_web/**                 @mdebbar
+packages/image_picker/image_picker_for_web/**                 @mdebbar
+packages/pointer_interceptor/pointer_interceptor_web/**       @mdebbar
+packages/shared_preferences/shared_preferences_web/**         @mdebbar
+packages/url_launcher/url_launcher_web/**                     @mdebbar
+packages/video_player/video_player_web/**                     @mdebbar
+packages/webview_flutter/webview_flutter_web/**               @mdebbar
 
 # - Android
 packages/camera/camera_android/**                             @camsim99
diff --git a/packages/espresso/CHANGELOG.md b/packages/espresso/CHANGELOG.md
@@ -1,7 +1,11 @@
-## 0.4.0+13
+## 0.4.0+14
 
 * Bumps com.android.tools.build:gradle from 8.12.1 to 8.13.0.
 
+## 0.4.0+13
+
+* Bumps com.google.code.gson:gson from 2.11.0 to 2.13.2.
+
 ## 0.4.0+12
 
 * Bumps androidx.test.espresso:espresso-* from 3.6.1 to 3.7.0.
diff --git a/packages/espresso/android/build.gradle b/packages/espresso/android/build.gradle
@@ -59,7 +59,7 @@ android {
 dependencies {
     implementation 'com.google.guava:guava:33.4.8-android'
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
-    implementation 'com.google.code.gson:gson:2.11.0'
+    implementation 'com.google.code.gson:gson:2.13.2'
     androidTestImplementation 'org.hamcrest:hamcrest:3.0'
 
     testImplementation 'junit:junit:4.13.2'
diff --git a/packages/file_selector/file_selector/CHANGELOG.md b/packages/file_selector/file_selector/CHANGELOG.md
@@ -1,5 +1,6 @@
-## NEXT
+## 1.0.4
 
+* Updates the example app and README examples to work on iOS.
 * Updates minimum supported SDK version to Flutter 3.29/Dart 3.7.
 * Updates README to indicate that Andoid SDK <21 is no longer supported.
 
diff --git a/packages/file_selector/file_selector/README.md b/packages/file_selector/file_selector/README.md
@@ -38,6 +38,7 @@ Please also take a look at our [example][example] app.
 const XTypeGroup typeGroup = XTypeGroup(
   label: 'images',
   extensions: <String>['jpg', 'png'],
+  uniformTypeIdentifiers: <String>['public.jpeg', 'public.png'],
 );
 final XFile? file = await openFile(
   acceptedTypeGroups: <XTypeGroup>[typeGroup],
@@ -51,10 +52,12 @@ final XFile? file = await openFile(
 const XTypeGroup jpgsTypeGroup = XTypeGroup(
   label: 'JPEGs',
   extensions: <String>['jpg', 'jpeg'],
+  uniformTypeIdentifiers: <String>['public.jpeg'],
 );
 const XTypeGroup pngTypeGroup = XTypeGroup(
   label: 'PNGs',
   extensions: <String>['png'],
+  uniformTypeIdentifiers: <String>['public.png'],
 );
 final List<XFile> files = await openFiles(
   acceptedTypeGroups: <XTypeGroup>[jpgsTypeGroup, pngTypeGroup],
diff --git a/packages/file_selector/file_selector/example/lib/open_image_page.dart b/packages/file_selector/file_selector/example/lib/open_image_page.dart
@@ -18,6 +18,7 @@ class OpenImagePage extends StatelessWidget {
     const XTypeGroup typeGroup = XTypeGroup(
       label: 'images',
       extensions: <String>['jpg', 'png'],
+      uniformTypeIdentifiers: <String>['public.jpeg', 'public.png'],
     );
     final XFile? file = await openFile(
       acceptedTypeGroups: <XTypeGroup>[typeGroup],
diff --git a/packages/file_selector/file_selector/example/lib/open_multiple_images_page.dart b/packages/file_selector/file_selector/example/lib/open_multiple_images_page.dart
@@ -18,10 +18,12 @@ class OpenMultipleImagesPage extends StatelessWidget {
     const XTypeGroup jpgsTypeGroup = XTypeGroup(
       label: 'JPEGs',
       extensions: <String>['jpg', 'jpeg'],
+      uniformTypeIdentifiers: <String>['public.jpeg'],
     );
     const XTypeGroup pngTypeGroup = XTypeGroup(
       label: 'PNGs',
       extensions: <String>['png'],
+      uniformTypeIdentifiers: <String>['public.png'],
     );
     final List<XFile> files = await openFiles(
       acceptedTypeGroups: <XTypeGroup>[jpgsTypeGroup, pngTypeGroup],
diff --git a/packages/file_selector/file_selector/example/lib/open_text_page.dart b/packages/file_selector/file_selector/example/lib/open_text_page.dart
@@ -16,6 +16,7 @@ class OpenTextPage extends StatelessWidget {
     const XTypeGroup typeGroup = XTypeGroup(
       label: 'text',
       extensions: <String>['txt', 'json'],
+      uniformTypeIdentifiers: <String>['public.text'],
     );
     // This demonstrates using an initial directory for the prompt, which should
     // only be done in cases where the application can likely predict where the
diff --git a/packages/file_selector/file_selector/pubspec.yaml b/packages/file_selector/file_selector/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for opening and saving files, or selecting
   directories, using native file selection UI.
 repository: https://github.com/flutter/packages/tree/main/packages/file_selector/file_selector
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22
-version: 1.0.3
+version: 1.0.4
 
 environment:
   sdk: ^3.7.0
diff --git a/packages/image_picker/image_picker_android/CHANGELOG.md b/packages/image_picker/image_picker_android/CHANGELOG.md
@@ -1,7 +1,11 @@
-## 0.8.13+3
+## 0.8.13+4
 
 * Bumps com.android.tools.build:gradle from 8.12.1 to 8.13.0.
 
+## 0.8.13+3
+
+* Bumps androidx.exifinterface:exifinterface from 1.3.7 to 1.4.1.
+
 ## 0.8.13+2
 
 * Updates minimum supported SDK version to Flutter 3.35.
diff --git a/packages/image_picker/image_picker_android/android/build.gradle b/packages/image_picker/image_picker_android/android/build.gradle
@@ -37,7 +37,7 @@ android {
     dependencies {
         implementation 'androidx.core:core:1.13.1'
         implementation 'androidx.annotation:annotation:1.9.1'
-        implementation 'androidx.exifinterface:exifinterface:1.3.7'
+        implementation 'androidx.exifinterface:exifinterface:1.4.1'
         implementation 'androidx.activity:activity:1.10.1'
 
         testImplementation 'junit:junit:4.13.2'
diff --git a/packages/url_launcher/url_launcher_android/CHANGELOG.md b/packages/url_launcher/url_launcher_android/CHANGELOG.md
@@ -1,7 +1,11 @@
-## 6.3.22
+## 6.3.23
 
 * Bumps com.android.tools.build:gradle from 8.12.1 to 8.13.0.
 
+## 6.3.22
+
+* Adds support for `externalNonBrowserApplication` on API 30+.
+
 ## 6.3.21
 
 * Updates minimum supported SDK version to Flutter 3.35.
diff --git a/packages/url_launcher/url_launcher_android/android/src/main/java/io/flutter/plugins/urllauncher/Messages.java b/packages/url_launcher/url_launcher_android/android/src/main/java/io/flutter/plugins/urllauncher/Messages.java
@@ -1,7 +1,7 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// Autogenerated from Pigeon (v22.4.1), do not edit directly.
+// Autogenerated from Pigeon (v22.7.4), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 package io.flutter.plugins.urllauncher;
@@ -298,7 +298,10 @@ public interface UrlLauncherApi {
     Boolean canLaunchUrl(@NonNull String url);
     /** Opens the URL externally, returning true if successful. */
     @NonNull
-    Boolean launchUrl(@NonNull String url, @NonNull Map<String, String> headers);
+    Boolean launchUrl(
+        @NonNull String url,
+        @NonNull Map<String, String> headers,
+        @NonNull Boolean requireNonBrowser);
     /**
      * Opens the URL in an in-app Custom Tab or WebView, returning true if it opens successfully.
      */
@@ -367,8 +370,9 @@ static void setUp(
                 ArrayList<Object> args = (ArrayList<Object>) message;
                 String urlArg = (String) args.get(0);
                 Map<String, String> headersArg = (Map<String, String>) args.get(1);
+                Boolean requireNonBrowserArg = (Boolean) args.get(2);
                 try {
-                  Boolean output = api.launchUrl(urlArg, headersArg);
+                  Boolean output = api.launchUrl(urlArg, headersArg, requireNonBrowserArg);
                   wrapped.add(0, output);
                 } catch (Throwable exception) {
                   wrapped = wrapError(exception);
diff --git a/packages/url_launcher/url_launcher_android/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncher.java b/packages/url_launcher/url_launcher_android/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncher.java
@@ -10,6 +10,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.provider.Browser;
 import android.util.Log;
@@ -80,14 +81,20 @@ void setActivity(@Nullable Activity activity) {
   }
 
   @Override
-  public @NonNull Boolean launchUrl(@NonNull String url, @NonNull Map<String, String> headers) {
+  public @NonNull Boolean launchUrl(
+      @NonNull String url,
+      @NonNull Map<String, String> headers,
+      @NonNull Boolean requireNonBrowser) {
     ensureActivity();
     assert activity != null;
 
     Intent launchIntent =
         new Intent(Intent.ACTION_VIEW)
             .setData(Uri.parse(url))
             .putExtra(Browser.EXTRA_HEADERS, extractBundle(headers));
+    if (requireNonBrowser && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+      launchIntent.addFlags(Intent.FLAG_ACTIVITY_REQUIRE_NON_BROWSER);
+    }
     try {
       activity.startActivity(launchIntent);
     } catch (ActivityNotFoundException e) {
diff --git a/packages/url_launcher/url_launcher_android/android/src/test/java/io/flutter/plugins/urllauncher/UrlLauncherTest.java b/packages/url_launcher/url_launcher_android/android/src/test/java/io/flutter/plugins/urllauncher/UrlLauncherTest.java
@@ -30,6 +30,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
 public class UrlLauncherTest {
@@ -88,7 +89,7 @@ public void launch_throwsForNoCurrentActivity() {
     Messages.FlutterError exception =
         assertThrows(
             Messages.FlutterError.class,
-            () -> api.launchUrl("https://flutter.dev", new HashMap<>()));
+            () -> api.launchUrl("https://flutter.dev", new HashMap<>(), false));
     assertEquals("NO_ACTIVITY", exception.code);
   }
 
@@ -100,11 +101,30 @@ public void launch_createsIntentWithPassedUrl() {
     api.setActivity(activity);
     doThrow(new ActivityNotFoundException()).when(activity).startActivity(any());
 
-    api.launchUrl("https://flutter.dev", new HashMap<>());
+    api.launchUrl("https://flutter.dev", new HashMap<>(), false);
 
     final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
     verify(activity).startActivity(intentCaptor.capture());
     assertEquals(url, intentCaptor.getValue().getData().toString());
+    assertEquals(0, intentCaptor.getValue().getFlags() & Intent.FLAG_ACTIVITY_REQUIRE_NON_BROWSER);
+  }
+
+  @Config(minSdk = 30)
+  @Test
+  public void launch_setsRequireNonBrowserWhenRequested() {
+    Activity activity = mock(Activity.class);
+    String url = "https://flutter.dev";
+    UrlLauncher api = new UrlLauncher(ApplicationProvider.getApplicationContext());
+    api.setActivity(activity);
+    doThrow(new ActivityNotFoundException()).when(activity).startActivity(any());
+
+    api.launchUrl("https://flutter.dev", new HashMap<>(), true);
+
+    final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+    verify(activity).startActivity(intentCaptor.capture());
+    assertEquals(
+        Intent.FLAG_ACTIVITY_REQUIRE_NON_BROWSER,
+        intentCaptor.getValue().getFlags() & Intent.FLAG_ACTIVITY_REQUIRE_NON_BROWSER);
   }
 
   @Test
@@ -114,7 +134,7 @@ public void launch_returnsFalse() {
     api.setActivity(activity);
     doThrow(new ActivityNotFoundException()).when(activity).startActivity(any());
 
-    boolean result = api.launchUrl("https://flutter.dev", new HashMap<>());
+    boolean result = api.launchUrl("https://flutter.dev", new HashMap<>(), false);
 
     assertFalse(result);
   }
@@ -125,7 +145,7 @@ public void launch_returnsTrue() {
     UrlLauncher api = new UrlLauncher(ApplicationProvider.getApplicationContext());
     api.setActivity(activity);
 
-    boolean result = api.launchUrl("https://flutter.dev", new HashMap<>());
+    boolean result = api.launchUrl("https://flutter.dev", new HashMap<>(), false);
 
     assertTrue(result);
   }
diff --git a/packages/url_launcher/url_launcher_android/example/lib/main.dart b/packages/url_launcher/url_launcher_android/example/lib/main.dart
@@ -69,6 +69,17 @@ class _MyHomePageState extends State<MyHomePage> {
     }
   }
 
+  Future<void> _launchInNonBrowserExternalApp(String url) async {
+    if (!await launcher.launchUrl(
+      url,
+      const LaunchOptions(
+        mode: PreferredLaunchMode.externalNonBrowserApplication,
+      ),
+    )) {
+      throw Exception('Could not launch $url');
+    }
+  }
+
   Future<void> _launchInCustomTab(String url) async {
     if (!await launcher.launchUrl(
       url,
@@ -180,18 +191,24 @@ class _MyHomePageState extends State<MyHomePage> {
                 child: Text(toLaunch),
               ),
               ElevatedButton(
-                onPressed: _hasCustomTabSupport
-                    ? () => setState(() {
-                        _launched = _launchInBrowser(toLaunch);
-                      })
-                    : null,
+                onPressed: () => setState(() {
+                  _launched = _launchInBrowser(toLaunch);
+                }),
                 child: const Text('Launch in browser'),
               ),
-              const Padding(padding: EdgeInsets.all(16.0)),
               ElevatedButton(
                 onPressed: () => setState(() {
-                  _launched = _launchInCustomTab(toLaunch);
+                  _launched = _launchInNonBrowserExternalApp(toLaunch);
                 }),
+                child: const Text('Launch in non-browser app'),
+              ),
+              const Padding(padding: EdgeInsets.all(16.0)),
+              ElevatedButton(
+                onPressed: _hasCustomTabSupport
+                    ? () => setState(() {
+                        _launched = _launchInCustomTab(toLaunch);
+                      })
+                    : null,
                 child: const Text('Launch in Android Custom Tab'),
               ),
               const Padding(padding: EdgeInsets.all(16.0)),
diff --git a/packages/url_launcher/url_launcher_android/lib/src/messages.g.dart b/packages/url_launcher/url_launcher_android/lib/src/messages.g.dart
@@ -1,7 +1,7 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// Autogenerated from Pigeon (v22.4.1), do not edit directly.
+// Autogenerated from Pigeon (v22.7.4), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers
 
@@ -142,7 +142,11 @@ class UrlLauncherApi {
   }
 
   /// Opens the URL externally, returning true if successful.
-  Future<bool> launchUrl(String url, Map<String, String> headers) async {
+  Future<bool> launchUrl(
+    String url,
+    Map<String, String> headers,
+    bool requireNonBrowser,
+  ) async {
     final String pigeonVar_channelName =
         'dev.flutter.pigeon.url_launcher_android.UrlLauncherApi.launchUrl$pigeonVar_messageChannelSuffix';
     final BasicMessageChannel<Object?> pigeonVar_channel =
@@ -152,7 +156,8 @@ class UrlLauncherApi {
           binaryMessenger: pigeonVar_binaryMessenger,
         );
     final List<Object?>? pigeonVar_replyList =
-        await pigeonVar_channel.send(<Object?>[url, headers]) as List<Object?>?;
+        await pigeonVar_channel.send(<Object?>[url, headers, requireNonBrowser])
+            as List<Object?>?;
     if (pigeonVar_replyList == null) {
       throw _createConnectionError(pigeonVar_channelName);
     } else if (pigeonVar_replyList.length > 1) {
diff --git a/packages/url_launcher/url_launcher_android/lib/url_launcher_android.dart b/packages/url_launcher/url_launcher_android/lib/url_launcher_android.dart
diff --git a/packages/url_launcher/url_launcher_android/pigeons/messages.dart b/packages/url_launcher/url_launcher_android/pigeons/messages.dart
diff --git a/packages/url_launcher/url_launcher_android/test/url_launcher_android_test.dart b/packages/url_launcher/url_launcher_android/test/url_launcher_android_test.dart

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-f331a555e20cf7c3db78c72d55ca046eadf0ebcd`
	`1`	`+8d0b31d81a02d13ee37d17c9387d7bbcd1c2baba`