Skip to content

Commit d350224

Browse files
committed
Update storage.setValue
1 parent 6ceeee8 commit d350224

15 files changed

Lines changed: 54 additions & 81 deletions

File tree

packages/devtools_app/lib/src/framework/home_screen.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import '../shared/primitives/blocking_action_mixin.dart';
2222
import '../shared/primitives/utils.dart';
2323
import '../shared/title.dart';
2424
import '../shared/ui/vm_flag_widgets.dart';
25-
import '../shared/utils/utils.dart';
2625
import 'framework_core.dart';
2726

2827
class HomeScreen extends Screen {
@@ -260,7 +259,7 @@ class _ConnectInputState extends State<ConnectInput> with BlockingActionMixin {
260259
}
261260

262261
assert(() {
263-
safeUnawaited(storage.setValue(_debugVmServiceUriKey, uri));
262+
storage.setValue(_debugVmServiceUriKey, uri);
264263
return true;
265264
}());
266265

packages/devtools_app/lib/src/screens/inspector_v2/inspector_screen_body.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ class InspectorScreenBodyState extends State<InspectorScreenBody>
226226
final welcomeAlreadyShown = await storage.getValue(_welcomeShownStorageId);
227227
if (welcomeAlreadyShown == 'true') return;
228228
// Mark the welcome message as shown.
229-
await storage.setValue(_welcomeShownStorageId, 'true');
229+
storage.setValue(_welcomeShownStorageId, 'true');
230230
if (context.mounted) {
231231
pushWelcomeToNewInspectorMessage(InspectorScreen.id);
232232
}

packages/devtools_app/lib/src/shared/config_specific/framework_initialize/_framework_initialize_desktop.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class FlutterDesktopStorage implements Storage {
2929
}
3030

3131
@override
32-
Future<void> setValue(String key, String value) async {
32+
void setValue(String key, String value) {
3333
_values[key] = value;
3434

3535
const encoder = JsonEncoder.withIndent(' ');

packages/devtools_app/lib/src/shared/config_specific/framework_initialize/_framework_initialize_web.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class BrowserStorage implements Storage {
116116
}
117117

118118
@override
119-
Future<void> setValue(String key, String value) async {
119+
void setValue(String key, String value) async {
120120
window.localStorage.setItem(key, value);
121121
}
122122
}

packages/devtools_app/lib/src/shared/preferences/_extension_preferences.dart

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@ class ExtensionsPreferencesController extends DisposableController
1515
@override
1616
Future<void> init() async {
1717
addAutoDisposeListener(showOnlyEnabledExtensions, () {
18-
safeUnawaited(
19-
storage.setValue(
20-
_showOnlyEnabledExtensionsId,
21-
showOnlyEnabledExtensions.value.toString(),
22-
),
18+
storage.setValue(
19+
_showOnlyEnabledExtensionsId,
20+
showOnlyEnabledExtensions.value.toString(),
2321
);
2422
ga.select(
2523
gac.DevToolsExtensionEvents.extensionScreenId.name,

packages/devtools_app/lib/src/shared/preferences/_inspector_preferences.dart

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ class InspectorPreferencesController extends DisposableController
146146
required String preferenceStorageId,
147147
required ValueNotifier<bool> preferenceNotifier,
148148
}) {
149-
addAutoDisposeListener(preferenceNotifier, () async {
150-
await storage.setValue(
149+
addAutoDisposeListener(preferenceNotifier, () {
150+
storage.setValue(
151151
preferenceStorageId,
152152
preferenceNotifier.value.toString(),
153153
);
@@ -168,11 +168,9 @@ class InspectorPreferencesController extends DisposableController
168168
await _updateInspectorDetailsViewSelection();
169169

170170
addAutoDisposeListener(_defaultDetailsView, () {
171-
safeUnawaited(
172-
storage.setValue(
173-
_defaultDetailsViewStorageId,
174-
_defaultDetailsView.value.name.toString(),
175-
),
171+
storage.setValue(
172+
_defaultDetailsViewStorageId,
173+
_defaultDetailsView.value.name.toString(),
176174
);
177175
});
178176
}
@@ -374,7 +372,7 @@ class InspectorPreferencesController extends DisposableController
374372

375373
Future<void> _cachePubRootDirectories(List<String> pubRootDirectories) async {
376374
final cachedDirectories = await readCachedPubRootDirectories();
377-
await storage.setValue(
375+
storage.setValue(
378376
_customPubRootStorageId(),
379377
jsonEncode([...cachedDirectories, ...pubRootDirectories]),
380378
);
@@ -387,10 +385,7 @@ class InspectorPreferencesController extends DisposableController
387385
(await readCachedPubRootDirectories())
388386
.where((dir) => !pubRootDirectories.contains(dir))
389387
.toList();
390-
await storage.setValue(
391-
_customPubRootStorageId(),
392-
jsonEncode(directoriesToCache),
393-
);
388+
storage.setValue(_customPubRootStorageId(), jsonEncode(directoriesToCache));
394389
}
395390

396391
Future<void> addPubRootDirectories(

packages/devtools_app/lib/src/shared/preferences/_logging_preferences.dart

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,9 @@ class LoggingPreferencesController extends DisposableController
3939
int.tryParse(await storage.getValue(_retentionLimitStorageId) ?? '') ??
4040
_defaultRetentionLimit;
4141
addAutoDisposeListener(retentionLimit, () {
42-
safeUnawaited(
43-
storage.setValue(
44-
_retentionLimitStorageId,
45-
retentionLimit.value.toString(),
46-
),
42+
storage.setValue(
43+
_retentionLimitStorageId,
44+
retentionLimit.value.toString(),
4745
);
4846
ga.select(
4947
gac.logging,
@@ -61,9 +59,7 @@ class LoggingPreferencesController extends DisposableController
6159
) ??
6260
_defaultDetailsFormat;
6361
addAutoDisposeListener(detailsFormat, () {
64-
safeUnawaited(
65-
storage.setValue(detailsFormatStorageId, detailsFormat.value.name),
66-
);
62+
storage.setValue(detailsFormatStorageId, detailsFormat.value.name);
6763
ga.select(
6864
gac.logging,
6965
gac.LoggingEvents.changeDetailsFormat.name,

packages/devtools_app/lib/src/shared/preferences/_memory_preferences.dart

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@ class MemoryPreferencesController extends DisposableController
2626
@override
2727
Future<void> init() async {
2828
addAutoDisposeListener(androidCollectionEnabled, () {
29-
safeUnawaited(
30-
storage.setValue(
31-
_androidCollectionEnabledStorageId,
32-
androidCollectionEnabled.value.toString(),
33-
),
29+
storage.setValue(
30+
_androidCollectionEnabledStorageId,
31+
androidCollectionEnabled.value.toString(),
3432
);
3533
if (androidCollectionEnabled.value) {
3634
ga.select(gac.memory, gac.MemoryEvents.androidChart.name);
@@ -42,9 +40,7 @@ class MemoryPreferencesController extends DisposableController
4240
);
4341

4442
addAutoDisposeListener(showChart, () {
45-
safeUnawaited(
46-
storage.setValue(_showChartStorageId, showChart.value.toString()),
47-
);
43+
storage.setValue(_showChartStorageId, showChart.value.toString());
4844

4945
ga.select(
5046
gac.memory,
@@ -59,9 +55,7 @@ class MemoryPreferencesController extends DisposableController
5955
);
6056

6157
addAutoDisposeListener(refLimit, () {
62-
safeUnawaited(
63-
storage.setValue(_refLimitStorageId, refLimit.value.toString()),
64-
);
58+
storage.setValue(_refLimitStorageId, refLimit.value.toString());
6559

6660
ga.select(gac.memory, gac.MemoryEvents.browseRefLimit.name);
6761
});

packages/devtools_app/lib/src/shared/preferences/_performance_preferences.dart

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@ class PerformancePreferencesController extends DisposableController
2222
@override
2323
Future<void> init() async {
2424
addAutoDisposeListener(showFlutterFramesChart, () {
25-
safeUnawaited(
26-
storage.setValue(
27-
_showFlutterFramesChartId,
28-
showFlutterFramesChart.value.toString(),
29-
),
25+
storage.setValue(
26+
_showFlutterFramesChartId,
27+
showFlutterFramesChart.value.toString(),
3028
);
3129
ga.select(
3230
gac.performance,
@@ -40,11 +38,9 @@ class PerformancePreferencesController extends DisposableController
4038
);
4139

4240
addAutoDisposeListener(includeCpuSamplesInTimeline, () {
43-
safeUnawaited(
44-
storage.setValue(
45-
_includeCpuSamplesInTimelineId,
46-
includeCpuSamplesInTimeline.value.toString(),
47-
),
41+
storage.setValue(
42+
_includeCpuSamplesInTimelineId,
43+
includeCpuSamplesInTimeline.value.toString(),
4844
);
4945
ga.select(
5046
gac.performance,

packages/devtools_app/lib/src/shared/preferences/preferences.dart

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,9 @@ class PreferencesController extends DisposableController
135135
ga.impression(gac.devToolsMain, gac.startingTheme(darkMode: useDarkMode));
136136
toggleDarkModeTheme(useDarkMode);
137137
addAutoDisposeListener(darkModeEnabled, () {
138-
safeUnawaited(
139-
storage.setValue(
140-
_UiPreferences.darkMode.storageKey,
141-
'${darkModeEnabled.value}',
142-
),
138+
storage.setValue(
139+
_UiPreferences.darkMode.storageKey,
140+
'${darkModeEnabled.value}',
143141
);
144142
});
145143
}
@@ -151,25 +149,20 @@ class PreferencesController extends DisposableController
151149
);
152150
toggleVmDeveloperMode(vmDeveloperModeValue);
153151
addAutoDisposeListener(vmDeveloperModeEnabled, () {
154-
safeUnawaited(
155-
storage.setValue(
156-
_UiPreferences.vmDeveloperMode.storageKey,
157-
'${vmDeveloperModeEnabled.value}',
158-
),
152+
storage.setValue(
153+
_UiPreferences.vmDeveloperMode.storageKey,
154+
'${vmDeveloperModeEnabled.value}',
159155
);
160156
});
161157
}
162158

163159
Future<void> _initWasmEnabled() async {
164160
wasmEnabled.value = kIsWasm;
165-
addAutoDisposeListener(wasmEnabled, () async {
161+
addAutoDisposeListener(wasmEnabled, () {
166162
final enabled = wasmEnabled.value;
167163
_log.fine('preference update (wasmEnabled = $enabled)');
168164

169-
await storage.setValue(
170-
_ExperimentPreferences.wasm.storageKey,
171-
'$enabled',
172-
);
165+
storage.setValue(_ExperimentPreferences.wasm.storageKey, '$enabled');
173166

174167
// Update the wasm mode query parameter if it does not match the value of
175168
// the setting.
@@ -241,11 +234,9 @@ class PreferencesController extends DisposableController
241234
);
242235
toggleVerboseLogging(verboseLoggingEnabledValue);
243236
addAutoDisposeListener(verboseLoggingEnabled, () {
244-
safeUnawaited(
245-
storage.setValue(
246-
_GeneralPreferences.verboseLogging.name,
247-
verboseLoggingEnabled.value.toString(),
248-
),
237+
storage.setValue(
238+
_GeneralPreferences.verboseLogging.name,
239+
verboseLoggingEnabled.value.toString(),
249240
);
250241
});
251242
}

0 commit comments

Comments
 (0)