🐛 Fix onEntitySaving not returned after called (#223)

Fixes #222 (cherry picked from commit 9224ad0)
fluttercandies · Nov 17, 2023 · 1472184 · 1472184
1 parent 2203168
commit 1472184
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/lib/src/states/camera_picker_viewer_state.dart b/lib/src/states/camera_picker_viewer_state.dart
@@ -130,7 +130,8 @@ class CameraPickerViewerState extends State<CameraPickerViewer> {
     setState(() {
       isSavingEntity = true;
     });
-    final CameraPickerViewType viewType = widget.viewType;
+
+    // Handle the explicitly entity saving method.
     if (widget.pickerConfig.onEntitySaving != null) {
       try {
         await widget.pickerConfig.onEntitySaving!(
@@ -145,12 +146,14 @@ class CameraPickerViewerState extends State<CameraPickerViewer> {
           isSavingEntity = false;
         });
       }
+      return;
     }
+
     AssetEntity? entity;
     try {
       final PermissionState ps = await PhotoManager.requestPermissionExtend();
       if (ps == PermissionState.authorized || ps == PermissionState.limited) {
-        switch (viewType) {
+        switch (widget.viewType) {
           case CameraPickerViewType.image:
             final String filePath = previewFile.path;
             entity = await PhotoManager.editor.saveImageWithPath(
@@ -167,7 +170,10 @@ class CameraPickerViewerState extends State<CameraPickerViewer> {
         }
         if (widget.pickerConfig.shouldDeletePreviewFile &&
             previewFile.existsSync()) {
-          previewFile.delete();
+          previewFile.delete().catchError((e, s) {
+            handleErrorWithHandler(e, s, onError);
+            return previewFile;
+          });
         }
         return;
       }