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

Commit 525d9a7

Browse files
committed
Apply PR feedback
1 parent 43eb78e commit 525d9a7

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed

packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterAssetManagerHostApiImpl.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import android.webkit.WebView;
88
import io.flutter.plugins.webviewflutter.GeneratedAndroidWebView.FlutterAssetManagerHostApi;
99
import java.io.IOException;
10+
import java.util.ArrayList;
1011
import java.util.Arrays;
1112
import java.util.List;
1213

@@ -27,6 +28,11 @@ public FlutterAssetManagerHostApiImpl(FlutterAssetManager flutterAssetManager) {
2728
public List<String> list(String path) {
2829
try {
2930
String[] paths = flutterAssetManager.list(path);
31+
32+
if (paths == null) {
33+
return new ArrayList<>();
34+
}
35+
3036
return Arrays.asList(paths);
3137
} catch (IOException ex) {
3238
throw new RuntimeException(ex.getMessage());

packages/webview_flutter/webview_flutter_android/android/src/test/java/io/flutter/plugins/webviewflutter/FlutterAssetManagerHostApiImplTest.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,18 @@ public void list() {
4343
}
4444
}
4545

46+
@Test
47+
public void list_returns_empty_list_when_no_results() {
48+
try {
49+
when(mockFlutterAssetManager.list("test/path")).thenReturn(null);
50+
List<String> actualFilePaths = testFlutterAssetManagerHostApiImpl.list("test/path");
51+
verify(mockFlutterAssetManager).list("test/path");
52+
assertArrayEquals(new String[] {}, actualFilePaths.toArray());
53+
} catch (IOException ex) {
54+
fail();
55+
}
56+
}
57+
4658
@Test(expected = RuntimeException.class)
4759
public void list_should_convert_io_exception_to_runtime_exception() {
4860
try {

packages/webview_flutter/webview_flutter_android/pubspec.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ repository: https://github.com/flutter/plugins/tree/master/packages/webview_flut
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+webview%22
55
version: 2.5.0
66

7-
# TODO(mvanbeusekom): Remove when webview_flutter_platform_interface no longer referenced through path reference.
8-
publish_to: none
9-
107
environment:
118
sdk: ">=2.14.0 <3.0.0"
129
flutter: ">=2.5.0"
@@ -22,9 +19,7 @@ flutter:
2219
dependencies:
2320
flutter:
2421
sdk: flutter
25-
# TODO(mvanbeusekom): Update to pub.dev dependency once version 1.8.0 is released.
26-
webview_flutter_platform_interface:
27-
path: ../webview_flutter_platform_interface
22+
webview_flutter_platform_interface: ^1.8.0
2823

2924
dev_dependencies:
3025
build_runner: ^2.1.4

0 commit comments

Comments
 (0)