Merge pull request #6641 from Morph1984/web_browser_urls

applets/web: Resolve Nintendo CDN URLs
This commit is contained in:
Mai M 2021-07-15 03:26:36 -04:00 committed by GitHub
commit 8012c83a87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions

View File

@ -58,6 +58,16 @@ std::string GetMainURL(const std::string& url) {
return url.substr(0, index); return url.substr(0, index);
} }
std::string ResolveURL(const std::string& url) {
const auto index = url.find_first_of('%');
if (index == std::string::npos) {
return url;
}
return url.substr(0, index) + "lp1" + url.substr(index + 1);
}
WebArgInputTLVMap ReadWebArgs(const std::vector<u8>& web_arg, WebArgHeader& web_arg_header) { WebArgInputTLVMap ReadWebArgs(const std::vector<u8>& web_arg, WebArgHeader& web_arg_header) {
std::memcpy(&web_arg_header, web_arg.data(), sizeof(WebArgHeader)); std::memcpy(&web_arg_header, web_arg.data(), sizeof(WebArgHeader));
@ -407,6 +417,9 @@ void WebBrowser::InitializeShare() {}
void WebBrowser::InitializeWeb() { void WebBrowser::InitializeWeb() {
external_url = ParseStringValue(GetInputTLVData(WebArgInputTLVType::InitialURL).value()); external_url = ParseStringValue(GetInputTLVData(WebArgInputTLVType::InitialURL).value());
// Resolve Nintendo CDN URLs.
external_url = ResolveURL(external_url);
} }
void WebBrowser::InitializeWifi() {} void WebBrowser::InitializeWifi() {}