Erweiterungen

lib/content_views/approach_area_page.dart

@@ -1,7 +1,7 @@
 
 import 'package:flutter/material.dart';
 import 'package:isar/isar.dart';
-import 'package:mqtt_client/mqtt_client.dart';
+import 'package:mqtt5_client/mqtt5_client.dart';
 import 'package:stadtbote/content_views/utils/content_view_widget.dart';
 import 'package:stadtbote/content_views/utils/header_info.dart';
 import 'package:stadtbote/main.dart';

lib/content_views/assigned_jobs_page.dart

@@ -2,7 +2,7 @@
 import 'package:expandable/expandable.dart';
 import 'package:flutter/material.dart';
 import 'package:isar/isar.dart';
-import 'package:mqtt_client/mqtt_client.dart';
+import 'package:mqtt5_client/mqtt5_client.dart';
 import 'package:stadtbote/content_views/utils/content_view_widget.dart';
 import 'package:stadtbote/content_views/utils/header_info.dart';
 import 'package:intl/intl.dart';

lib/content_views/main_page.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:isar/isar.dart';
-import 'package:mqtt_client/mqtt_client.dart';
+import 'package:mqtt5_client/mqtt5_client.dart';
 import 'package:stadtbote/content_views/accepted_jobs_page.dart';
 import 'package:stadtbote/content_views/approach_area_page.dart';
 import 'package:stadtbote/content_views/assigned_jobs_page.dart';

lib/content_views/messages_page.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_chat_ui/flutter_chat_ui.dart';
 import 'package:flutter_chat_types/flutter_chat_types.dart' as types;
 import 'package:isar/isar.dart';
-import 'package:mqtt_client/mqtt_client.dart';
+import 'package:mqtt5_client/mqtt5_client.dart';
 import 'package:stadtbote/content_views/utils/content_view_widget.dart';
 import 'package:stadtbote/content_views/utils/header_info.dart';
 import 'package:stadtbote/main.dart';

lib/content_views/task_list_page.dart

@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:intl/intl.dart';
 import 'package:isar/isar.dart';
-import 'package:mqtt_client/mqtt_client.dart';
+import 'package:mqtt5_client/mqtt5_client.dart';
 import 'package:stadtbote/content_views/utils/content_view_widget.dart';
 import 'package:stadtbote/content_views/utils/header_info.dart';
 import 'package:stadtbote/messages/pop_content_view_message.dart';

lib/popups/accept_jobs_popup.dart

@@ -4,7 +4,7 @@ import 'dart:math';
 import 'package:expandable/expandable.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
-import 'package:mqtt_client/mqtt_client.dart';
+import 'package:mqtt5_client/mqtt5_client.dart';
 import 'package:shared_map/shared_map.dart';
 import 'package:stadtbote/main.dart';
 import 'package:stadtbote/protocoll_messages/accept_job_message.dart';

lib/tools/messages/publish_payload_message.dart

@@ -1,4 +1,4 @@
-import 'package:mqtt_client/mqtt_client.dart';
+import 'package:mqtt5_client/mqtt5_client.dart';
 
 class PublishPayloadMessage {
   final String topic;

lib/tools/mqtt_core.dart

@@ -6,8 +6,8 @@ import 'package:archive/archive.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:http/http.dart' as http;
 import 'package:isar/isar.dart';
-import 'package:mqtt_client/mqtt_client.dart';
-import 'package:mqtt_client/mqtt_server_client.dart';
+import 'package:mqtt5_client/mqtt5_client.dart';
+import 'package:mqtt5_client/mqtt5_server_client.dart';
 import 'package:stadtbote/model/enqueued_message.dart';
 import 'package:stadtbote/model/job.dart';
 import 'package:stadtbote/model/log_entry.dart';
@@ -93,6 +93,8 @@ class MqttCore {
     }
 
     connectionState = ConnectionStateEnum.notConnected;
+
+    _disconnectInProgress = false;
   }
 
   _connectToBroker() async {
@@ -165,7 +167,7 @@ class MqttCore {
   Future<void> _setupMqtt() async {
     Util.logInfo('_setupMqtt called');
 
-    _mqttClient!.updates?.listen((List<MqttReceivedMessage<MqttMessage>> messages) {
+    _mqttClient!.updates.listen((List<MqttReceivedMessage<MqttMessage>> messages) {
       for (var mqttMessage in messages) {
         try {
           final MqttPublishMessage message = mqttMessage.payload as MqttPublishMessage;
@@ -175,9 +177,9 @@ class MqttCore {
           var topic = topicArraySplited[6];
 
           Util.logInfo('message received\ntopic: $topic\n');
-          Util.logInfo("size in bytes: ${message.payload.message.length.toString()}");
+          Util.logInfo("size in bytes: ${message.payload.message!.length.toString()}");
 
-          var payload = utf8.decode(GZipDecoder().decodeBytes(message.payload.message));
+          var payload = utf8.decode(GZipDecoder().decodeBytes(message.payload.message!));
 
           Util.logInfo('$topic\nmessage: $payload');
 
@@ -235,7 +237,7 @@ class MqttCore {
 
       if (previousMqttSubscription != fromServerTopic) {
         Util.logInfo('topic changed -> unsubscribe from $previousMqttSubscription');
-        _mqttClient!.unsubscribe(previousMqttSubscription);
+        _mqttClient!.unsubscribeStringTopic(previousMqttSubscription);
       }
 
       _mqttClient!.subscribe(_fromServerTopic, MqttQos.exactlyOnce);