Refactoring

lib/content_views/approach_area_page.dart

@@ -10,6 +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/ranking_updated.dart';
 import 'package:stadtbote/tools/mqtt_core.dart';
 
@@ -190,10 +191,7 @@ class _ApproachAreaPageState extends State<ApproachAreaPage> {
       setPosMessage.track!.pos!.acc = position.accuracy.toInt();
     }
 
-    var json = jsonEncode(setPosMessage.toJson());
-    Util.logInfo(json);
-
-    MqttCore.instance.publishMessage("set_zip", jsonEncode(setPosMessage.toJson()));
+    MessageService().publish<PublishPayloadMessage>(Constants.messageTopicPublishPayload, arguments: PublishPayloadMessage(topic: "rank", message: setPosMessage.toJson()));
   }
 
   _initMessages() {

lib/content_views/assigned_jobs_page.dart

@@ -10,6 +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/refresh_badges_message.dart';
 import 'package:stadtbote/tools/mqtt_core.dart';
 
@@ -200,13 +201,13 @@ class _AssignedJobsPageState extends State<AssignedJobsPage> {
     message.track.pos!.long = currentPosition != null ? currentPosition.longitude : 0.0;
     message.track.pos!.acc = currentPosition != null ? currentPosition.accuracy.toInt() : 0;
 
-    MqttCore.instance.publishMessage("reaction", jsonEncode(message.toJson()));
+    MessageService().publish<PublishPayloadMessage>("reaction", arguments: PublishPayloadMessage(topic: "reaction", message: message.toJson()));
 
     await MyApp.isarInstance.writeTxn(() async {
       await MyApp.isarInstance.jobs.delete(job.id);
     });
 
-    MessageService().publish(Constants.messageTopicRefreshBadges, arguments: RefreshBadgesMessage());
+    MessageService().publish<RefreshBadgesMessage>(Constants.messageTopicUpdateBadges, arguments: RefreshBadgesMessage());
 
     _entries = await _createListEntries();
 

lib/content_views/main_page.dart

@@ -16,6 +16,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/job_deleted_message.dart';
 import 'package:stadtbote/tools/messages/job_received_message.dart';
 import 'package:stadtbote/tools/messages/message_message.dart';
@@ -280,7 +281,7 @@ class _MainPageState extends State<MainPage> {
       _refreshBadges();
     });
 
-    MessageService().subscribe<RefreshBadgesMessage>(Constants.messageTopicRefreshBadges, this, (RefreshBadgesMessage message) {
+    MessageService().subscribe<RefreshBadgesMessage>(Constants.messageTopicUpdateBadges, this, (RefreshBadgesMessage message) {
       _refreshBadges();
     });
   }
@@ -318,7 +319,7 @@ class _MainPageState extends State<MainPage> {
     if (!_loggedOut) {
       showLogoutAlertDialog(context);
     } else {
-      MqttCore.setup();
+      MessageService().publish<ConnectClientMessage>(Constants.messageTopicConnectClient, arguments: ConnectClientMessage());
 
       _loggedOut = false;
 
@@ -334,7 +335,7 @@ class _MainPageState extends State<MainPage> {
         _sendLogoutMessage();
 
         Future.delayed(const Duration(seconds: 1), () async {
-          MqttCore.instance.diconnect();
+          MessageService().publish<DisconnectClientMessage>(Constants.messageTopicDisconnectClient, arguments: DisconnectClientMessage());
         });
 
         _loggedOut = true;
@@ -380,6 +381,6 @@ class _MainPageState extends State<MainPage> {
       logoutMessage.pos!.acc = position.accuracy.toInt();
     }
 
-    MqttCore.instance.publishMessage("logout", jsonEncode(logoutMessage.toJson()));
+    MessageService().publish<PublishPayloadMessage>(Constants.messageTopicPublishPayload, arguments: PublishPayloadMessage(topic: "logout", message: logoutMessage.toJson()));
   }
 }

lib/content_views/messages_page.dart

@@ -10,6 +10,9 @@ import 'package:stadtbote/main.dart';
 import 'package:stadtbote/model/message.dart' as sbmessage;
 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/mqtt_core.dart';
 
 import '../tools/util.dart';
@@ -108,7 +111,7 @@ class _MessagesPageState extends State<MessagesPage> {
       await MyApp.isarInstance.messages.put(message);
     });
 
-    MqttCore.instance.publishMessage('message', jsonEncode(message.toJson()));
+    MessageService().publish<PublishPayloadMessage>(Constants.messageTopicPublishPayload, arguments: PublishPayloadMessage(topic: "message", message: message.toJson()));
 
     _messages.insert(0, types.TextMessage(
       author: _user,

lib/content_views/task_list_page.dart

@@ -23,6 +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 '../main.dart';
 import '../model/task_info.dart';