Skip to content

Commit 1b25138

Browse files
authored
Merge branch 'main' into feat/ttid-ttfd
2 parents 9e7c1f0 + b0811cc commit 1b25138

File tree

2 files changed

+11
-24
lines changed

2 files changed

+11
-24
lines changed

.github/workflows/flutter.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,17 @@ jobs:
9393
cd flutter
9494
flutter pub get
9595
96-
- name: Test chrome
96+
- name: Test chrome (exclude canvasKit)
9797
if: runner.os == 'Linux'
9898
run: |
9999
cd flutter
100100
flutter test --platform chrome --test-randomize-ordering-seed=random --exclude-tags canvasKit
101+
102+
# TODO: Revert when canvasKit is available again in `beta` channel
103+
- name: Test chrome (canvasKit)
104+
if: runner.os == 'Linux' && matrix.sdk != 'beta'
105+
run: |
106+
cd flutter
101107
flutter test --platform chrome --test-randomize-ordering-seed=random --tags canvasKit --web-renderer canvaskit
102108
103109
- name: Test VM with coverage

flutter/example/lib/main.dart

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -492,12 +492,8 @@ class MainScaffold extends StatelessWidget {
492492
TooltipButton(
493493
onPressed: () async {
494494
final id = await Sentry.captureMessage('UserFeedback');
495-
// ignore: use_build_context_synchronously
496-
if (!context.isMounted) {
497-
return;
498-
}
499495

500-
// ignore: use_build_context_synchronously
496+
if (!context.mounted) return;
501497
await showDialog(
502498
context: context,
503499
builder: (context) {
@@ -925,12 +921,7 @@ Future<void> makeWebRequest(BuildContext context) async {
925921

926922
await transaction.finish(status: const SpanStatus.ok());
927923

928-
// ignore: use_build_context_synchronously
929-
if (!context.isMounted) {
930-
return;
931-
}
932-
933-
// ignore: use_build_context_synchronously
924+
if (!context.mounted) return;
934925
await showDialog<void>(
935926
context: context,
936927
builder: (context) {
@@ -976,12 +967,7 @@ Future<void> makeWebRequestWithDio(BuildContext context) async {
976967
await span.finish();
977968
}
978969

979-
// ignore: use_build_context_synchronously
980-
if (!context.isMounted) {
981-
return;
982-
}
983-
984-
// ignore: use_build_context_synchronously
970+
if (!context.mounted) return;
985971
await showDialog<void>(
986972
context: context,
987973
builder: (context) {
@@ -1011,12 +997,7 @@ Future<void> showDialogWithTextAndImage(BuildContext context) async {
1011997
final text =
1012998
await DefaultAssetBundle.of(context).loadString('assets/lorem-ipsum.txt');
1013999

1014-
// ignore: use_build_context_synchronously
1015-
if (!context.isMounted) {
1016-
return;
1017-
}
1018-
1019-
// ignore: use_build_context_synchronously
1000+
if (!context.mounted) return;
10201001
await showDialog<void>(
10211002
context: context,
10221003
// gets tracked if using SentryNavigatorObserver

0 commit comments

Comments
 (0)