🐛 Use PermissionRequestOption as much as possible (fluttercandies#544)

Fixes fluttercandies#540
farmako · Feb 6, 2024 · 346fecb · 346fecb
1 parent eaab93c
commit 346fecb
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ that can be found in the LICENSE file. -->
 ### Fixes
 
 - Fix previewing selected assets behavior.
+- Use `PermissionRequestOption` as much as possible.
 
 ## 9.0.0-dev.2
 

diff --git a/lib/src/delegates/asset_picker_delegate.dart b/lib/src/delegates/asset_picker_delegate.dart
@@ -66,17 +66,19 @@ class AssetPickerDelegate {
     BuildContext context, {
     Key? key,
     AssetPickerConfig pickerConfig = const AssetPickerConfig(),
+    PermissionRequestOption? permissionRequestOption,
     bool useRootNavigator = true,
     AssetPickerPageRouteBuilder<List<AssetEntity>>? pageRouteBuilder,
   }) async {
-    final PermissionState ps = await permissionCheck(
-      requestOption: PermissionRequestOption(
-        androidPermission: AndroidPermission(
-          type: pickerConfig.requestType,
-          mediaLocation: false,
-        ),
+    permissionRequestOption ??= PermissionRequestOption(
+      androidPermission: AndroidPermission(
+        type: pickerConfig.requestType,
+        mediaLocation: false,
       ),
     );
+    final PermissionState ps = await permissionCheck(
+      requestOption: permissionRequestOption,
+    );
     final AssetPickerPageRoute<List<AssetEntity>> route =
         pageRouteBuilder?.call(const SizedBox.shrink()) ??
             AssetPickerPageRoute<List<AssetEntity>>(

diff --git a/lib/src/widget/asset_picker.dart b/lib/src/widget/asset_picker.dart
@@ -41,6 +41,7 @@ class AssetPicker<Asset, Path> extends StatefulWidget {
   static Future<List<AssetEntity>?> pickAssets(
     BuildContext context, {
     Key? key,
+    PermissionRequestOption? permissionRequestOption,
     AssetPickerConfig pickerConfig = const AssetPickerConfig(),
     bool useRootNavigator = true,
     AssetPickerPageRouteBuilder<List<AssetEntity>>? pageRouteBuilder,
@@ -49,6 +50,7 @@ class AssetPicker<Asset, Path> extends StatefulWidget {
       context,
       key: key,
       pickerConfig: pickerConfig,
+      permissionRequestOption: permissionRequestOption,
       useRootNavigator: useRootNavigator,
       pageRouteBuilder: pageRouteBuilder,
     );
@@ -58,15 +60,18 @@ class AssetPicker<Asset, Path> extends StatefulWidget {
   static Future<List<Asset>?> pickAssetsWithDelegate<Asset, Path,
       PickerProvider extends AssetPickerProvider<Asset, Path>>(
     BuildContext context, {
-    Key? key,
     required AssetPickerBuilderDelegate<Asset, Path> delegate,
-    bool useRootNavigator = true,
+    PermissionRequestOption permissionRequestOption =
+        const PermissionRequestOption(),
+    Key? key,
     AssetPickerPageRouteBuilder<List<Asset>>? pageRouteBuilder,
+    bool useRootNavigator = true,
   }) {
     return _pickerDelegate.pickAssetsWithDelegate<Asset, Path, PickerProvider>(
       context,
       key: key,
       delegate: delegate,
+      permissionRequestOption: permissionRequestOption,
       useRootNavigator: useRootNavigator,
       pageRouteBuilder: pageRouteBuilder,
     );

diff --git a/test/test_utils.dart b/test/test_utils.dart
@@ -84,17 +84,19 @@ class TestAssetPickerDelegate extends AssetPickerDelegate {
     BuildContext context, {
     Key? key,
     AssetPickerConfig pickerConfig = const AssetPickerConfig(),
+    PermissionRequestOption? permissionRequestOption,
     bool useRootNavigator = true,
     AssetPickerPageRouteBuilder<List<AssetEntity>>? pageRouteBuilder,
   }) async {
-    final PermissionState ps = await permissionCheck(
-      requestOption: PermissionRequestOption(
-        androidPermission: AndroidPermission(
-          type: pickerConfig.requestType,
-          mediaLocation: false,
-        ),
+    permissionRequestOption ??= PermissionRequestOption(
+      androidPermission: AndroidPermission(
+        type: pickerConfig.requestType,
+        mediaLocation: false,
       ),
     );
+    final PermissionState ps = await permissionCheck(
+      requestOption: permissionRequestOption,
+    );
     final AssetPathEntity pathEntity = AssetPathEntity(
       id: 'test',
       name: 'pathEntity',