Improves detection for tablets (#7689)

* Improves detection for tablets * Change from U+0421 to U+0043 * Adds detection for bq Fnac 10" 3G
matomo-org · May 27, 2024 · 9208a48 · 9208a48
1 parent 27075fe
commit 9208a48
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 44 deletions.
diff --git a/DeviceDetector.php b/DeviceDetector.php
@@ -776,7 +776,7 @@ protected function getOsAttribute(string $attr): string
      */
     protected function hasAndroidTableFragment(): bool
     {
-        $regex = 'Android( [\.0-9]+)?; Tablet;|.*\-tablet$';
+        $regex = 'Android( [\.0-9]+)?; Tablet;|Tablet(?! PC)|.*\-tablet$';
 
         return !!$this->matchUserAgent($regex);
     }

diff --git a/Tests/fixtures/desktop.yml b/Tests/fixtures/desktop.yml
@@ -676,24 +676,6 @@
     model: ""
   os_family: GNU/Linux
   browser_family: Unknown
--
-  user_agent: Mozilla/5.0 (X11; U; Linux armv7l; en-GB; rv:1.9.2a1pre) Gecko/20090514 Firefox/3.0 Tablet browser 0.9.7 RX-34
-  os:
-    name: GNU/Linux
-    version: ""
-    platform: ARM
-  client:
-    type: browser
-    name: MicroB
-    version: 0.9.7
-    engine: Gecko
-    engine_version: 1.9.2
-  device:
-    type: desktop
-    brand: ""
-    model: ""
-  os_family: GNU/Linux
-  browser_family: Firefox
 -
   user_agent: Mozilla/5.0 (X11; Linux) AppleWebKit/535.22 (KHTML, like Gecko) Chrome/18.0.1025.133 Safari/535.22 Midori/0.5
   os:

diff --git a/Tests/fixtures/smartphone-4.yml b/Tests/fixtures/smartphone-4.yml
@@ -5751,7 +5751,7 @@
   device:
     type: smartphone
     brand: Fly
-    model: Сhamp
+    model: Champ
   os_family: Android
   browser_family: Chrome
 -

diff --git a/Tests/fixtures/tablet-1.yml b/Tests/fixtures/tablet-1.yml
@@ -2262,7 +2262,7 @@
   device:
     type: tablet
     brand: bq
-    model: Сharm
+    model: Charm
   os_family: Android
   browser_family: Chrome
 -
@@ -2280,7 +2280,7 @@
   device:
     type: tablet
     brand: bq
-    model: Сharm Plus
+    model: Charm Plus
   os_family: Android
   browser_family: Chrome
 -

diff --git a/Tests/fixtures/tablet-11.yml b/Tests/fixtures/tablet-11.yml
@@ -5597,3 +5597,21 @@
     model: P40HD
   os_family: Android
   browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; es-es; tablet Fnac 10 3G Build/1.1.11-1015 20130125-16:17) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
+  os:
+    name: Android
+    version: 4.0.4
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: tablet
+    brand: bq
+    model: Fnac 10" 3G
+  os_family: Android
+  browser_family: Android Browser
diff --git a/Tests/fixtures/unknown.yml b/Tests/fixtures/unknown.yml
@@ -1681,24 +1681,6 @@
     model: ""
   os_family: Android
   browser_family: Android Browser
--
-  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; es-es; tablet Fnac 10 3G Build/1.1.11-1015 20130125-16:17) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
-  os:
-    name: Android
-    version: 4.0.4
-    platform: ""
-  client:
-    type: browser
-    name: Android Browser
-    version: ""
-    engine: WebKit
-    engine_version: "534.30"
-  device:
-    type: ""
-    brand: ""
-    model: ""
-  os_family: Android
-  browser_family: Android Browser
 -
   user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; es-us; f7 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
   os:
@@ -3395,3 +3377,37 @@
     model: ""
   os_family: iOS
   browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (X11; U; Linux armv7l; en-GB; rv:1.9.2a1pre) Gecko/20090514 Firefox/3.0 Tablet browser 0.9.7 RX-34
+  os:
+    name: GNU/Linux
+    version: ""
+    platform: ARM
+  client:
+    type: browser
+    name: MicroB
+    version: 0.9.7
+    engine: Gecko
+    engine_version: 1.9.2
+  device:
+    type: tablet
+    brand: ""
+    model: ""
+  os_family: GNU/Linux
+  browser_family: Firefox
+-
+  user_agent: Pinterest for Android Tablet/11.42.2 (trona; 9)
+  os:
+    name: Android
+    version: "9"
+    platform: ""
+  client:
+    type: mobile app
+    name: Pinterest
+    version: 11.42.2
+  device:
+    type: tablet
+    brand: ""
+    model: ""
+  os_family: Android
+  browser_family: Unknown
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
@@ -5236,7 +5236,7 @@ Bmobile:
 
 # bq
 bq:
-  regex: 'Aquaris|bq [^/;]+ Build|BQS[-_]([0-9]{4})|(BQ(ru)?[_ -][0-9]{3,4})|BQ5059|BQ1008G|BQru_BQru-|Edison 3|Smart_TV_BQ'
+  regex: 'Aquaris|bq [^/;]+ Build|BQS[-_]([0-9]{4})|(BQ(ru)?[_ -][0-9]{3,4})|BQ5059|BQ1008G|BQru_BQru-|Edison 3|Smart_TV_BQ|Fnac 10 3G'
   device: 'smartphone'
   models:
     - regex: 'BQ(?:ru)?-(?:5209L|5044)(?:[);/ ]|$)'
@@ -5299,6 +5299,9 @@ bq:
     - regex: 'BQ-7022(G)?'
       model: 'Canion'
       device: 'tablet'
+    - regex: 'Fnac 10 3G'
+      model: 'Fnac 10" 3G'
+      device: 'tablet'
     - regex: 'BQ-7021G'
       model: 'Hit'
       device: 'tablet'
@@ -5637,10 +5640,10 @@ bq:
       model: 'Malta'
       device: 'tablet'
     - regex: 'BQ-7000G(?:[);/ ]|$)'
-      model: 'Сharm'
+      model: 'Charm'
       device: 'tablet'
     - regex: 'BQ-7040G(?:[);/ ]|$)'
-      model: 'Сharm Plus'
+      model: 'Charm Plus'
       device: 'tablet'
     - regex: 'BQ-7038G(?:[);/ ]|$)'
       model: 'Light Plus'
@@ -28321,7 +28324,7 @@ Fly:
     - regex: 'FS528'
       model: 'Memory Plus'
     - regex: 'FS529'
-      model: 'Сhamp'
+      model: 'Champ'
     - regex: 'FS530'
       model: 'Power Plus XXL'
     - regex: 'FS454'