Jelajahi Sumber

Rename onError to more explicit onHttpError

Roman Rodych 7 tahun lalu
induk
melakukan
765fdec2a5

+ 1 - 1
android/src/main/java/com/flutter_webview_plugin/BrowserClient.java

@@ -46,6 +46,6 @@ public class BrowserClient extends WebViewClient {
         Map<String, Object> data = new HashMap<>();
         data.put("url", request.getUrl().toString());
         data.put("code", Integer.toString(errorResponse.getStatusCode()));
-        FlutterWebviewPlugin.channel.invokeMethod("onError", data);
+        FlutterWebviewPlugin.channel.invokeMethod("onHttpError", data);
     }
 }

+ 1 - 1
example/android/app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     android:versionCode="1"
     android:versionName="0.0.1">
 
-    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="23" />
+    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" />
 
     <!-- The INTERNET permission is required for development. Specifically,
          flutter needs it to communicate with the running application

+ 4 - 4
example/lib/main.dart

@@ -58,7 +58,7 @@ class _MyHomePageState extends State<MyHomePage> {
   // On urlChanged stream
   StreamSubscription<WebViewStateChanged> _onStateChanged;
 
-  StreamSubscription<WebViewError> _onError;
+  StreamSubscription<WebViewHttpError> _onHttpError;
 
   TextEditingController _urlCtrl = new TextEditingController(text: selectedUrl);
 
@@ -106,10 +106,10 @@ class _MyHomePageState extends State<MyHomePage> {
       }
     });
 
-    _onError = flutterWebviewPlugin.onError.listen((WebViewError error) {
+    _onHttpError = flutterWebviewPlugin.onHttpError.listen((WebViewHttpError error) {
       if (mounted) {
         setState(() {
-          _history.add("onError: ${error.code} ${error.url}");
+          _history.add("onHttpError: ${error.code} ${error.url}");
         });
       }
     });
@@ -121,7 +121,7 @@ class _MyHomePageState extends State<MyHomePage> {
     _onDestroy.cancel();
     _onUrlChanged.cancel();
     _onStateChanged.cancel();
-    _onError.cancel();
+    _onHttpError.cancel();
 
     flutterWebviewPlugin.dispose();
 

+ 1 - 1
ios/Classes/FlutterWebviewPlugin.m

@@ -226,7 +226,7 @@ static NSString *const CHANNEL_NAME = @"flutter_webview_plugin";
     if ([navigationResponse.response isKindOfClass:[NSHTTPURLResponse class]]) {
         NSHTTPURLResponse * response = (NSHTTPURLResponse *)navigationResponse.response;
 
-        [channel invokeMethod:@"onError" arguments:@{@"code": [NSString stringWithFormat:@"%ld", response.statusCode], @"url": webView.URL.absoluteString}];
+        [channel invokeMethod:@"onHttpError" arguments:@{@"code": [NSString stringWithFormat:@"%ld", response.statusCode], @"url": webView.URL.absoluteString}];
     }
     decisionHandler(WKNavigationResponsePolicyAllow);
 }

+ 7 - 7
lib/src/base.dart

@@ -19,7 +19,7 @@ class FlutterWebviewPlugin {
   final _onDestroy = new StreamController<Null>.broadcast();
   final _onUrlChanged = new StreamController<String>.broadcast();
   final _onStateChanged = new StreamController<WebViewStateChanged>.broadcast();
-  final _onError = new StreamController<WebViewError>.broadcast();
+  final _onHttpError = new StreamController<WebViewHttpError>.broadcast();
 
   static FlutterWebviewPlugin _instance;
 
@@ -43,8 +43,8 @@ class FlutterWebviewPlugin {
               new Map<String, dynamic>.from(call.arguments)),
         );
         break;
-      case "onError":
-        _onError.add(WebViewError(call.arguments['code'], call.arguments['url']));
+      case "onHttpError":
+        _onHttpError.add(WebViewHttpError(call.arguments['code'], call.arguments['url']));
         break;
     }
   }
@@ -60,7 +60,7 @@ class FlutterWebviewPlugin {
   /// more detail than other events
   Stream<WebViewStateChanged> get onStateChanged => _onStateChanged.stream;
 
-  Stream<WebViewError> get onError => _onError.stream;
+  Stream<WebViewHttpError> get onHttpError => _onHttpError.stream;
 
   /// Start the Webview with [url]
   /// - [withJavascript] enable Javascript or not for the Webview
@@ -164,7 +164,7 @@ class FlutterWebviewPlugin {
     _onDestroy.close();
     _onUrlChanged.close();
     _onStateChanged.close();
-    _onError.close();
+    _onHttpError.close();
     _instance = null;
   }
 
@@ -219,9 +219,9 @@ class WebViewStateChanged {
   }
 }
 
-class WebViewError {
+class WebViewHttpError {
   final String url;
   final String code;
 
-  WebViewError(this.code, this.url);
+  WebViewHttpError(this.code, this.url);
 }