Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[camera] Fix disposed exceptions for the camera example on iOS #4692

Closed
wants to merge 1 commit into from
Closed

[camera] Fix disposed exceptions for the camera example on iOS #4692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 30 additions & 3 deletions packages/camera/camera/example/integration_test/camera_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@

import 'dart:async';
import 'dart:io';
import 'dart:ui';
import 'dart:ui' as ui;

import 'package:camera/camera.dart';
import 'package:flutter/painting.dart';
import 'package:camera_example/main.dart';
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:path_provider/path_provider.dart';
import 'package:video_player/video_player.dart';
Expand Down Expand Up @@ -63,7 +64,9 @@ void main() {

// Load picture
final File fileImage = File(file.path);
final Image image = await decodeImageFromList(fileImage.readAsBytesSync());
final ui.Image image = await decodeImageFromList(
fileImage.readAsBytesSync(),
);

// Verify image dimensions are as expected
expect(image, isNotNull);
Expand Down Expand Up @@ -292,4 +295,28 @@ void main() {
},
skip: !Platform.isIOS,
);

testWidgets(
'Disposed controller removed correctly',
(WidgetTester tester) async {
cameras = await availableCameras();
if (cameras.isEmpty) {
return;
}

// Bump the example.
await tester.pumpWidget(CameraApp());
await tester.pumpAndSettle(const Duration(seconds: 3));

// Tap to switch to the first camera.
await tester.tap(
find.byIcon(getCameraLensIcon(cameras.first.lensDirection)),
);
// Wait a few seconds to make sure the lifecycle changed.
await tester.pumpAndSettle(const Duration(seconds: 3));
// Ensure the controller is no longer depended by widgets.
final dynamic exception = tester.takeException();
expect(exception, isNull);
},
);
}
10 changes: 7 additions & 3 deletions packages/camera/camera/example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,12 @@ class _CameraExampleHomeState extends State<CameraExampleHome>

void onNewCameraSelected(CameraDescription cameraDescription) async {
if (controller != null) {
await controller!.dispose();
CameraController? _controller = controller!;
setState(() {
controller = null;
});
await _controller.dispose();
_controller = null;
}

final CameraController cameraController = CameraController(
Expand All @@ -636,8 +641,6 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
imageFormatGroup: ImageFormatGroup.jpeg,
);

controller = cameraController;

// If the controller is updated then update the UI.
cameraController.addListener(() {
if (mounted) setState(() {});
Expand Down Expand Up @@ -668,6 +671,7 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
.getMinZoomLevel()
.then((value) => _minAvailableZoom = value),
]);
controller = cameraController;
} on CameraException catch (e) {
_showCameraException(e);
}
Expand Down