Fehlerkorrekturen und Erweiterungen

lib/main.dart

@@ -57,6 +57,7 @@ Future<void> main() async {
     MQClient.instance.declareQueue(Constants.messageTopicMessageReceived);
     MQClient.instance.declareQueue(Constants.messageTopicUpdateBadges);
     MQClient.instance.declareQueue(Constants.messageTopicRemoveState0JobFromMap);
+    MQClient.instance.declareQueue(Constants.messageTopicBWVEnabled);
 
     final dir = await getApplicationDocumentsDirectory();
     MyApp.isarInstance = await Isar.open([
@@ -244,14 +245,13 @@ class _MainState extends State<Main> with SingleTickerProviderStateMixin, Produc
 
     return ColoredSafeArea(
       key: GlobalKey(),
-      child: WillPopScope(
-        onWillPop: () async {
-          if (contentStack.isNotEmpty) {
-            _popContentView(1);
+      child: PopScope(
+        canPop: contentStack.isNotEmpty,
+        onPopInvokedWithResult: (didPop, result) async {
+          if (didPop) return;
 
-            return false;
-          } else {
-            return true;
+          if (contentStack.isNotEmpty) {
+            _popContentView(1);        // alten Inhalt entfernen
           }
         },
         child: Scaffold(