From b284d69760b36732365d644bdf68bd6f5575abb6 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Wed, 31 Jul 2019 16:08:26 +0900 Subject: [PATCH] Try raw output for Android browser, Whale, webview --- common/framework/ua.php | 8 ++++++-- tests/unit/framework/UATest.php | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/common/framework/ua.php b/common/framework/ua.php index bbe63ab46..72a2e9347 100644 --- a/common/framework/ua.php +++ b/common/framework/ua.php @@ -346,11 +346,15 @@ class UA { $output_format = 'rfc5987'; } - elseif ($browser->browser === 'IE' || $browser->browser === 'Whale' || $browser->is_webview) + elseif ($browser->browser === 'IE') { $output_format = 'old_ie'; } - elseif ($browser->browser === 'Android' || $browser->browser === 'Chrome' || $browser->browser === 'Safari') + elseif ($browser->browser === 'Android' || $browser->browser === 'Whale' || $browser->is_webview) + { + $output_format = 'raw'; + } + elseif ($browser->browser === 'Chrome' || $browser->browser === 'Safari') { $output_format = 'raw'; } diff --git a/tests/unit/framework/UATest.php b/tests/unit/framework/UATest.php index c7bc33f40..06a1ec873 100644 --- a/tests/unit/framework/UATest.php +++ b/tests/unit/framework/UATest.php @@ -306,8 +306,8 @@ class UATest extends \Codeception\TestCase\Test $this->assertEquals('filename*=UTF-8\'\'%ED%95%9C%EA%B8%80%20filename.jpg', Rhymix\Framework\UA::encodeFilenameForDownload('한글 filename.jpg', 'Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; rv:11.0) like Gecko')); $this->assertEquals('filename="%ED%95%9C%EA%B8%80%20filename.jpg"', Rhymix\Framework\UA::encodeFilenameForDownload('한글 filename.jpg', 'MSIE 8.0')); $this->assertEquals('filename="%ED%95%9C%EA%B8%80%20filename.jpg"', Rhymix\Framework\UA::encodeFilenameForDownload('한글 filename.jpg', 'Unknown Browser')); - $this->assertEquals('filename="%ED%95%9C%EA%B8%80%20filename.jpg"', Rhymix\Framework\UA::encodeFilenameForDownload('한글 filename.jpg', 'Chrome/69.0.3497.128 Whale/1.0.0.0 Crosswalk/23.69.590.31 Mobile Safari/537.36 NAVER(inapp; search; 660; 10.7.2)')); - $this->assertEquals('filename="%ED%95%9C%EA%B8%80%20filename.jpg"', Rhymix\Framework\UA::encodeFilenameForDownload('한글 filename.jpg', 'Mozilla/5.0 (Linux; Android 9; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/75.0.3770.101 Mobile Safari/537.36')); + $this->assertEquals('filename="한글 filename.jpg"', Rhymix\Framework\UA::encodeFilenameForDownload('한글 filename.jpg', 'Chrome/69.0.3497.128 Whale/1.0.0.0 Crosswalk/23.69.590.31 Mobile Safari/537.36 NAVER(inapp; search; 660; 10.7.2)')); + $this->assertEquals('filename="한글 filename.jpg"', Rhymix\Framework\UA::encodeFilenameForDownload('한글 filename.jpg', 'Mozilla/5.0 (Linux; Android 9; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/75.0.3770.101 Mobile Safari/537.36')); $this->assertEquals('filename="%ED%95%9C%EA%B8%80%20filename.jpg"', Rhymix\Framework\UA::encodeFilenameForDownload('한글 filename.jpg', 'Dalvik/2.1.0 (Linux; U; Android 9)')); $this->assertEquals('filename="한글 filename.jpg"', Rhymix\Framework\UA::encodeFilenameForDownload('한글 filename.jpg', 'Safari/5.0 Version/5.0')); $this->assertEquals('filename="한글 filename.jpg"', Rhymix\Framework\UA::encodeFilenameForDownload('한글 filename.jpg', 'Linux; Android 5.1.1; Version/4.0 Chrome/43.0.2357.65 Mobile Safari/537.36'));