Fehlerkorrekturen und Erweiterungen

lib/content_views/task_list_page.dart

@@ -258,7 +258,8 @@ class _TaskListPageState extends State<TaskListPage> with ProducerMixin {
     Util.logInfo('Task ${taskInfo.task.sId} called');
 
     if (!mounted) return;
-    showTaskArrivedPopup(context, taskInfo, () async {
+    final currentContext = context;
+    showTaskArrivedPopup(currentContext, taskInfo, () async {
       DateFormat dateFormat = DateFormat("dd.MM.yyyy HH:mm");
 
       var answer = await _createAnswerHeader(taskInfo);
@@ -281,7 +282,8 @@ class _TaskListPageState extends State<TaskListPage> with ProducerMixin {
     Util.logInfo('Task ${taskInfo.task.sId} called');
 
     if (!mounted) return;
-    showComissionNumberPopup(context, taskInfo, (comissionNumber) async {
+    final currentContext = context;
+    showComissionNumberPopup(currentContext, taskInfo, (comissionNumber) async {
       var answer = await _createAnswerHeader(taskInfo);
       answer.val = comissionNumber;
 
@@ -323,7 +325,8 @@ class _TaskListPageState extends State<TaskListPage> with ProducerMixin {
     Util.logInfo('Task ${taskInfo.task.sId} called');
 
     if (!mounted) return;
-    showTakePhotosPopup(context, taskInfo, (List<Uint8List>? photos) async {
+    final currentContext = context;
+    showTakePhotosPopup(currentContext, taskInfo, (List<Uint8List>? photos) async {
       if (photos != null) {
         await MyApp.isarInstance.writeTxn(() async {
           await MyApp.isarInstance.pictures.filter().tourIdEqualTo(widget.tour.id).deleteAll();
@@ -354,7 +357,9 @@ class _TaskListPageState extends State<TaskListPage> with ProducerMixin {
   void _processStationNotice(TaskInfo taskInfo) {
     Util.logInfo('Task ${taskInfo.task.sId} called');
 
-    showStationNoticePopup(context, taskInfo, (notice) async {
+    if (!mounted) return;
+    final currentContext = context;
+    showStationNoticePopup(currentContext, taskInfo, (notice) async {
       var answer = await _createAnswerHeader(taskInfo);
       answer.val = notice;
 
@@ -364,7 +369,9 @@ class _TaskListPageState extends State<TaskListPage> with ProducerMixin {
 
       _finishTaskProcessing(taskInfo);
 
-      setState(() {});
+      if (mounted) {
+        setState(() {});
+      }
     });
   }
 
@@ -372,7 +379,8 @@ class _TaskListPageState extends State<TaskListPage> with ProducerMixin {
     Util.logInfo('Task ${taskInfo.task.sId} called');
 
     if (!mounted) return;
-    showReceiptGiverPopup(context, taskInfo, (receiptGiver, selectedTourEntry) async {
+    final currentContext = context;
+    showReceiptGiverPopup(currentContext, taskInfo, (receiptGiver, selectedTourEntry) async {
       var answer = await _createAnswerHeader(taskInfo);
       answer.code = selectedTourEntry.code;
       answer.val = receiptGiver;

lib/popups/tasks_popups/arrived_popup.dart

@@ -8,7 +8,7 @@ showTaskArrivedPopup(BuildContext context, TaskInfo taskInfo, Function() onFinis
       builder: (BuildContext context) {
         return PopScope(
             canPop: false,
-            onPopInvoked: (bool didPop) async {
+            onPopInvokedWithResult: (bool didPop, dynamic result) async {
               if (!didPop) {
                 final shouldPop = await taskDialogSecurityException(context);
                 if (shouldPop && context.mounted) {

lib/popups/tasks_popups/commision_number_popup.dart

@@ -9,7 +9,7 @@ showComissionNumberPopup(BuildContext context, TaskInfo taskInfo, Function(Strin
       builder: (BuildContext context) {
         return PopScope(
             canPop: false,
-            onPopInvoked: (bool didPop) async {
+            onPopInvokedWithResult: (bool didPop, dynamic result) async {
               if (!didPop) {
                 final shouldPop = await taskDialogSecurityException(context);
                 if (shouldPop && context.mounted) {

lib/popups/tasks_popups/pickup_delivery_status_popup.dart

@@ -20,7 +20,7 @@ showPickupDeliveryStatusPopup(BuildContext context, TaskInfo taskInfo, Function(
 
         return PopScope(
             canPop: false,
-            onPopInvoked: (bool didPop) async {
+            onPopInvokedWithResult: (bool didPop, dynamic result) async {
               if (!didPop) {
                 final shouldPop = await taskDialogSecurityException(context);
                 if (shouldPop && context.mounted) {

lib/popups/tasks_popups/receipt_giver_popup.dart

@@ -19,7 +19,7 @@ showReceiptGiverPopup(BuildContext context, TaskInfo taskInfo, Function(String,
       builder: (BuildContext context) {
         return PopScope(
             canPop: false,
-            onPopInvoked: (bool didPop) async {
+            onPopInvokedWithResult: (bool didPop, dynamic result) async {
               if (!didPop) {
                 final shouldPop = await taskDialogSecurityException(context);
                 if (shouldPop && context.mounted) {

lib/popups/tasks_popups/signature_popup.dart

@@ -10,7 +10,7 @@ showSignaturePopup(BuildContext context, TaskInfo taskInfo, Function(String?) on
       builder: (BuildContext context) {
         return PopScope(
             canPop: false,
-            onPopInvoked: (bool didPop) async {
+            onPopInvokedWithResult: (bool didPop, dynamic result) async {
               if (!didPop) {
                 final shouldPop = await taskDialogSecurityException(context);
                 if (shouldPop) {

lib/popups/tasks_popups/station_notice_popup.dart

@@ -9,7 +9,7 @@ showStationNoticePopup(BuildContext context, TaskInfo taskInfo, Function(String)
     builder: (BuildContext context) {
       return PopScope(
           canPop: false,
-          onPopInvoked: (bool didPop) async {
+          onPopInvokedWithResult: (bool didPop, dynamic result) async {
             if (!didPop) {
               final shouldPop = await taskDialogSecurityException(context);
               if (shouldPop && context.mounted) {

lib/popups/tasks_popups/take_photos_popup.dart

@@ -18,7 +18,7 @@ Future<void> showTakePhotosPopup(BuildContext context, TaskInfo taskInfo, Functi
       builder: (BuildContext context) {
         return PopScope(
             canPop: false,
-            onPopInvoked: (bool didPop) async {
+            onPopInvokedWithResult: (bool didPop, dynamic result) async {
               if (!didPop) {
                 final shouldPop = await taskDialogSecurityException(context);
                 if (shouldPop && context.mounted) {

lib/popups/tasks_popups/zip_popup.dart

@@ -7,7 +7,7 @@ showZipPopup(BuildContext context, String text, String buttonText, Function(Stri
       builder: (BuildContext context) {
         return PopScope(
             canPop: false,
-            onPopInvoked: (bool didPop) async {
+            onPopInvokedWithResult: (bool didPop, dynamic result) async {
               if (!didPop) {
                 final shouldPop = await taskDialogSecurityException(context);
                 if (shouldPop && context.mounted) {