#454

lib/content_views/assigned_jobs_page.dart

@@ -7,6 +7,8 @@ import 'package:intl/intl.dart';
 import 'package:badges/badges.dart' as badges;
 import 'package:stadtbote/protocoll_messages/accept_job_message.dart';
 import 'package:stadtbote/protocoll_messages/fin_task_message.dart';
+import 'package:stadtbote/tools/message_service.dart';
+import 'package:stadtbote/tools/messages/job_deleted_message.dart';
 import 'package:stadtbote/tools/mqtt_core.dart';
 
 import '../main.dart';
@@ -49,6 +51,8 @@ class _AssignedJobsPageState extends State<AssignedJobsPage> {
     Future.delayed(const Duration(seconds: 0), () async {
       _entries = await _createListEntries();
 
+      _initMessages();
+
       _initCompleted = true;
 
       setState(() {});
@@ -208,4 +212,12 @@ class _AssignedJobsPageState extends State<AssignedJobsPage> {
 
     setState(() {});
   }
+
+  _initMessages() {
+    MessageService().subscribe<JobDeletedMessage>(Constants.messageTopicJobDeleted, this, (jobDeletedMessage) async {
+      _entries = await _createListEntries();
+
+      setState(() {});
+    });
+  }
 }

lib/main.dart

@@ -153,6 +153,8 @@ class _MainState extends State<Main> with SingleTickerProviderStateMixin {
   late AnimationController _animationController;
   late Animation<double> _animation;
 
+  bool _dialogOpened = false;
+
   @override
   void initState() {
     super.initState();
@@ -423,7 +425,13 @@ class _MainState extends State<Main> with SingleTickerProviderStateMixin {
   void _jobReceived(Job job) async {
     if (!MyApp.suppressAcceptDialog) {
       if (job.state == 0) {
-        await showAcceptJobsPopup(context, await MyApp.isarInstance.jobs.filter().stateEqualTo(0).findAll());
+        if (!_dialogOpened) {
+          _dialogOpened = true;
+
+          await showAcceptJobsPopup(context, await MyApp.isarInstance.jobs.filter().stateEqualTo(0).findAll(), () {
+            _dialogOpened = false;
+          });
+        }
       }
     }
   }

lib/popups/accept_jobs_popup.dart

@@ -6,25 +6,50 @@ import 'package:stadtbote/protocoll_messages/accept_job_message.dart';
 import 'package:stadtbote/model/job.dart';
 import 'package:stadtbote/protocoll_messages/fin_task_message.dart';
 import 'package:stadtbote/tools/constants.dart';
+import 'package:stadtbote/tools/message_service.dart';
+import 'package:stadtbote/tools/messages/job_deleted_message.dart';
+import 'package:stadtbote/tools/messages/job_received_message.dart';
 import 'package:stadtbote/tools/mqtt_core.dart';
 import 'package:stadtbote/tools/util.dart';
 import 'package:badges/badges.dart' as badges;
 
-Future<void> showAcceptJobsPopup(BuildContext context, List<Job> jobs) async {
+Future<void> showAcceptJobsPopup(BuildContext context, List<Job> jobs, Function onFinished) async {
   var jobsSet = jobs.toSet();
 
   await showDialog<void>(
       context: context,
       builder: (BuildContext context) {
-        return AlertDialog(
+        return WillPopScope(
+            onWillPop: () async {
+              Navigator.of(context).pop();
+
+              onFinished();
+
+              return true;
+            }, // False will prevent and true will allow to dismiss
+            child: AlertDialog(
                 contentPadding: EdgeInsets.zero,
                 shadowColor: Colors.transparent,
                 backgroundColor: Colors.white,
                 content: StatefulBuilder(builder: (BuildContext context, StateSetter setState) {
                   if (jobsSet.isEmpty) {
                     Navigator.of(context).pop();
+
+                    onFinished();
                   }
 
+                  MessageService().subscribe<JobDeletedMessage>(Constants.messageTopicJobDeleted, jobsSet, (jobDeletedMessage) async {
+                    jobsSet.removeWhere((element) => element.id == jobDeletedMessage.jobId);
+
+                    setState(() {});
+                  });
+
+                  MessageService().subscribe<JobReceivedMessage>(Constants.messageTopicJobReceived, jobsSet, (jobdMessage) async {
+                    jobsSet.add(jobdMessage.job);
+
+                    setState(() {});
+                  });
+
                   return SizedBox(
                     key: GlobalKey(),
                     height: MediaQuery.of(context).size.height * 1,
@@ -153,7 +178,7 @@ Future<void> showAcceptJobsPopup(BuildContext context, List<Job> jobs) async {
                           },
                         )),
                   );
-            }));
+                })));
       });
 }
 

lib/tools/mqtt_core.dart

@@ -196,9 +196,7 @@ class MqttCore {
                   break;
 
                 case 'job_del':
-                  if (!kDebugMode) {
                   _jobDeleteReceived(payloadData);
-                  }
                   break;
 
                 case 'sync_request':
@@ -291,12 +289,8 @@ class MqttCore {
     }
   }
 
-  void _jobDeleteReceived(List<dynamic> payloadData) async {
+  void _jobDeleteReceived(payloadData) async {
-    Map<String, dynamic> map = {};
+    for(var jobId in payloadData) {
-    map["jobDel"] = payloadData;
-    var jobDelMessage = JobDelMessage.fromJson(map);
-
-    for(var jobId in jobDelMessage.jobDel) {
       await MyApp.isarInstance.writeTxn(() async {
         await MyApp.isarInstance.jobs.delete(jobId);
       });

lib/tools/util.dart

@@ -72,12 +72,16 @@ class Util {
     return currentUuid;
   }
 
+  static _printLongText(String text) {
+    final pattern = RegExp('.{1,800}'); // 800 is the size of each chunk
+    pattern.allMatches(text).forEach((match) => debugPrint(match.group(0)));
+  }
   static logInfo(String message) {
-    debugPrint(message);
+    _printLongText(message);
   }
 
   static logException(String message) {
-    debugPrint('Exception: $message');
+    _printLongText(message);
   }
 
   static int fastHash(String string) {