Erweiterungen

lib/content_views/approach_area_page.dart

@@ -190,7 +190,7 @@ class _ApproachAreaPageState extends State<ApproachAreaPage> {
       message.reqZip!.zip = zip;
     }
 
-    MqttCore.instance.publishText("/appserver/to_server/100/1/104400/set_location", jsonEncode(message.toJson()));
+    MqttCore.instance.publishText("set_location", jsonEncode(message.toJson()));
   }
 }
 

lib/content_views/assigned_jobs_page.dart

@@ -196,7 +196,7 @@ 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.publishText("/appserver/to_server/100/1/104400/reaction", jsonEncode(message.toJson()));
+    MqttCore.instance.publishText("reaction", jsonEncode(message.toJson()));
 
     job.state = 9;
     MyApp.isarInstance.writeTxnSync(() => {MyApp.isarInstance.jobs.putSync(job)});

lib/content_views/main_page.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
 import 'package:isar/isar.dart';
 import 'package:stadtbote/content_views/accepted_jobs_page.dart';
@@ -325,15 +327,13 @@ class _MainPageState extends State<MainPage> {
     var position = MyApp.currentPosition;
 
     var logoutMessage = LogoutMessage();
-    logoutMessage.logout = LogoutContainer();
     if (position != null) {
-      logoutMessage.logout.pos = LogoutMessagePosition();
-      logoutMessage.logout.pos!.time = position.timestamp.toIso8601String();
-      logoutMessage.logout.pos!.lat = position.latitude;
-      logoutMessage.logout.pos!.long = position.longitude;
-      logoutMessage.logout.pos!.acc = position.accuracy.toInt();
+      logoutMessage.time = position.timestamp.toIso8601String();
+      logoutMessage.lat = position.latitude;
+      logoutMessage.long = position.longitude;
+      logoutMessage.acc = position.accuracy.toInt();
     }
 
-    MqttCore.instance.publishPayloadMessage('session', logoutMessage.toJson());
+    MqttCore.instance.publishText("session", jsonEncode(logoutMessage.toJson()));
   }
 }

lib/content_views/messages_page.dart

@@ -109,7 +109,7 @@ class _MessagesPageState extends State<MessagesPage> {
 
     var json = jsonEncode(message.toJson());
 
-    MqttCore.instance.publishText('/appserver/to_server/100/1/104400/set_location', jsonEncode(message.toJson()));
+    MqttCore.instance.publishText('set_location', jsonEncode(message.toJson()));
 
     _messages.insert(0, types.TextMessage(
       author: _user,

lib/content_views/task_list_page.dart

@@ -407,7 +407,7 @@ class _TaskListPageState extends State<TaskListPage> {
       message.task.pos!.long = position.longitude;
     }
 
-    MqttCore.instance.publishText("/appserver/to_server/100/1/104400/fin_task", jsonEncode(message.toJson()));
+    MqttCore.instance.publishText("fin_task", jsonEncode(message.toJson()));
   }
 
   FinTourTask _createAnswerHeader(TaskInfo taskInfo) {
@@ -449,7 +449,7 @@ class _TaskListPageState extends State<TaskListPage> {
       }
     }
 
-    MqttCore.instance.publishText("/appserver/to_server/100/1/104400/fin_tour", jsonEncode(message.toJson()));
+    MqttCore.instance.publishText("fin_tour", jsonEncode(message.toJson()));
 
     widget.tour.state = Constants.stateFinishedNotConfirmed;
       await MyApp.isarInstance.writeTxn(() async {