Apply feedback on PR

mvanbeusekom · mvanbeusekom · commit d5cf9f9887c9 · 2021-11-11T17:09:22.000+01:00
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/lib/main.dart b/packages/webview_flutter/webview_flutter_wkwebview/example/lib/main.dart
@@ -46,7 +46,11 @@ const String kLocalFileExamplePage = '''
 <body>
 
 <h1>Local demo page</h1>
-<p>This is an example page used to demonstrate how to load a local file or HTML string using the <a href="https://pub.dev/packages/webview_flutter">Flutter webview</a> plugin.</p>
+<p>
+  This is an example page used to demonstrate how to load a local file or HTML 
+  string using the <a href="https://pub.dev/packages/webview_flutter">Flutter 
+  webview</a> plugin.
+</p>
 
 </body>
 </html>
@@ -343,10 +347,6 @@ class _SampleMenu extends StatelessWidget {
     final String tmpDir = (await getTemporaryDirectory()).path;
     File indexFile = File('$tmpDir/www/index.html');
 
-    if (await indexFile.exists()) {
-      return indexFile.path;
-    }
-
     await Directory('$tmpDir/www').create(recursive: true);
     await indexFile.writeAsString(kLocalFileExamplePage);
 
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/lib/web_view.dart b/packages/webview_flutter/webview_flutter_wkwebview/example/lib/web_view.dart
@@ -315,7 +315,6 @@ class WebViewController {
   Future<void> loadFile(
     String absoluteFilePath,
   ) {
-    assert(absoluteFilePath != null || absoluteFilePath.isNotEmpty);
     return _webViewPlatformController.loadFile(absoluteFilePath);
   }
 
@@ -327,7 +326,6 @@ class WebViewController {
     String html, {
     String? baseUrl,
   }) {
-    assert(html != null || html.isNotEmpty);
     return _webViewPlatformController.loadHtmlString(
       html,
       baseUrl: baseUrl,
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FlutterWebView.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FlutterWebView.m
@@ -206,6 +206,17 @@ - (void)onLoadFile:(FlutterMethodCall*)call result:(FlutterResult)result {
   }
 
   NSURL* url = [NSURL fileURLWithPath:[call arguments] isDirectory:NO];
+
+  if (!url) {
+    NSString* errorDetails = [NSString stringWithFormat:@"Initializing NSURL with the supplied "
+                                                        @"'%@' path resulted in a nil value.",
+                                                        [call arguments]];
+    result([FlutterError errorWithCode:@"loadFile_failed"
+                               message:@"Failed parsing file path."
+                               details:errorDetails]);
+    return;
+  }
+
   NSURL* baseUrl = [url URLByDeletingLastPathComponent];
 
   [_webView loadFileURL:url allowingReadAccessToURL:baseUrl];
@@ -214,7 +225,7 @@ - (void)onLoadFile:(FlutterMethodCall*)call result:(FlutterResult)result {
 
 - (void)onLoadHtmlString:(FlutterMethodCall*)call result:(FlutterResult)result {
   NSDictionary* arguments = [call arguments];
-  if (!arguments || ![arguments isKindOfClass:NSDictionary.class]) {
+  if (![arguments isKindOfClass:NSDictionary.class]) {
     result([FlutterError
         errorWithCode:@"loadHtmlString_failed"
               message:@"Failed parsing arguments."
@@ -603,6 +614,14 @@ - (void)updateUserAgent:(NSString*)userAgent {
   }
 }
 
+/**
+ * Validates if the given `argument` is a non-null non-empty string.
+ *
+ * @param argument The argument that should be validated.
+ * @param errorDetails An optional NSString variable which will contain a detailed error message in
+ * case the supplied argument is not valid.
+ * @return `true` if the given `argument` is a valid non-null, non-empty string; otherwise `false`.
+ */
 + (bool)isValidStringArgument:(id)argument withErrorMessage:(NSString**)errorDetails {
   if (!argument) {
     if (errorDetails) {
