Refactoring

lib/content_views/approach_area_page.dart

@@ -10,7 +10,7 @@ import 'package:stadtbote/popups/tasks_popups/zip_popup.dart';
 import 'package:stadtbote/protocoll_messages/zip_message.dart';
 import 'package:stadtbote/tools/constants.dart';
 import 'package:stadtbote/tools/message_service.dart';
-import 'package:stadtbote/tools/messages/PublishPayloadMessage.dart';
+import 'package:stadtbote/tools/messages/publish_payload_message.dart';
 import 'package:stadtbote/tools/messages/ranking_updated.dart';
 import 'package:stadtbote/tools/mqtt_core.dart';
 

lib/content_views/assigned_jobs_page.dart

@@ -10,7 +10,7 @@ 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/PublishPayloadMessage.dart';
+import 'package:stadtbote/tools/messages/publish_payload_message.dart';
 import 'package:stadtbote/tools/messages/refresh_badges_message.dart';
 import 'package:stadtbote/tools/mqtt_core.dart';
 

lib/content_views/main_page.dart

@@ -14,7 +14,7 @@ import 'package:stadtbote/model/location_status.dart';
 import 'package:stadtbote/popups/infos_popup.dart';
 import 'package:stadtbote/protocoll_messages/logout_message.dart';
 import 'package:stadtbote/tools/message_service.dart';
-import 'package:stadtbote/tools/messages/PublishPayloadMessage.dart';
+import 'package:stadtbote/tools/messages/publish_payload_message.dart';
 import 'package:stadtbote/tools/messages/connect_client_message.dart';
 import 'package:stadtbote/tools/messages/disconnect_client_message.dart';
 import 'package:stadtbote/tools/messages/job_deleted_message.dart';

lib/content_views/messages_page.dart

@@ -12,7 +12,7 @@ import 'package:stadtbote/model/message.dart';
 import 'package:stadtbote/model/session_status.dart';
 import 'package:stadtbote/tools/constants.dart';
 import 'package:stadtbote/tools/message_service.dart';
-import 'package:stadtbote/tools/messages/PublishPayloadMessage.dart';
+import 'package:stadtbote/tools/messages/publish_payload_message.dart';
 import 'package:stadtbote/tools/mqtt_core.dart';
 
 import '../tools/util.dart';

lib/content_views/task_list_page.dart

@@ -23,7 +23,7 @@ import 'package:stadtbote/protocoll_messages/fin_tour_message.dart';
 import 'package:stadtbote/protocoll_messages/pic_message.dart';
 import 'package:stadtbote/tools/constants.dart';
 import 'package:stadtbote/tools/message_service.dart';
-import 'package:stadtbote/tools/messages/PublishPayloadMessage.dart';
+import 'package:stadtbote/tools/messages/publish_payload_message.dart';
 
 import '../main.dart';
 import '../model/task_info.dart';

lib/popups/accept_jobs_popup.dart

@@ -16,7 +16,7 @@ import 'package:stadtbote/tools/mqtt_core.dart';
 import 'package:stadtbote/tools/util.dart';
 import 'package:badges/badges.dart' as badges;
 
-import '../tools/messages/PublishPayloadMessage.dart';
+import '../tools/messages/publish_payload_message.dart';
 
 Future<void> showAcceptJobsPopup(BuildContext context, List<Job> jobs, Function() onFinished) async {
   var jobsSet = jobs.toSet();

lib/tools/mqtt_core.dart

@@ -20,12 +20,13 @@ import 'package:stadtbote/protocoll_messages/bootstrap_response_payload.dart';
 import 'package:stadtbote/protocoll_messages/device_log_request.dart';
 import 'package:stadtbote/protocoll_messages/device_log_response.dart';
 import 'package:stadtbote/protocoll_messages/device_object.dart';
+import 'package:stadtbote/protocoll_messages/payload_container.dart';
 import 'package:stadtbote/protocoll_messages/start_session_message.dart';
 import 'package:stadtbote/protocoll_messages/sync_jobs_message.dart';
 import 'package:stadtbote/protocoll_messages/track_message.dart';
 import 'package:stadtbote/tools/connection_status.dart';
 import 'package:stadtbote/tools/message_service.dart';
-import 'package:stadtbote/tools/messages/PublishPayloadMessage.dart';
+import 'package:stadtbote/tools/messages/publish_payload_message.dart';
 import 'package:stadtbote/tools/messages/connect_client_message.dart';
 import 'package:stadtbote/tools/messages/current_connection_status_message.dart';
 import 'package:stadtbote/tools/messages/disconnect_client_message.dart';
@@ -474,7 +475,7 @@ class MqttCore {
       answer.sync.jobs.add(syncJob);
     }
 
-    publishPayloadMessage("sync_request_response", jsonEncode(answer.toJson()));
+    publishPayloadMessage("sync_request_response", answer.toJson());
   }
 
   void _startTrackTimer() {
@@ -488,7 +489,7 @@ class MqttCore {
         trackMessage.pos!.long = position.longitude;
         trackMessage.pos!.acc = position.accuracy.toInt();
 
-        publishMessage("track", jsonEncode(trackMessage.toJson()));
+        publishPayloadMessage("track", trackMessage.toJson());
       }
     });
   }
@@ -515,7 +516,7 @@ class MqttCore {
     if (enqueuedMessages.isNotEmpty) {
       for (var enqueuedMessage in enqueuedMessages) {
         try {
-          publishMessage(enqueuedMessage.topic, enqueuedMessage.payload);
+          publishText(enqueuedMessage.topic, enqueuedMessage.payload);
 
           await MyApp.isarInstance.writeTxn(() async {
             await MyApp.isarInstance.enqueuedMessages.delete(enqueuedMessage.id);