Skip to content

[camerax] Fixes unawaited_futures violations #4337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 24 commits into from
Jul 5, 2023
Merged

[camerax] Fixes unawaited_futures violations #4337

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
dec3d69
Merge remote-tracking branch 'upstream/main' into camx_occ
camsim99 May 1, 2023
0e0333b
Merge remote-tracking branch 'upstream/main'
camsim99 May 2, 2023
bd7ac99
Merge remote-tracking branch 'upstream/main'
camsim99 May 3, 2023
5c3363b
Merge remote-tracking branch 'upstream/main'
camsim99 May 10, 2023
fed9621
Undo changes
camsim99 May 10, 2023
5aabe34
Merge remote-tracking branch 'upstream/main'
camsim99 May 12, 2023
2b9a352
Merge remote-tracking branch 'upstream/main'
camsim99 May 25, 2023
a1173da
Merge remote-tracking branch 'upstream/main'
camsim99 May 30, 2023
cbc3d6b
Merge remote-tracking branch 'upstream/main'
camsim99 May 30, 2023
cae5a4c
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 1, 2023
72283db
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 5, 2023
166a77c
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 5, 2023
399780e
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 14, 2023
8d5d0e7
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 26, 2023
ccc0715
Add initial fixes
camsim99 Jun 28, 2023
0351c29
Merge remote-tracking branch 'upstream/main' into unawaited_futures_c…
camsim99 Jun 28, 2023
6b88aed
Bump version
camsim99 Jun 28, 2023
52b8faa
Make some modifications
camsim99 Jun 28, 2023
9d1d004
One last modification
camsim99 Jun 28, 2023
c0f6f52
Remove exception
camsim99 Jun 28, 2023
3dd2855
Merge branch 'main' into unawaited_futures_camerax
camsim99 Jun 28, 2023
c64b72d
revisions
camsim99 Jun 30, 2023
8c78b95
Merge branch 'unawaited_futures_camerax' of github.com:camsim99/packa…
camsim99 Jun 30, 2023
8913126
Merge remote-tracking branch 'upstream/main' into unawaited_futures_c…
camsim99 Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
revisions
  • Loading branch information
@camsim99
camsim99 committed Jun 30, 2023
commit c64b72df5f27759ebb18707c9b13fbe18fc8e0f3
2 changes: 1 addition & 1 deletion packages/camera/camera_android_camerax/example/lib/camera_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ class CameraController extends ValueNotifier<CameraValue> {
}

if (value.isStreamingImages) {
await stopImageStream();
unawaited(stopImageStream());
}

try {
Expand Down
4 changes: 2 additions & 2 deletions packages/camera/camera_android_camerax/lib/src/android_camera_camerax.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,17 +423,17 @@ class AndroidCameraCameraX extends CameraPlatform {
/// [cameraId] not used.
@override
Future<void> pausePreview(int cameraId) async {
await _unbindUseCaseFromLifecycle(preview!);
_previewIsPaused = true;
Copy link
Collaborator

@stuartmorgan-g stuartmorgan-g Jun 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like the mistake I made in maps: you're making a field update asynchronously instead of synchronously. You probably want to reverse the statement order.

Copy link
Contributor Author

@camsim99 camsim99 Jun 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah okay yes I'll reverse the order!

Copy link
Contributor Author

@camsim99 camsim99 Jun 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was also the case in resumePreview, so I modified it there, too.

await _unbindUseCaseFromLifecycle(preview!);
}

/// Resume the paused preview for the selected camera.
///
/// [cameraId] not used.
@override
Future<void> resumePreview(int cameraId) async {
await _bindPreviewToLifecycle(cameraId);
_previewIsPaused = false;
await _bindPreviewToLifecycle(cameraId);
}

/// Returns a widget showing a live camera preview.
Expand Down