From a1c5559aeecf260a5cbcb0f7755015a066e8c9ed Mon Sep 17 00:00:00 2001
From: sgiehl <stefan@piwik.org>
Date: Tue, 18 Feb 2014 09:38:43 +0100
Subject: [PATCH] improved detection of LG devices
---
.../regexes/mobiles.yml | 5 ++
.../UserAgentParserEnhanced/regexes/oss.yml | 2 +-
.../userAgentParserEnhancedFixtures.yml | 50 ++++++++++++++++++-
3 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/mobiles.yml b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/mobiles.yml
index bf1b08c74e..346cdca52a 100644
--- a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/mobiles.yml
+++ b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/mobiles.yml
@@ -618,6 +618,11 @@ LG:
model: '$1'
- regex: 'LGE;([a-z0-9\-]+)'
model: '$1'
+ - regex: 'LG[ _-](V90.*|Optimus.*) Build'
+ device: 'tablet'
+ model: '$1'
+ - regex: 'LG(?:/|-LG| |-)?(.*) Build'
+ model: '$1'
- regex: 'LG(?:/|-LG| |-)?([a-z0-9]+)'
model: '$1'
- regex: 'LG; ([a-z0-9 ]+)'
diff --git a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/oss.yml b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/oss.yml
index 5c950d50af..78a1e5ee42 100644
--- a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/oss.yml
+++ b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/oss.yml
@@ -47,7 +47,7 @@
##########
# Android
##########
-- regex: 'Android[ /](?:[a-z]+ )?(\d+\.\d+)'
+- regex: '(?:Android|Adr)[ /](?:[a-z]+ )?(\d+\.\d+)'
name: 'Android'
version: '$1'
diff --git a/tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml b/tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml
index a4debf285d..54413d40d7 100644
--- a/tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml
+++ b/tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml
@@ -17166,4 +17166,52 @@
brand: HT
model: ChaCha A810e
os_family: Android
- browser_family: Android Browser
\ No newline at end of file
+ browser_family: Android Browser
+-
+ user_agent: Mozilla/5.0 (Linux; Android 3.0.1; LG-V905R Build/HRI66) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.72 Safari/537.36 OPR/16.0.1212.63780
+ os:
+ name: Android
+ short_name: AND
+ version: 3.0
+ browser:
+ name: Opera Next
+ short_name: ON
+ version: 16.0
+ device:
+ type: tablet
+ brand: LG
+ model: V905R
+ os_family: Android
+ browser_family: Opera
+-
+ user_agent: Android 3.1;AppleWebKit/534.13;Build/HMJ37;LG Optimus Pad L-06C Build/HMJ37
+ os:
+ name: Android
+ short_name: AND
+ version: 3.1
+ browser:
+ name: Android Browser
+ short_name: AN
+ version:
+ device:
+ type: tablet
+ brand: LG
+ model: Optimus Pad L-06C
+ os_family: Android
+ browser_family: Android Browser
+-
+ user_agent: UCWEB/2.0 (Linux; U; Adr 4.0.4; en-US; LG-P895) U2/1.0.0 UCBrowser/8.6.0.276 U2/1.0.0 Mobile
+ os:
+ name: Android
+ short_name: AND
+ version: 4.0
+ browser:
+ name: UC Browser
+ short_name: UC
+ version: 8.6
+ device:
+ type: smartphone
+ brand: LG
+ model: P895
+ os_family: Android
+ browser_family: Unknown
\ No newline at end of file
--
GitLab