fix: UIA requests with navigator

This commit is contained in:
krille-chan 2023-10-07 09:38:46 +02:00
parent 52457a3320
commit 6538d91779
No known key found for this signature in database
2 changed files with 12 additions and 5 deletions

View file

@ -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);
}

View file

@ -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,
),
),
),
),
),