Merge pull request #262 from AlexVincent525/fix-crash-on-nil-or-inval…

…id-url Fix crash on nil/invalid URL (iOS)
pichillilorenzo · May 9, 2020 · 0f358f0 · 0f358f0
2 parents 001c95e + 86b0596
commit 0f358f0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/ios/Classes/FlutterWebViewController.swift b/ios/Classes/FlutterWebViewController.swift
@@ -98,14 +98,16 @@ public class FlutterWebViewController: FlutterMethodCallDelegate, FlutterPlatfor
         }
 
         if initialData != nil {
-            let data = (initialData!["data"] as? String)!
-            let mimeType = (initialData!["mimeType"] as? String)!
-            let encoding = (initialData!["encoding"] as? String)!
-            let baseUrl = (initialData!["baseUrl"] as? String)!
+            let data = (initialData!["data"])!
+            let mimeType = (initialData!["mimeType"])!
+            let encoding = (initialData!["encoding"])!
+            let baseUrl = (initialData!["baseUrl"])!
             webView!.loadData(data: data, mimeType: mimeType, encoding: encoding, baseUrl: baseUrl)
         }
         else {
-            webView!.loadUrl(url: URL(string: initialUrl)!, headers: initialHeaders)
+            if let url = URL(string: initialUrl) {
+                webView!.loadUrl(url: url, headers: initialHeaders)
+            }
         }
     }
 
@@ -347,7 +349,7 @@ public class FlutterWebViewController: FlutterMethodCallDelegate, FlutterPlatfor
             case "printCurrentPage":
                 if webView != nil {
                     webView!.printCurrentPage(printCompletionHandler: {(completed, error) in
-                        if !completed, let e = error {
+                        if !completed, let _ = error {
                             result(false)
                             return
                         }

diff --git a/lib/src/in_app_webview.dart b/lib/src/in_app_webview.dart
@@ -383,7 +383,7 @@ class _InAppWebViewState extends State<InAppWebView> {
         gestureRecognizers: widget.gestureRecognizers,
         layoutDirection: TextDirection.rtl,
         creationParams: <String, dynamic>{
-          'initialUrl': widget.initialUrl,
+          'initialUrl': '${Uri.parse(widget.initialUrl)}',
           'initialFile': widget.initialFile,
           'initialData': widget.initialData?.toMap(),
           'initialHeaders': widget.initialHeaders,
@@ -416,7 +416,7 @@ class _InAppWebViewState extends State<InAppWebView> {
         onPlatformViewCreated: _onPlatformViewCreated,
         gestureRecognizers: widget.gestureRecognizers,
         creationParams: <String, dynamic>{
-          'initialUrl': widget.initialUrl,
+          'initialUrl': '${Uri.parse(widget.initialUrl)}',
           'initialFile': widget.initialFile,
           'initialData': widget.initialData?.toMap(),
           'initialHeaders': widget.initialHeaders,