Merge

lib/content_views/main_page.dart

@@ -11,12 +11,10 @@ import 'package:stadtbote/content_views/messages_page.dart';
 import 'package:stadtbote/content_views/utils/content_view_widget.dart';
 import 'package:stadtbote/content_views/utils/header_info.dart';
 import 'package:stadtbote/model/job.dart';
-import 'package:stadtbote/model/log_entry.dart';
 import 'package:stadtbote/model/message.dart';
 import 'package:stadtbote/model/session_status.dart';
 import 'package:stadtbote/model/status.dart';
 import 'package:stadtbote/popups/infos_popup.dart';
-import 'package:stadtbote/protocoll_messages/device_log_response.dart';
 import 'package:stadtbote/protocoll_messages/logout_message.dart';
 import 'package:stadtbote/tools/message_service.dart';
 import 'package:stadtbote/tools/messages/job_deleted_message.dart';
@@ -25,7 +23,7 @@ import 'package:stadtbote/tools/messages/message_message.dart';
 import 'package:stadtbote/tools/messages/session_info_update.dart';
 import 'package:badges/badges.dart' as badges;
 import 'package:stadtbote/tools/messages/status_info_update.dart';
-import 'package:stadtbote/tools/messages/update_badges_message.dart';
+import 'package:stadtbote/tools/messages/refresh_badges_message.dart';
 import 'package:stadtbote/tools/mqtt_core.dart';
 
 import '../main.dart';
@@ -237,11 +235,7 @@ class _MainPageState extends State<MainPage> {
                   _loggedOut ? 'Anmelden' : 'Abmelden',
                   image: Image.asset(_loggedOut ? 'assets/anmelden.png' : 'assets/abmelden.png', width: 30, height: 30),
                   () async {
-                    if (!kDebugMode) {
-                      _logout(context);
-                    } else {
-                      _test();
-                    }
+                    _logout(context);
                   }),
               Expanded(
                 child: Container(
@@ -287,7 +281,7 @@ class _MainPageState extends State<MainPage> {
       _refreshBadges();
     });
 
-    MessageService().subscribe<UpdateBadgesMessage>(Constants.messageTopicUpdateBadges, this, (UpdateBadgesMessage message) {
+    MessageService().subscribe<RefreshBadgesMessage>(Constants.messageTopicRefreshBadges, this, (RefreshBadgesMessage message) {
       _refreshBadges();
     });
   }
@@ -380,10 +374,10 @@ class _MainPageState extends State<MainPage> {
 
     var logoutMessage = LogoutMessage();
     if (position != null) {
-      logoutMessage.time = position.timestamp.toIso8601String();
-      logoutMessage.lat = position.latitude;
-      logoutMessage.long = position.longitude;
-      logoutMessage.acc = position.accuracy.toInt();
+      logoutMessage.pos!.time = position.timestamp.toIso8601String();
+      logoutMessage.pos!.lat = position.latitude;
+      logoutMessage.pos!.long = position.longitude;
+      logoutMessage.pos!.acc = position.accuracy.toInt();
     }
 
     MqttCore.instance.publishText("session", jsonEncode(logoutMessage.toJson()));