fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 03:32:00 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix filename encoding for Android 10 webview #1251

Browse source
This commit is contained in:
Kijin Sung 2020-03-11 16:58:09 +09:00
parent 49569b6139
commit 78e575f17b
2 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

23
common/framework/ua.php
View file

@ -228,6 +228,12 @@ class UA
return $result;
}
}
if ($result->os === 'Android' && preg_match('#^AndroidDownloadManager/([0-9])#', $ua, $matches))
{
$result->browser = 'Android';
$result->version = $matches[1];
return $result;
}
if (preg_match('#Edge/([0-9]+\\.)#', $ua, $matches))
{
$result->browser = 'Edge';
@ -335,8 +341,14 @@ class UA
// Get the browser name and version.
$browser = self::getBrowserInfo($ua);
// Get the Android version.
if ($browser->os === 'Android')
{
$android_version = preg_match('/Android ([0-9]+)/', $ua, $matches) ? intval($matches[1]) : 0;
}
// Find the best format that this browser supports.
if ($browser->browser === 'Chrome' && $browser->version >= 11 & !$browser->is_webview)
if ($browser->browser === 'Chrome' && $browser->version >= 11 && !$browser->is_webview)
{
$output_format = 'rfc5987';
}
@ -362,7 +374,14 @@ class UA
}
elseif ($browser->browser === 'Android' || $browser->browser === 'Whale' || $browser->is_webview)
{
$output_format = 'raw';
if ($android_version >= 10)
{
$output_format = 'rfc5987';
}
else
{
$output_format = 'raw';
}
}
elseif ($browser->browser === 'Chrome' || $browser->browser === 'Safari')
{