Skip to content

Commit ac4b194

Browse files
committed
More clean up
1 parent 68b4a63 commit ac4b194

1 file changed

Lines changed: 9 additions & 11 deletions

File tree

packages/devtools_app/lib/src/shared/analytics/_analytics_web.dart

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -746,8 +746,7 @@ set flutterClientId(String newFlutterClientId) {
746746
_flutterClientId = newFlutterClientId;
747747
}
748748

749-
Completer<void>? _computingDimensionsCompleter;
750-
bool _computingUserApplicationDimensions = false;
749+
Completer<bool>? _computingDimensionsSucceededCompleter;
751750

752751
// Computes the running application.
753752
void _computeUserApplicationCustomGTagData() {
@@ -830,35 +829,34 @@ Future<void> computeFlutterClientId() async {
830829
}
831830

832831
Future<void> setupDimensions() async {
833-
if (_computingDimensionsCompleter != null) {
834-
return _computingDimensionsCompleter!.future;
832+
if (_computingDimensionsSucceededCompleter != null) {
833+
await _computingDimensionsSucceededCompleter!.future;
834+
return;
835835
}
836836

837-
_computingDimensionsCompleter = Completer<void>();
837+
_computingDimensionsSucceededCompleter = Completer<bool>();
838+
bool success = false;
838839
try {
839840
computeDevToolsCustomGTagsData();
840841
computeDevToolsQueryParams();
841842
await computeFlutterClientId();
843+
success = true;
842844
} catch (e, st) {
843845
_log.warning('Failed to compute dimensions', e, st);
844846
} finally {
845-
_computingDimensionsCompleter!.complete();
847+
_computingDimensionsSucceededCompleter!.complete(success);
846848
}
847849
}
848850

849851
void setupUserApplicationDimensions() {
850-
if (serviceConnection.serviceManager.connectedApp == null ||
851-
_computingUserApplicationDimensions) {
852+
if (serviceConnection.serviceManager.connectedApp == null) {
852853
return;
853854
}
854855

855-
_computingUserApplicationDimensions = true;
856856
try {
857857
_computeUserApplicationCustomGTagData();
858858
} catch (e, st) {
859859
_log.warning('Failed to compute user application dimensions', e, st);
860-
} finally {
861-
_computingUserApplicationDimensions = false;
862860
}
863861
}
864862

0 commit comments

Comments
 (0)