Skip to content

Commit f7e9672

Browse files
authored
Merge pull request #910 from Baseflow/feature/remove-duplicate-error-reporting
Remove duplicate error reporting
2 parents 7d3434a + 83a63d7 commit f7e9672

File tree

13 files changed

+25
-28
lines changed

13 files changed

+25
-28
lines changed

cached_network_image/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## [3.3.1] - 2023-12-31
2+
* Adding an errorListener prevents automatic reporting to global error handler.
3+
14
## [3.3.0] - 2023-09-25
25
* Add error to ErrorListener
36
* Update to Dart 3

cached_network_image/example/lib/main.dart

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import 'dart:io';
2+
13
import 'package:baseflow_plugin_template/baseflow_plugin_template.dart';
24
import 'package:cached_network_image/cached_network_image.dart';
35
import 'package:flutter/material.dart';
@@ -106,6 +108,13 @@ class BasicContent extends StatelessWidget {
106108
placeholder: (context, url) =>
107109
const CircularProgressIndicator(),
108110
errorWidget: (context, url, error) => const Icon(Icons.error),
111+
errorListener: (e) {
112+
if (e is SocketException) {
113+
print('Error with ${e.address} and message ${e.message}');
114+
} else {
115+
print('Image Exception is: ${e.runtimeType}');
116+
}
117+
},
109118
),
110119
),
111120
_sizedContainer(

cached_network_image/lib/src/image_provider/_image_loader.dart

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ class ImageLoader implements platform.ImageLoader {
2323
int? maxHeight,
2424
int? maxWidth,
2525
Map<String, String>? headers,
26-
VoidCallback? errorListener,
2726
ImageRenderMethodForWeb imageRenderMethodForWeb,
2827
VoidCallback evictImage,
2928
) {
@@ -39,7 +38,6 @@ class ImageLoader implements platform.ImageLoader {
3938
maxHeight,
4039
maxWidth,
4140
headers,
42-
(_) => errorListener?.call(),
4341
imageRenderMethodForWeb,
4442
evictImage,
4543
);
@@ -55,7 +53,6 @@ class ImageLoader implements platform.ImageLoader {
5553
int? maxHeight,
5654
int? maxWidth,
5755
Map<String, String>? headers,
58-
ErrorListener? errorListener,
5956
ImageRenderMethodForWeb imageRenderMethodForWeb,
6057
VoidCallback evictImage,
6158
) {
@@ -71,7 +68,6 @@ class ImageLoader implements platform.ImageLoader {
7168
maxHeight,
7269
maxWidth,
7370
headers,
74-
errorListener,
7571
imageRenderMethodForWeb,
7672
evictImage,
7773
);
@@ -86,7 +82,6 @@ class ImageLoader implements platform.ImageLoader {
8682
int? maxHeight,
8783
int? maxWidth,
8884
Map<String, String>? headers,
89-
ErrorListener? errorListener,
9085
ImageRenderMethodForWeb imageRenderMethodForWeb,
9186
VoidCallback evictImage,
9287
) async* {
@@ -137,8 +132,6 @@ class ImageLoader implements platform.ImageLoader {
137132
scheduleMicrotask(() {
138133
evictImage();
139134
});
140-
141-
errorListener?.call(e);
142135
rethrow;
143136
} finally {
144137
await chunkEvents.close();

cached_network_image/lib/src/image_provider/cached_network_image_provider.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ class CachedNetworkImageProvider
117117
maxHeight,
118118
maxWidth,
119119
headers,
120-
() => errorListener,
121120
imageRenderMethodForWeb,
122121
() => PaintingBinding.instance.imageCache.evict(key),
123122
);
@@ -171,7 +170,6 @@ class CachedNetworkImageProvider
171170
maxHeight,
172171
maxWidth,
173172
headers,
174-
errorListener,
175173
imageRenderMethodForWeb,
176174
() => PaintingBinding.instance.imageCache.evict(key),
177175
);

cached_network_image/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ topics:
66
- cache
77
- image
88
- network-image
9-
version: 3.3.0
9+
version: 3.3.1
1010
environment:
1111
sdk: ^3.0.0
1212
flutter: '>=3.10.0'
1313

1414
dependencies:
15-
cached_network_image_platform_interface: ^3.0.0
16-
cached_network_image_web: ^1.1.0
15+
cached_network_image_platform_interface: ^4.0.0
16+
cached_network_image_web: ^1.1.1
1717
flutter:
1818
sdk: flutter
1919
flutter_cache_manager: ^3.3.1

cached_network_image_platform_interface/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## [4.0.0] - 2023-12-31
2+
* Removed errorListener from ImageLoader interface
3+
14
## [3.0.0] - 2023-09-25
25
* Add error to ErrorListener
36
* Specify types

cached_network_image_platform_interface/lib/cached_network_image_platform_interface.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ class ImageLoader {
3535
int? maxHeight,
3636
int? maxWidth,
3737
Map<String, String>? headers,
38-
VoidCallback? errorListener,
3938
ImageRenderMethodForWeb imageRenderMethodForWeb,
4039
VoidCallback evictImage,
4140
) {
@@ -53,7 +52,6 @@ class ImageLoader {
5352
int? maxHeight,
5453
int? maxWidth,
5554
Map<String, String>? headers,
56-
ErrorListener? errorListener,
5755
ImageRenderMethodForWeb imageRenderMethodForWeb,
5856
VoidCallback evictImage,
5957
) {

cached_network_image_platform_interface/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: cached_network_image_platform_interface
22
description: Platform interface for CachedNetworkImage
3-
version: 3.0.0
3+
version: 4.0.0
44
homepage: https://github.com/Baseflow/flutter_cached_network_image
55

66
environment:

cached_network_image_platform_interface/test/cached_network_image_platform_interface_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ void main() {
2525
null,
2626
null,
2727
null,
28-
null,
2928
ImageRenderMethodForWeb.HttpGet,
3029
() => {},
3130
),

cached_network_image_web/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## [1.1.1] - 2023-12-31
2+
* Removed errorListener from ImageLoader interface
3+
14
## [1.1.0] - 2023-09-25
25
* Add error to ErrorListener
36
* Specify types

0 commit comments

Comments
 (0)