improves detection of DEXP devices

matomo-org · Jun 5, 2017 · 4d205ce · 4d205ce
1 parent d5d68c6
commit 4d205ce
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 4 deletions.
diff --git a/Tests/fixtures/smartphone-1.yml b/Tests/fixtures/smartphone-1.yml
@@ -9097,7 +9097,27 @@
     model: Trooper X4.0
   os_family: Android
   browser_family: Chrome
-- 
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.2.2; DEXP Ursus 9EV 3G Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.68 Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: 4.2.2
+    platform:
+  client:
+    type: browser
+    name: Chrome
+    short_name: CH
+    version: 54.0.2840.68
+    engine: Blink
+    engine_version:
+  device:
+    type: tablet
+    brand: DX
+    model: Ursus 9EV 3G
+  os_family: Android
+  browser_family: Chrome
+-
   user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; fr-fr; KAZAM Trooper X45 Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
   os:
     name: Android

diff --git a/Tests/fixtures/smartphone.yml b/Tests/fixtures/smartphone.yml
@@ -6009,7 +6009,27 @@
     model: EverShine
   os_family: Android
   browser_family: Chrome
-- 
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.04; pt-pt; H135 Build/MocorDroid2.3.5) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
+  os:
+    name: MocorDroid
+    short_name: MCD
+    version: 2.3.5
+    platform:
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version:
+    engine: WebKit
+    engine_version: 533.1
+  device:
+    type: desktop
+    brand: DX
+    model: Atlas
+  os_family: Android
+  browser_family: Android Browser
+-
   user_agent: Mozilla/5.0 (Linux; U; Android 2.3.6; ar-eg; EverSmart Build/GRK39F) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
   os:
     name: Android

diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
@@ -1167,9 +1167,25 @@ Desay:
 
 # DEXP
 DEXP:
-  regex: 'Ixion ([^;/]+) Build'
+  regex: 'DEXP|(?:Ursus|Ixion)[ _]([^;/]+) Build|H135[ _]Build'
   device: 'smartphone'
-  model: 'Ixion $1'
+  models:
+    - regex: 'Ixion ([^;/]+) Build'
+      model: 'Ixion $1'
+
+    - regex: 'Ursus ([^;/]+) Build'
+      model: 'Ursus $1'
+      device: 'tablet'
+
+    # 15,6'' tablet
+    - regex: 'H135[ _]Build'
+      model: 'Atlas'
+      device: 'desktop'
+
+    - regex: 'DEXP[ _]([^;/]+) Build'
+      model: '$1'
+    - regex: 'DEXP[ _]([^);/]+)[);/ ]'
+      model: '$1'
 
 # Dbtel
 Dbtel: