Refactoring

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()));
   }
 }