From c05b4f6652d86cef4919691ccd2e3288945d38f1 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Sat, 22 Mar 2025 02:52:48 -0500 Subject: [PATCH] fixes --- web/repertory/lib/widgets/mount_settings.dart | 13 +++++++++---- web/repertory/lib/widgets/ui_settings.dart | 18 +++++++++++++++--- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/web/repertory/lib/widgets/mount_settings.dart b/web/repertory/lib/widgets/mount_settings.dart index ad923450..16aee9b5 100644 --- a/web/repertory/lib/widgets/mount_settings.dart +++ b/web/repertory/lib/widgets/mount_settings.dart @@ -623,17 +623,22 @@ class _MountSettingsWidgetState extends State { widget.settings, ); if (settings.isNotEmpty) { - final authProvider = Provider.of(context, listen: false); - convertAllToString(settings, authProvider.key).then((map) { + final mount = widget.mount; + final key = + Provider.of( + constants.navigatorKey.currentContext!, + listen: false, + ).key; + convertAllToString(settings, key).then((map) { map.forEach((key, value) { if (value is Map) { value.forEach((subKey, subValue) { - widget.mount.setValue('$key.$subKey', subValue); + mount.setValue('$key.$subKey', subValue); }); return; } - widget.mount.setValue(key, value); + mount.setValue(key, value); }); }); } diff --git a/web/repertory/lib/widgets/ui_settings.dart b/web/repertory/lib/widgets/ui_settings.dart index 2e1edb78..e672bb70 100644 --- a/web/repertory/lib/widgets/ui_settings.dart +++ b/web/repertory/lib/widgets/ui_settings.dart @@ -3,6 +3,7 @@ import 'dart:convert' show jsonEncode; import 'package:flutter/material.dart'; import 'package:http/http.dart' as http; import 'package:provider/provider.dart'; +import 'package:repertory/constants.dart' as constants; import 'package:repertory/helpers.dart' show convertAllToString, @@ -105,11 +106,23 @@ class _UISettingsWidgetState extends State { void dispose() { final settings = getChanged(widget.origSettings, widget.settings); if (settings.isNotEmpty) { - final authProvider = Provider.of(context, listen: false); - convertAllToString(settings, authProvider.key) + debugPrint("start"); + final key = + Provider.of( + constants.navigatorKey.currentContext!, + listen: false, + ).key; + convertAllToString(settings, key) .then((map) async { + debugPrint("map"); try { + final authProvider = Provider.of( + constants.navigatorKey.currentContext!, + listen: false, + ); final auth = await authProvider.createAuth(); + + debugPrint("auth"); final response = await http.put( Uri.parse( Uri.encodeFull( @@ -121,7 +134,6 @@ class _UISettingsWidgetState extends State { if (response.statusCode == 401) { displayAuthError(); authProvider.logoff(); - return; } } catch (e) { debugPrint('$e');