Skip to content
This repository has been archived by the owner on Aug 31, 2021. It is now read-only.

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

Open
wants to merge 1 commit into
base: develop-9.6
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/notes/bugfix-22816.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Fix permissions when loading a local html file on iOS 12
11 changes: 10 additions & 1 deletion libbrowser/src/libbrowser_wkwebview.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1618,7 +1618,16 @@ - (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
{
NSURL *t_docs_dir_url = [[[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] lastObject];
if ([request.url.absoluteString hasPrefix:t_docs_dir_url.absoluteString])
[webView loadFileURL:request.url allowingReadAccessToURL:t_docs_dir_url];
else
[webView loadFileURL:request.url allowingReadAccessToURL:request.url.URLByDeletingLastPathComponent];
}
}
else
{
Expand Down