🐛 Handle exceptions after all flows (#216)

fluttercandies · Oct 28, 2023 · dd11736 · dd11736
1 parent 9bcd0ed
commit dd11736
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,12 @@ that can be found in the LICENSE file. -->
 
 See the [Migration Guide](guides/migration_guide.md) for the details of breaking changes between versions.
 
+## 4.0.4
+
+### Fixes
+
+- Handle exceptions after all flows.
+
 ## 4.0.3
 
 ### Fixes

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -1,6 +1,6 @@
 name: wechat_camera_picker_demo
 description: A new Flutter project.
-version: 4.0.3+28
+version: 4.0.4+29
 publish_to: none
 
 environment:

diff --git a/lib/src/states/camera_picker_state.dart b/lib/src/states/camera_picker_state.dart
@@ -343,6 +343,7 @@ class CameraPickerState extends State<CameraPicker>
           StackTrace.current,
           pickerConfig.onError,
         );
+        return;
       }
 
       initFlashModesForCameras();
@@ -622,9 +623,10 @@ class CameraPickerState extends State<CameraPicker>
       await controller.setExposureMode(newMode);
     } catch (e, s) {
       handleErrorWithHandler(e, s, pickerConfig.onError);
+    } finally {
+      restartExposureModeDisplayTimer();
+      restartExposureFadeOutTimer();
     }
-    restartExposureModeDisplayTimer();
-    restartExposureFadeOutTimer();
   }
 
   /// Use the [position] to set exposure and focus.
@@ -714,17 +716,18 @@ class CameraPickerState extends State<CameraPicker>
         ),
       );
     } catch (e, s) {
-      handleErrorWithHandler(e, s, pickerConfig.onError);
       hasError = true;
       currentExposureSliderOffset.value = previousSliderOffsetValue;
       currentExposureOffset.value = previousOffsetValue;
+      handleErrorWithHandler(e, s, pickerConfig.onError);
+    } finally {
+      if (!hasError && !isFocusPointDisplays.value) {
+        isFocusPointDisplays.value = true;
+      }
+      restartExposurePointDisplayTimer();
+      restartExposureModeDisplayTimer();
+      restartExposureFadeOutTimer();
     }
-    if (!hasError && !isFocusPointDisplays.value) {
-      isFocusPointDisplays.value = true;
-    }
-    restartExposurePointDisplayTimer();
-    restartExposureModeDisplayTimer();
-    restartExposureFadeOutTimer();
   }
 
   /// Request to set the focus and the exposure point on the [localPosition],
@@ -897,8 +900,9 @@ class CameraPickerState extends State<CameraPicker>
         recordCountdownTimer?.cancel();
         isShootingButtonAnimate = false;
         handleErrorWithHandler(e, s, pickerConfig.onError);
+      } finally {
+        recordStopwatch.stop();
       }
-      recordStopwatch.stop();
     } finally {
       safeSetState(() {});
     }
@@ -945,9 +949,9 @@ class CameraPickerState extends State<CameraPicker>
         await controller.resumePreview();
       }
     } catch (e, s) {
-      handleErrorWithHandler(e, s, pickerConfig.onError);
       handleError();
       initCameras();
+      handleErrorWithHandler(e, s, pickerConfig.onError);
     } finally {
       isControllerBusy = false;
       safeSetState(() {});

diff --git a/lib/src/states/camera_picker_viewer_state.dart b/lib/src/states/camera_picker_viewer_state.dart
@@ -15,6 +15,7 @@ import '../constants/constants.dart';
 import '../constants/enums.dart';
 import '../constants/styles.dart';
 import '../constants/type_defs.dart';
+import '../internals/extensions.dart';
 import '../internals/methods.dart';
 import '../widgets/camera_picker.dart';
 import '../widgets/camera_picker_viewer.dart';
@@ -83,9 +84,7 @@ class CameraPickerViewerState extends State<CameraPickerViewer> {
       realDebugPrint('Error when initializing video controller: $e');
       handleErrorWithHandler(e, s, onError);
     } finally {
-      if (mounted) {
-        setState(() {});
-      }
+      safeSetState(() {});
     }
   }
 
@@ -141,12 +140,11 @@ class CameraPickerViewerState extends State<CameraPickerViewer> {
         );
       } catch (e, s) {
         handleErrorWithHandler(e, s, onError);
+      } finally {
+        safeSetState(() {
+          isSavingEntity = false;
+        });
       }
-      isSavingEntity = false;
-      if (mounted) {
-        setState(() {});
-      }
-      return;
     }
     AssetEntity? entity;
     try {
@@ -184,7 +182,9 @@ class CameraPickerViewerState extends State<CameraPickerViewer> {
       realDebugPrint('Saving entity failed: $e');
       handleErrorWithHandler(e, s, onError);
     } finally {
-      isSavingEntity = false;
+      safeSetState(() {
+        isSavingEntity = false;
+      });
       if (mounted) {
         Navigator.of(context).pop(entity);
       }

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: wechat_camera_picker
-version: 4.0.3
+version: 4.0.4
 description: |
   A camera picker for Flutter projects based on WeChat's UI,
   which is also a separate runnable extension to the