[[ Bug 22816 ]] Fix permissions when loading a local html file

livecodepanos · livecodepanos · commit 00aece3f2b93 · 2020-07-27T10:37:34.000+03:00
This patch uses the `loadFileURL:allowingReadAccessToURL:` instance
method of the WKWebView class to load a local html file. This fixes
an issue with insufficient permissions on iOS 12 devices that prevented
the html file from being loaded.
diff --git a/docs/notes/bugfix-22816.md b/docs/notes/bugfix-22816.md
@@ -0,0 +1 @@
+# Fix permissions when loading a local html file on iOS 12
diff --git a/libbrowser/src/libbrowser_wkwebview.mm b/libbrowser/src/libbrowser_wkwebview.mm
@@ -1618,7 +1618,10 @@ - (void) loadRequest:(MCWKWebViewLoadRequest *)request inWebView:(WKWebView *)we
 	MCBrowserRunBlockOnMainFiber(^{
 		if (request.htmlText == nil)
 		{
-			[webView loadRequest:[NSURLRequest requestWithURL:request.url]];
+			if (![request.url isFileURL])
+				[webView loadRequest:[NSURLRequest requestWithURL:request.url]];
+			else
+				[webView loadFileURL:request.url allowingReadAccessToURL:request.url.URLByDeletingLastPathComponent];
 		}
 		else
 		{

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix permissions when loading a local html file on iOS 12`
Original file line number	Diff line number	Diff line change
`@@ -1618,7 +1618,10 @@ - (void) loadRequest:(MCWKWebViewLoadRequest )request inWebView:(WKWebView )we`
`1618`	`1618`	`MCBrowserRunBlockOnMainFiber(^{`
`1619`	`1619`	`if (request.htmlText == nil)`
`1620`	`1620`	`{`
`1621`		`- [webView loadRequest:[NSURLRequest requestWithURL:request.url]];`
	`1621`	`+ if (![request.url isFileURL])`
	`1622`	`+ [webView loadRequest:[NSURLRequest requestWithURL:request.url]];`
	`1623`	`+ else`
	`1624`	`+ [webView loadFileURL:request.url allowingReadAccessToURL:request.url.URLByDeletingLastPathComponent];`
`1622`	`1625`	`}`
`1623`	`1626`	`else`
`1624`	`1627`	`{`