Partial revert of "Update storage.setValue"

elliette · elliette · commit ea74a317f870 · 2025-04-08T15:00:13.000-07:00
diff --git a/packages/devtools_app/lib/src/framework/home_screen.dart b/packages/devtools_app/lib/src/framework/home_screen.dart
@@ -22,6 +22,7 @@ import '../shared/primitives/blocking_action_mixin.dart';
 import '../shared/primitives/utils.dart';
 import '../shared/title.dart';
 import '../shared/ui/vm_flag_widgets.dart';
+import '../shared/utils/utils.dart';
 import 'framework_core.dart';
 
 class HomeScreen extends Screen {
@@ -259,7 +260,7 @@ class _ConnectInputState extends State<ConnectInput> with BlockingActionMixin {
     }
 
     assert(() {
-      storage.setValue(_debugVmServiceUriKey, uri);
+      safeUnawaited(storage.setValue(_debugVmServiceUriKey, uri));
       return true;
     }());
 
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_screen_body.dart b/packages/devtools_app/lib/src/screens/inspector_v2/inspector_screen_body.dart
@@ -227,7 +227,7 @@ class InspectorScreenBodyState extends State<InspectorScreenBody>
     final welcomeAlreadyShown = await storage.getValue(_welcomeShownStorageId);
     if (welcomeAlreadyShown == 'true') return;
     // Mark the welcome message as shown.
-    storage.setValue(_welcomeShownStorageId, 'true');
+    await storage.setValue(_welcomeShownStorageId, 'true');
     if (context.mounted) {
       pushWelcomeToNewInspectorMessage(InspectorScreen.id);
     }
diff --git a/packages/devtools_app/lib/src/shared/config_specific/framework_initialize/_framework_initialize_desktop.dart b/packages/devtools_app/lib/src/shared/config_specific/framework_initialize/_framework_initialize_desktop.dart
@@ -29,7 +29,7 @@ class FlutterDesktopStorage implements Storage {
   }
 
   @override
-  void setValue(String key, String value) {
+  Future<void> setValue(String key, String value) async {
     _values[key] = value;
 
     const encoder = JsonEncoder.withIndent('  ');
diff --git a/packages/devtools_app/lib/src/shared/config_specific/framework_initialize/_framework_initialize_web.dart b/packages/devtools_app/lib/src/shared/config_specific/framework_initialize/_framework_initialize_web.dart
@@ -116,7 +116,7 @@ class BrowserStorage implements Storage {
   }
 
   @override
-  void setValue(String key, String value) async {
+  Future<void> setValue(String key, String value) async {
     window.localStorage.setItem(key, value);
   }
 }
diff --git a/packages/devtools_app/lib/src/shared/preferences/_extension_preferences.dart b/packages/devtools_app/lib/src/shared/preferences/_extension_preferences.dart
@@ -15,9 +15,11 @@ class ExtensionsPreferencesController extends DisposableController
   @override
   Future<void> init() async {
     addAutoDisposeListener(showOnlyEnabledExtensions, () {
-      storage.setValue(
-        _showOnlyEnabledExtensionsId,
-        showOnlyEnabledExtensions.value.toString(),
+      safeUnawaited(
+        storage.setValue(
+          _showOnlyEnabledExtensionsId,
+          showOnlyEnabledExtensions.value.toString(),
+        ),
       );
       ga.select(
         gac.DevToolsExtensionEvents.extensionScreenId.name,
diff --git a/packages/devtools_app/lib/src/shared/preferences/_inspector_preferences.dart b/packages/devtools_app/lib/src/shared/preferences/_inspector_preferences.dart
@@ -146,8 +146,8 @@ class InspectorPreferencesController extends DisposableController
     required String preferenceStorageId,
     required ValueNotifier<bool> preferenceNotifier,
   }) {
-    addAutoDisposeListener(preferenceNotifier, () {
-      storage.setValue(
+    addAutoDisposeListener(preferenceNotifier, () async {
+      await storage.setValue(
         preferenceStorageId,
         preferenceNotifier.value.toString(),
       );
@@ -168,9 +168,11 @@ class InspectorPreferencesController extends DisposableController
     await _updateInspectorDetailsViewSelection();
 
     addAutoDisposeListener(_defaultDetailsView, () {
-      storage.setValue(
-        _defaultDetailsViewStorageId,
-        _defaultDetailsView.value.name.toString(),
+      safeUnawaited(
+        storage.setValue(
+          _defaultDetailsViewStorageId,
+          _defaultDetailsView.value.name.toString(),
+        ),
       );
     });
   }
@@ -372,7 +374,7 @@ class InspectorPreferencesController extends DisposableController
 
   Future<void> _cachePubRootDirectories(List<String> pubRootDirectories) async {
     final cachedDirectories = await readCachedPubRootDirectories();
-    storage.setValue(
+    await storage.setValue(
       _customPubRootStorageId(),
       jsonEncode([...cachedDirectories, ...pubRootDirectories]),
     );
@@ -385,7 +387,10 @@ class InspectorPreferencesController extends DisposableController
         (await readCachedPubRootDirectories())
             .where((dir) => !pubRootDirectories.contains(dir))
             .toList();
-    storage.setValue(_customPubRootStorageId(), jsonEncode(directoriesToCache));
+    await storage.setValue(
+      _customPubRootStorageId(),
+      jsonEncode(directoriesToCache),
+    );
   }
 
   Future<void> addPubRootDirectories(
diff --git a/packages/devtools_app/lib/src/shared/preferences/_logging_preferences.dart b/packages/devtools_app/lib/src/shared/preferences/_logging_preferences.dart
@@ -39,9 +39,11 @@ class LoggingPreferencesController extends DisposableController
         int.tryParse(await storage.getValue(_retentionLimitStorageId) ?? '') ??
         _defaultRetentionLimit;
     addAutoDisposeListener(retentionLimit, () {
-      storage.setValue(
-        _retentionLimitStorageId,
-        retentionLimit.value.toString(),
+      safeUnawaited(
+        storage.setValue(
+          _retentionLimitStorageId,
+          retentionLimit.value.toString(),
+        ),
       );
       ga.select(
         gac.logging,
@@ -59,7 +61,9 @@ class LoggingPreferencesController extends DisposableController
         ) ??
         _defaultDetailsFormat;
     addAutoDisposeListener(detailsFormat, () {
-      storage.setValue(detailsFormatStorageId, detailsFormat.value.name);
+      safeUnawaited(
+        storage.setValue(detailsFormatStorageId, detailsFormat.value.name),
+      );
       ga.select(
         gac.logging,
         gac.LoggingEvents.changeDetailsFormat.name,
diff --git a/packages/devtools_app/lib/src/shared/preferences/_memory_preferences.dart b/packages/devtools_app/lib/src/shared/preferences/_memory_preferences.dart
@@ -26,9 +26,11 @@ class MemoryPreferencesController extends DisposableController
   @override
   Future<void> init() async {
     addAutoDisposeListener(androidCollectionEnabled, () {
-      storage.setValue(
-        _androidCollectionEnabledStorageId,
-        androidCollectionEnabled.value.toString(),
+      safeUnawaited(
+        storage.setValue(
+          _androidCollectionEnabledStorageId,
+          androidCollectionEnabled.value.toString(),
+        ),
       );
       if (androidCollectionEnabled.value) {
         ga.select(gac.memory, gac.MemoryEvents.androidChart.name);
@@ -40,7 +42,9 @@ class MemoryPreferencesController extends DisposableController
     );
 
     addAutoDisposeListener(showChart, () {
-      storage.setValue(_showChartStorageId, showChart.value.toString());
+      safeUnawaited(
+        storage.setValue(_showChartStorageId, showChart.value.toString()),
+      );
 
       ga.select(
         gac.memory,
@@ -55,7 +59,9 @@ class MemoryPreferencesController extends DisposableController
     );
 
     addAutoDisposeListener(refLimit, () {
-      storage.setValue(_refLimitStorageId, refLimit.value.toString());
+      safeUnawaited(
+        storage.setValue(_refLimitStorageId, refLimit.value.toString()),
+      );
 
       ga.select(gac.memory, gac.MemoryEvents.browseRefLimit.name);
     });
diff --git a/packages/devtools_app/lib/src/shared/preferences/_performance_preferences.dart b/packages/devtools_app/lib/src/shared/preferences/_performance_preferences.dart
@@ -22,9 +22,11 @@ class PerformancePreferencesController extends DisposableController
   @override
   Future<void> init() async {
     addAutoDisposeListener(showFlutterFramesChart, () {
-      storage.setValue(
-        _showFlutterFramesChartId,
-        showFlutterFramesChart.value.toString(),
+      safeUnawaited(
+        storage.setValue(
+          _showFlutterFramesChartId,
+          showFlutterFramesChart.value.toString(),
+        ),
       );
       ga.select(
         gac.performance,
@@ -38,9 +40,11 @@ class PerformancePreferencesController extends DisposableController
     );
 
     addAutoDisposeListener(includeCpuSamplesInTimeline, () {
-      storage.setValue(
-        _includeCpuSamplesInTimelineId,
-        includeCpuSamplesInTimeline.value.toString(),
+      safeUnawaited(
+        storage.setValue(
+          _includeCpuSamplesInTimelineId,
+          includeCpuSamplesInTimeline.value.toString(),
+        ),
       );
       ga.select(
         gac.performance,
diff --git a/packages/devtools_app/lib/src/shared/preferences/preferences.dart b/packages/devtools_app/lib/src/shared/preferences/preferences.dart
@@ -135,9 +135,11 @@ class PreferencesController extends DisposableController
     ga.impression(gac.devToolsMain, gac.startingTheme(darkMode: useDarkMode));
     toggleDarkModeTheme(useDarkMode);
     addAutoDisposeListener(darkModeEnabled, () {
-      storage.setValue(
-        _UiPreferences.darkMode.storageKey,
-        '${darkModeEnabled.value}',
+      safeUnawaited(
+        storage.setValue(
+          _UiPreferences.darkMode.storageKey,
+          '${darkModeEnabled.value}',
+        ),
       );
     });
   }
@@ -149,20 +151,25 @@ class PreferencesController extends DisposableController
     );
     toggleVmDeveloperMode(vmDeveloperModeValue);
     addAutoDisposeListener(vmDeveloperModeEnabled, () {
-      storage.setValue(
-        _UiPreferences.vmDeveloperMode.storageKey,
-        '${vmDeveloperModeEnabled.value}',
+      safeUnawaited(
+        storage.setValue(
+          _UiPreferences.vmDeveloperMode.storageKey,
+          '${vmDeveloperModeEnabled.value}',
+        ),
       );
     });
   }
 
   Future<void> _initWasmEnabled() async {
     wasmEnabled.value = kIsWasm;
-    addAutoDisposeListener(wasmEnabled, () {
+    addAutoDisposeListener(wasmEnabled, () async {
       final enabled = wasmEnabled.value;
       _log.fine('preference update (wasmEnabled = $enabled)');
 
-      storage.setValue(_ExperimentPreferences.wasm.storageKey, '$enabled');
+      await storage.setValue(
+        _ExperimentPreferences.wasm.storageKey,
+        '$enabled',
+      );
 
       // Update the wasm mode query parameter if it does not match the value of
       // the setting.
@@ -234,9 +241,11 @@ class PreferencesController extends DisposableController
     );
     toggleVerboseLogging(verboseLoggingEnabledValue);
     addAutoDisposeListener(verboseLoggingEnabled, () {
-      storage.setValue(
-        _GeneralPreferences.verboseLogging.name,
-        verboseLoggingEnabled.value.toString(),
+      safeUnawaited(
+        storage.setValue(
+          _GeneralPreferences.verboseLogging.name,
+          verboseLoggingEnabled.value.toString(),
+        ),
       );
     });
   }
diff --git a/packages/devtools_app/lib/src/shared/primitives/storage.dart b/packages/devtools_app/lib/src/shared/primitives/storage.dart
@@ -11,5 +11,5 @@ abstract class Storage {
   Future<String?> getValue(String key);
 
   /// Set a value for the given key.
-  void setValue(String key, String value);
+  Future<void> setValue(String key, String value);
 }
diff --git a/packages/devtools_app/lib/src/shared/server/_preferences_api.dart b/packages/devtools_app/lib/src/shared/server/_preferences_api.dart
@@ -26,7 +26,7 @@ Future<Object?> getPreferenceValue(String key) async {
 /// Sets the DevTools preference [value] for the [key].
 ///
 /// This value is stored in the file '~/.flutter-devtools/.devtools'.
-void setPreferenceValue(String key, Object value) {
+Future<void> setPreferenceValue(String key, Object value) async {
   if (!isDevToolsServerAvailable) return;
 
   final uri = Uri(
@@ -36,11 +36,8 @@ void setPreferenceValue(String key, Object value) {
       apiParameterValueKey: value,
     },
   );
-  safeUnawaited(
-    request(uri.toString()).then((resp) {
-      if (resp == null || !resp.statusOk) {
-        logWarning(resp, PreferencesApi.setPreferenceValue);
-      }
-    }),
-  );
+  final resp = await request(uri.toString());
+  if (resp == null || !resp.statusOk) {
+    logWarning(resp, PreferencesApi.setPreferenceValue);
+  }
 }
diff --git a/packages/devtools_app/lib/src/shared/server/server.dart b/packages/devtools_app/lib/src/shared/server/server.dart
@@ -17,7 +17,6 @@ import '../development_helpers.dart';
 import '../globals.dart';
 import '../primitives/storage.dart';
 import '../primitives/utils.dart';
-import '../utils/utils.dart';
 
 part '_analytics_api.dart';
 part '_app_size_api.dart';
@@ -149,7 +148,7 @@ class ServerConnectionStorage implements Storage {
   }
 
   @override
-  void setValue(String key, String value) {
-    setPreferenceValue(key, value);
+  Future<void> setValue(String key, String value) async {
+    await setPreferenceValue(key, value);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ class InspectorScreenBodyState extends State<InspectorScreenBody>`
`227`	`227`	`final welcomeAlreadyShown = await storage.getValue(_welcomeShownStorageId);`
`228`	`228`	`if (welcomeAlreadyShown == 'true') return;`
`229`	`229`	`// Mark the welcome message as shown.`
`230`		`- storage.setValue(_welcomeShownStorageId, 'true');`
	`230`	`+ await storage.setValue(_welcomeShownStorageId, 'true');`
`231`	`231`	`if (context.mounted) {`
`232`	`232`	`pushWelcomeToNewInspectorMessage(InspectorScreen.id);`
`233`	`233`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class FlutterDesktopStorage implements Storage {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`@override`
`32`		`- void setValue(String key, String value) {`
	`32`	`+ Future<void> setValue(String key, String value) async {`
`33`	`33`	`_values[key] = value;`
`34`	`34`
`35`	`35`	`const encoder = JsonEncoder.withIndent(' ');`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ class BrowserStorage implements Storage {`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`@override`
`119`		`- void setValue(String key, String value) async {`
	`119`	`+ Future<void> setValue(String key, String value) async {`
`120`	`120`	`window.localStorage.setItem(key, value);`
`121`	`121`	`}`
`122`	`122`	`}`