From 6538d9177948486f259a81ec412c1ddc6e239ed9 Mon Sep 17 00:00:00 2001
From: krille-chan <krille-chan@posteo.de>
Date: Sat, 7 Oct 2023 09:38:46 +0200
Subject: [PATCH] fix: UIA requests with navigator

---
 lib/pages/device_settings/device_settings.dart |  5 +++--
 lib/widgets/fluffy_chat_app.dart               | 12 +++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/pages/device_settings/device_settings.dart b/lib/pages/device_settings/device_settings.dart
index 1f6a5eb69..59e9e6583 100644
--- a/lib/pages/device_settings/device_settings.dart
+++ b/lib/pages/device_settings/device_settings.dart
@@ -9,6 +9,7 @@ import 'package:matrix/matrix.dart';
 
 import 'package:fluffychat/pages/device_settings/device_settings_view.dart';
 import 'package:fluffychat/pages/key_verification/key_verification_dialog.dart';
+import 'package:fluffychat/utils/localized_exception_extension.dart';
 import '../../widgets/matrix.dart';
 
 class DevicesSettings extends StatefulWidget {
@@ -58,8 +59,8 @@ class DevicesSettingsController extends State<DevicesSettings> {
       );
       reload();
     } catch (e, s) {
-      Logs().v('Error while deleting devices', e, s);
-      setState(() => errorDeletingDevices = e.toString());
+      Logs().w('Error while deleting devices', e, s);
+      setState(() => errorDeletingDevices = e.toLocalizedString(context));
     } finally {
       setState(() => loadingDeletingDevices = false);
     }
diff --git a/lib/widgets/fluffy_chat_app.dart b/lib/widgets/fluffy_chat_app.dart
index ee55a2f13..45852dfcc 100644
--- a/lib/widgets/fluffy_chat_app.dart
+++ b/lib/widgets/fluffy_chat_app.dart
@@ -49,9 +49,15 @@ class FluffyChatApp extends StatelessWidget {
         builder: (context, child) => AppLockWidget(
           pincode: pincode,
           clients: clients,
-          child: Matrix(
-            clients: clients,
-            child: testWidget ?? child,
+          // Need a navigator above the Matrix widget for
+          // displaying dialogs
+          child: Navigator(
+            onGenerateRoute: (_) => MaterialPageRoute(
+              builder: (_) => Matrix(
+                clients: clients,
+                child: testWidget ?? child,
+              ),
+            ),
           ),
         ),
       ),