Erweiterungen

lib/content_views/task_list_page.dart

@@ -449,23 +449,22 @@ class _TaskListPageState extends State<TaskListPage> {
   }
 
   _sendArrivedMessage(TaskInfo taskInfo) {
-    var finTaskMessage = FinTaskMessage();
-    finTaskMessage.finTask = FinTask();
-    finTaskMessage.finTask.trId = widget.tour.id;
-    finTaskMessage.finTask.task = Task();
-    finTaskMessage.finTask.task.sId = taskInfo.task.sId;
-    finTaskMessage.finTask.task.time = DateTime.now().toIso8601String();
+    var message = FinTask();
+    message.trId = widget.tour.id;
+    message.task = Task();
+    message.task.sId = taskInfo.task.sId;
+    message.task.time = DateTime.now().toIso8601String();
 
     var position = MyApp.currentPosition;
     if (position != null) {
-      finTaskMessage.finTask.task.pos = FinTaskPos();
-      finTaskMessage.finTask.task.pos!.lat = position.latitude;
-      finTaskMessage.finTask.task.pos!.long = position.longitude;
+      message.task.pos = FinTaskPos();
+      message.task.pos!.lat = position.latitude;
+      message.task.pos!.long = position.longitude;
     } else {
-      finTaskMessage.finTask.task.pos = null;
+      message.task.pos = null;
     }
 
-    MessageService().publish<PublishPayloadMessage>(Constants.messageTopicPublishPayload, arguments: PublishPayloadMessage(topic: "job", message: finTaskMessage.toJson()));
+    MessageService().publish<PublishPayloadMessage>(Constants.messageTopicPublishPayload, arguments: PublishPayloadMessage(topic: "fin_task", message: message.toJson()));
   }
 
   FinTourTask _createAnswerHeader(TaskInfo taskInfo) {

lib/tools/mqtt_core.dart

@@ -321,11 +321,15 @@ class MqttCore {
 
   void _jobDeleteReceived(payloadData) async {
     var jobDelMessage = JobDelMessage.fromJson(payloadData);
-    await MyApp.isarInstance.writeTxn(() async {
-      await MyApp.isarInstance.jobs.delete(jobDelMessage.id);
-    });
 
-    MessageService().publish<JobDeletedMessage>(Constants.messageTopicJobDeleted, arguments: JobDeletedMessage(id: jobDelMessage.id));
+    var foundJobs = await MyApp.isarInstance.jobs.where().filter().idEqualTo(jobDelMessage.id).findAll();
+    if (foundJobs.isNotEmpty) {
+      await MyApp.isarInstance.writeTxn(() async {
+        await MyApp.isarInstance.jobs.delete(jobDelMessage.id);
+      });
+
+      MessageService().publish<JobDeletedMessage>(Constants.messageTopicJobDeleted, arguments: JobDeletedMessage(id: jobDelMessage.id));
+    }
   }
 
   void _syncRequestReceived(payloadData) async {