feat(device) detect brand Multilaser models: MS40S, MS40G, MS55M, MS5…

…0L, MS70, MS50X issue matomo-org#6322
sanchezzzhak · Jun 29, 2020 · 4db8785 · 4db8785
1 parent 6d7b2ef
commit 4db8785
Show file tree

Hide file tree

Showing 2 changed files with 122 additions and 3 deletions.
diff --git a/Tests/fixtures/smartphone-14.yml b/Tests/fixtures/smartphone-14.yml
@@ -7834,4 +7834,123 @@
     model: MS45S A6
   os_family: Android
   browser_family: Android Browser
-
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 6.0; MS40S Build/MRA58K)
+  os:
+    name: Android
+    short_name: AND
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version: ""
+    engine: WebKit
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: 1R
+    model: MS40S
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 8.1.0; MS40G Build/V18_20200423)
+  os:
+    name: Android
+    short_name: AND
+    version: 8.1.0
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version: ""
+    engine: WebKit
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: 1R
+    model: MS40G
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 7.0; MS55M Build/NRD90M)
+  os:
+    name: Android
+    short_name: AND
+    version: "7.0"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version: ""
+    engine: WebKit
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: 1R
+    model: MS55M
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 7.0; MS50L Build/NRD90M)
+  os:
+    name: Android
+    short_name: AND
+    version: "7.0"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version: ""
+    engine: WebKit
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: 1R
+    model: MS50L
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 6.0; MS70 Build/LMY47D)
+  os:
+    name: Android
+    short_name: AND
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version: ""
+    engine: WebKit
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: 1R
+    model: MS70
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; Android 8.1.0; MS50X Build/V11_20190306; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.106 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: 8.1.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    short_name: CV
+    version: 83.0.4103.106
+    engine: Blink
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: 1R
+    model: MS50X
+  os_family: Android
+  browser_family: Chrome
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
@@ -14822,12 +14822,12 @@ How:
 
 # Multilaser
 Multilaser:
-  regex: '(Multilaser[ _](?:[FE])|MS50G|M7[_-]3G[_-]PLUS|MS45S_A6)[);/ ]'
+  regex: '(Multilaser[ _](?:[FE])|MS50[LGX]|M7[_-]3G[_-]PLUS|MS45S_A6|MS40[GS]|MS55M|MS70)[);/ ]'
   device: 'smartphone'
   models:
     - regex: 'Multilaser[ _]([FE])[);/ ]' #P9118
       model: '$1'
-    - regex: '(MS50G|MS45S_A6)[);/ ]'
+    - regex: '(MS50[LGX]|MS45S_A6|MS40[GS]|MS55M|MS70)[);/ ]'
       model: '$1'
     - regex: '(M7[_-]3G[_-]PLUS)[);/ ]'
       device: 'tablet'