Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
Flutter Inappwebview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
李增强
Flutter Inappwebview
Commits
0f358f03
Commit
0f358f03
authored
5 years ago
by
Lorenzo Pichilli
Committed by
GitHub
5 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #262 from AlexVincent525/fix-crash-on-nil-or-invalid-url
Fix crash on nil/invalid URL (iOS)
parents
001c95eb
86b05967
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
ios/Classes/FlutterWebViewController.swift
ios/Classes/FlutterWebViewController.swift
+8
-6
lib/src/in_app_webview.dart
lib/src/in_app_webview.dart
+2
-2
No files found.
ios/Classes/FlutterWebViewController.swift
View file @
0f358f03
...
@@ -98,14 +98,16 @@ public class FlutterWebViewController: FlutterMethodCallDelegate, FlutterPlatfor
...
@@ -98,14 +98,16 @@ public class FlutterWebViewController: FlutterMethodCallDelegate, FlutterPlatfor
}
}
if
initialData
!=
nil
{
if
initialData
!=
nil
{
let
data
=
(
initialData
!
[
"data"
]
as?
String
)
!
let
data
=
(
initialData
!
[
"data"
])
!
let
mimeType
=
(
initialData
!
[
"mimeType"
]
as?
String
)
!
let
mimeType
=
(
initialData
!
[
"mimeType"
])
!
let
encoding
=
(
initialData
!
[
"encoding"
]
as?
String
)
!
let
encoding
=
(
initialData
!
[
"encoding"
])
!
let
baseUrl
=
(
initialData
!
[
"baseUrl"
]
as?
String
)
!
let
baseUrl
=
(
initialData
!
[
"baseUrl"
])
!
webView
!.
loadData
(
data
:
data
,
mimeType
:
mimeType
,
encoding
:
encoding
,
baseUrl
:
baseUrl
)
webView
!.
loadData
(
data
:
data
,
mimeType
:
mimeType
,
encoding
:
encoding
,
baseUrl
:
baseUrl
)
}
}
else
{
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
...
@@ -347,7 +349,7 @@ public class FlutterWebViewController: FlutterMethodCallDelegate, FlutterPlatfor
case
"printCurrentPage"
:
case
"printCurrentPage"
:
if
webView
!=
nil
{
if
webView
!=
nil
{
webView
!.
printCurrentPage
(
printCompletionHandler
:
{(
completed
,
error
)
in
webView
!.
printCurrentPage
(
printCompletionHandler
:
{(
completed
,
error
)
in
if
!
completed
,
let
e
=
error
{
if
!
completed
,
let
_
=
error
{
result
(
false
)
result
(
false
)
return
return
}
}
...
...
This diff is collapsed.
Click to expand it.
lib/src/in_app_webview.dart
View file @
0f358f03
...
@@ -383,7 +383,7 @@ class _InAppWebViewState extends State<InAppWebView> {
...
@@ -383,7 +383,7 @@ class _InAppWebViewState extends State<InAppWebView> {
gestureRecognizers:
widget
.
gestureRecognizers
,
gestureRecognizers:
widget
.
gestureRecognizers
,
layoutDirection:
TextDirection
.
rtl
,
layoutDirection:
TextDirection
.
rtl
,
creationParams:
<
String
,
dynamic
>{
creationParams:
<
String
,
dynamic
>{
'initialUrl'
:
widget
.
initialUrl
,
'initialUrl'
:
'
${Uri.parse(widget.initialUrl)}
'
,
'initialFile'
:
widget
.
initialFile
,
'initialFile'
:
widget
.
initialFile
,
'initialData'
:
widget
.
initialData
?.
toMap
(),
'initialData'
:
widget
.
initialData
?.
toMap
(),
'initialHeaders'
:
widget
.
initialHeaders
,
'initialHeaders'
:
widget
.
initialHeaders
,
...
@@ -416,7 +416,7 @@ class _InAppWebViewState extends State<InAppWebView> {
...
@@ -416,7 +416,7 @@ class _InAppWebViewState extends State<InAppWebView> {
onPlatformViewCreated:
_onPlatformViewCreated
,
onPlatformViewCreated:
_onPlatformViewCreated
,
gestureRecognizers:
widget
.
gestureRecognizers
,
gestureRecognizers:
widget
.
gestureRecognizers
,
creationParams:
<
String
,
dynamic
>{
creationParams:
<
String
,
dynamic
>{
'initialUrl'
:
widget
.
initialUrl
,
'initialUrl'
:
'
${Uri.parse(widget.initialUrl)}
'
,
'initialFile'
:
widget
.
initialFile
,
'initialFile'
:
widget
.
initialFile
,
'initialData'
:
widget
.
initialData
?.
toMap
(),
'initialData'
:
widget
.
initialData
?.
toMap
(),
'initialHeaders'
:
widget
.
initialHeaders
,
'initialHeaders'
:
widget
.
initialHeaders
,
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment