zan1456/flutter
1
0
Fork 0
forked from firka/flutter
Code Pull Requests Activity

fix #25143 Successive calls to precacheImage() throw an exception (#25159)

Browse Source
This commit is contained in:
TruongSinh Tran-Nguyen
2019-01-03 12:05:53 +07:00
committed by xster
parent 85ded44139
commit 53727866e6
3 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@@ -32,3 +32,4 @@ Chema Molins <chemamolins@gmail.com>
Stefan Mitev <mr.mitew@gmail.com>
Jasper van Riet <jaspervanriet@gmail.com>
Mattijs Fuijkschot <mattijs.fuijkschot@gmail.com>
TruongSinh Tran-Nguyen <i@truongsinh.pro>

3
packages/flutter/lib/src/widgets/image.dart
View File

@@ -83,9 +83,11 @@ Future<void> precacheImage(
final ImageStream stream = provider.resolve(config);
void listener(ImageInfo image, bool sync) {
completer.complete();
stream.removeListener(listener);
}
void errorListener(dynamic exception, StackTrace stackTrace) {
completer.complete();
stream.removeListener(listener);
if (onError != null) {
onError(exception, stackTrace);
} else {
@@ -99,7 +101,6 @@ Future<void> precacheImage(
}
}
stream.addListener(listener, onError: errorListener);
completer.future.then<void>((void value) { stream.removeListener(listener); });
return completer.future;
}

22
packages/flutter/test/widgets/image_test.dart
View File

@@ -621,6 +621,28 @@ void main() {
expect(isSync, isTrue);
});
testWidgets('Precache remove listeners immediately after future completes, does not crash on successive calls #25143', (WidgetTester tester) async {
final TestImageStreamCompleter imageStreamCompleter = TestImageStreamCompleter();
final TestImageProvider provider = TestImageProvider(streamCompleter: imageStreamCompleter);
await tester.pumpWidget(
Builder(
builder: (BuildContext context) {
precacheImage(provider, context);
return Container();
}
)
);
expect(imageStreamCompleter.listeners.length, 2);
imageStreamCompleter.listeners.keys.toList()[1](null, null);
expect(imageStreamCompleter.listeners.length, 1);
imageStreamCompleter.listeners.keys.toList()[0](null, null);
expect(imageStreamCompleter.listeners.length, 0);
});
testWidgets('Precache completes with onError on error', (WidgetTester tester) async {
dynamic capturedException;
StackTrace capturedStackTrace;