From 62cc8e2ef82da43fd124eed8780dabfa3896ccc0 Mon Sep 17 00:00:00 2001
From: Tutik Alexsandr <sanchezzzhak@ya.ru>
Date: Mon, 1 May 2023 21:40:03 +0300
Subject: [PATCH] Detect new brands: Advantage Air, Motiv, OneLern, Ober,
 Oking, Olkya and Detect devices for exist brands: Tecno Mobile, Vivo, TCL,
 Samsung  (#7395)

* feat(device) detect brand Xiaomi: Redmi Note 12 (23021RAAEG)
feat(device) detect brand Tecno Mobile: Spark 10 (TECNO KI5q), Spark 10C (TECNO KI5m), Phantom X2 Pro (TECNO AD9)
feat(device) detect brand Vivo: V27e (V2237), X80 Pro (V2186A)
feat(device) detect brand Samsung: Galaxy A54 5G (SM-A546E)
feat(device) detect brand TCL: 40 SE (T610K)
feat(device) detect brand Ulefone: Power Armor 18
feat(device) detect brand Blackview: BV5200 Pro
feat(device) detect brand F150: Air1 Ultra+
feat(device) detect brand Motorola: Moto G53 (XT2335-3)
feat(device) detect brand SUNWIND: Sky Kids 70

* feat(device) detect brand Digma: Optima 1240C, Optima 7 E200 3G, Optima 8250C, Optima 8258C 4G
feat(device) detect brand SUNWIND: Sky 7143B 3G
feat(device) detect brand Tecno Mobile: Pop 6 (TECNO BF6)

* feat(device) detect new brand Advantage Air: PIC7GS8
feat(device) detect new brand Motiv: TurboPhone4G Compact 2108
feat(device) detect new brand OneLern: DB009
feat(device) detect brand Doogee: Turbo Mini F1
feat(device) detect brand Bluedot: BNT-801W
feat(device) detect brand Newland: MT65 Beluga IV
feat(device) detect brand CipherLab: RS51 HS
feat(device) detect brand GoldMaster: Netta 3, Netta 2 Pro
feat(device) detect brand Tolino: Tolino Tab 8
feat(device) detect brand Amazon: Fire TV Omni QLED (2022) (AFTTIFF43)
feat(device) detect brand Cherry Mobile: Omega Lite 2
feat(device) detect brand Okapia: Mirage
feat(device) detect brand Primux: Omega 6 4G
feat(device) detect brand Epik One: RS550
feat(device) detect brand Tecno Mobile: Camon iSky 2

* feat(device) detect new brand Ober: Primo E8
feat(device) detect new brand Oking: Smart 11, LS2, LS1, LX6, LX5
feat(device) detect new brand Olkya: Liger 71G
feat(device) detect brand Chico Mobile: Ojos Vivir, Ojos Plus, Ojos DOS Mini, Ojos DOS
---
 Parser/Device/AbstractDeviceParser.php |   6 +
 Tests/fixtures/peripheral.yml          |  18 +
 Tests/fixtures/phablet-1.yml           |  18 +
 Tests/fixtures/smartphone-35.yml       | 540 +++++++++++++++++++++++++
 Tests/fixtures/tablet-9.yml            | 198 +++++++++
 Tests/fixtures/tv-2.yml                |  54 +++
 regexes/device/mobiles.yml             | 134 ++++--
 7 files changed, 945 insertions(+), 23 deletions(-)

diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php
index adcfef8638..f9a2194e8e 100644
--- a/Parser/Device/AbstractDeviceParser.php
+++ b/Parser/Device/AbstractDeviceParser.php
@@ -100,6 +100,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'ACT' => 'actiMirror',
         'A9'  => 'Advan',
         'AD'  => 'Advance',
+        'ADV' => 'Advantage Air',
         '76'  => 'Adronix',
         'AF'  => 'AfriOne',
         'FY'  => 'AFFIX',
@@ -952,6 +953,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'M4'  => 'Modecom',
         'MF'  => 'Mofut',
         'MR'  => 'Motorola',
+        'MIV' => 'Motiv',
         'MV'  => 'Movic',
         'MOV' => 'Movitel',
         'MO1' => 'MOVISUN',
@@ -1052,18 +1054,22 @@ abstract class AbstractDeviceParser extends AbstractParser
         'O7'  => 'Oale',
         'OC'  => 'OASYS',
         'OB'  => 'Obi',
+        'OBR' => 'Ober',
         'OQ'  => 'Meta',
         'O1'  => 'Odys',
         'ODP' => 'Odotpad',
         'O9'  => 'Ok',
         'OA'  => 'Okapia',
+        'OKI' => 'Oking',
         'OLA' => 'Olax',
+        'OLK' => 'Olkya',
         'OLY' => 'Olympia',
         'OLT' => 'OLTO',
         'OJ'  => 'Ookee',
         'OD'  => 'Onda',
         'ON'  => 'OnePlus',
         'ONC' => 'OneClick',
+        'ONL' => 'OneLern',
         'OAN' => 'Oangcc',
         'OX'  => 'Onix',
         '3O'  => 'ONYX BOOX',
diff --git a/Tests/fixtures/peripheral.yml b/Tests/fixtures/peripheral.yml
index 9f98c297da..397ec931b0 100644
--- a/Tests/fixtures/peripheral.yml
+++ b/Tests/fixtures/peripheral.yml
@@ -1074,3 +1074,21 @@
     model: H3
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 8.1.0; NLS-MT65) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.61 Mobile Safari/537.36
+  os:
+    name: Android
+    version: 8.1.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 101.0.4951.61
+    engine: Blink
+    engine_version: 101.0.4951.61
+  device:
+    type: peripheral
+    brand: Newland
+    model: MT65 Beluga IV
+  os_family: Android
+  browser_family: Chrome
diff --git a/Tests/fixtures/phablet-1.yml b/Tests/fixtures/phablet-1.yml
index 2af244eefb..3400b7c148 100644
--- a/Tests/fixtures/phablet-1.yml
+++ b/Tests/fixtures/phablet-1.yml
@@ -949,3 +949,21 @@
     model: Redmi Note 12
   os_family: Android
   browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 13; 23021RAAEG) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 YaApp_Android/23.34.1 YaSearchBrowser/23.34.1 BroPP/1.0 SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "13"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 23.34.1
+    engine: Blink
+    engine_version: 110.0.0.0
+  device:
+    type: phablet
+    brand: Xiaomi
+    model: Redmi Note 12
+  os_family: Android
+  browser_family: Unknown
diff --git a/Tests/fixtures/smartphone-35.yml b/Tests/fixtures/smartphone-35.yml
index a00d35ee05..02908ddf32 100644
--- a/Tests/fixtures/smartphone-35.yml
+++ b/Tests/fixtures/smartphone-35.yml
@@ -4559,3 +4559,543 @@
     model: G10 Plus
   os_family: Android
   browser_family: Opera
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 13; TECNO KI5q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 YaBrowser/23.3.4.84.00 SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "13"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 23.3.4.84.00
+    engine: Blink
+    engine_version: 110.0.0.0
+  device:
+    type: smartphone
+    brand: Tecno Mobile
+    model: Spark 10
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 13; V2237) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 YaSearchBrowser/23.31.1 BroPP/1.0 YaSearchApp/23.31.1 webOmni SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "13"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 23.31.1
+    engine: Blink
+    engine_version: 110.0.0.0
+  device:
+    type: smartphone
+    brand: Vivo
+    model: V27e
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 13; SM-A546E) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 YaSearchBrowser/23.31.1 BroPP/1.0 YaSearchApp/23.31.1 webOmni SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "13"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 23.31.1
+    engine: Blink
+    engine_version: 110.0.0.0
+  device:
+    type: smartphone
+    brand: Samsung
+    model: Galaxy A54 5G
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 13; T610K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 YaBrowser/23.3.3.88.00 SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "13"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 23.3.3.88.00
+    engine: Blink
+    engine_version: 110.0.0.0
+  device:
+    type: smartphone
+    brand: TCL
+    model: 40 SE
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 12; TECNO KI5m) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 YaSearchBrowser/23.33.1 BroPP/1.0 YaSearchApp/23.33.1 webOmni SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 23.33.1
+    engine: Blink
+    engine_version: 110.0.0.0
+  device:
+    type: smartphone
+    brand: Tecno Mobile
+    model: Spark 10C
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 12; TECNO AD9) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 YaBrowser/23.3.3.86.00 SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 23.3.3.86.00
+    engine: Blink
+    engine_version: 110.0.0.0
+  device:
+    type: smartphone
+    brand: Tecno Mobile
+    model: Phantom X2 Pro
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 12; Power Armor 18) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 YaBrowser/23.3.2.86.00 SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 23.3.2.86.00
+    engine: Blink
+    engine_version: 110.0.0.0
+  device:
+    type: smartphone
+    brand: Ulefone
+    model: Power Armor 18
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 12; BV5200 Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 YaBrowser/23.3.2.86.00 SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 23.3.2.86.00
+    engine: Blink
+    engine_version: 110.0.0.0
+  device:
+    type: smartphone
+    brand: Blackview
+    model: BV5200 Pro
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm_64; Android 12; Air1 Ultra+) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 YaBrowser/23.3.4.84.00 SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 23.3.4.84.00
+    engine: Blink
+    engine_version: 110.0.0.0
+  device:
+    type: smartphone
+    brand: F150
+    model: Air1 Ultra+
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 13; V2186A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.5563.115 Mobile Safari/537.36 OPR/75.0.3955.71437
+  os:
+    name: Android
+    version: "13"
+    platform: ""
+  client:
+    type: browser
+    name: Opera Mobile
+    version: 75.0.3955.71437
+    engine: Blink
+    engine_version: 111.0.5563.115
+  device:
+    type: smartphone
+    brand: Vivo
+    model: X80 Pro
+  os_family: Android
+  browser_family: Opera
+-
+  user_agent: Mozilla/5.0 (Linux; Android 13; XT2335-3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "13"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 111.0.0.0
+    engine: Blink
+    engine_version: 111.0.0.0
+  device:
+    type: smartphone
+    brand: Motorola
+    model: Moto G53
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; arm; Android 12; TECNO BF6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 YaSearchBrowser/23.33.1 BroPP/1.0 YaSearchApp/23.33.1 webOmni SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 23.33.1
+    engine: Blink
+    engine_version: 110.0.0.0
+  device:
+    type: smartphone
+    brand: Tecno Mobile
+    model: Pop 6
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 8.1.0; RS51_HS) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: 8.1.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 102.0.0.0
+    engine: Blink
+    engine_version: 102.0.0.0
+  device:
+    type: smartphone
+    brand: CipherLab
+    model: RS51 HS
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 8.1.0; RS550) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: 8.1.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 102.0.0.0
+    engine: Blink
+    engine_version: 102.0.0.0
+  device:
+    type: smartphone
+    brand: Epik One
+    model: RS550
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 8.1.0; TECNO IN1 Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: 8.1.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 103.0.0.0
+    engine: Blink
+    engine_version: 103.0.0.0
+  device:
+    type: smartphone
+    brand: Tecno Mobile
+    model: Camon iSky 2
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.4; TurboPhone4G Compact 2108) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.96 Mobile Safari/537.36
+  os:
+    name: Android
+    version: 4.4.4
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 81.0.4044.96
+    engine: Blink
+    engine_version: 81.0.4044.96
+  device:
+    type: smartphone
+    brand: Motiv
+    model: TurboPhone4G Compact 2108
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.4; Turbo_mini_F1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.143 Mobile Safari/537.36
+  os:
+    name: Android
+    version: 4.4.4
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 75.0.3770.143
+    engine: Blink
+    engine_version: 75.0.3770.143
+  device:
+    type: smartphone
+    brand: Doogee
+    model: Turbo Mini F1
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 5.1; Omega_lite_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.89 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "5.1"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 84.0.4147.89
+    engine: Blink
+    engine_version: 84.0.4147.89
+  device:
+    type: smartphone
+    brand: Cherry Mobile
+    model: Omega Lite 2
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 5.1; Omega6_4G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "5.1"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 80.0.3987.149
+    engine: Blink
+    engine_version: 80.0.3987.149
+  device:
+    type: smartphone
+    brand: Primux
+    model: Omega 6 4G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 5.1; Okapia_Mirage) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "5.1"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 81.0.4044.138
+    engine: Blink
+    engine_version: 81.0.4044.138
+  device:
+    type: smartphone
+    brand: Okapia
+    model: Mirage
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 5.1; OK-smart11 Build/LMY47I; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/43.0.2357.121 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "5.1"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 43.0.2357.121
+    engine: Blink
+    engine_version: 43.0.2357.121
+  device:
+    type: smartphone
+    brand: Oking
+    model: Smart 11
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 5.1; OK-LS2 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "5.1"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 30.0.0.0
+    engine: Blink
+    engine_version: 30.0.0.0
+  device:
+    type: smartphone
+    brand: Oking
+    model: LS2
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 5.1; OK-LS1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "5.1"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 77.0.3865.92
+    engine: Blink
+    engine_version: 77.0.3865.92
+  device:
+    type: smartphone
+    brand: Oking
+    model: LS1
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 6.0; OK-LX6 Build/LMY47I; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/43.0.2357.121 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 43.0.2357.121
+    engine: Blink
+    engine_version: 43.0.2357.121
+  device:
+    type: smartphone
+    brand: Oking
+    model: LX6
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 6.0; OK-LX5 Build/LMY47I; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/43.0.2357.121 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 43.0.2357.121
+    engine: Blink
+    engine_version: 43.0.2357.121
+  device:
+    type: smartphone
+    brand: Oking
+    model: LX5
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 6.0; OJOS VIVIR Build/LMY47I) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/39.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 39.0.0.0
+    engine: Blink
+    engine_version: 39.0.0.0
+  device:
+    type: smartphone
+    brand: Chico Mobile
+    model: Ojos Vivir
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 6.0; OJOS PLUS) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.117 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 80.0.3987.117
+    engine: Blink
+    engine_version: 80.0.3987.117
+  device:
+    type: smartphone
+    brand: Chico Mobile
+    model: Ojos Plus
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 6.0; OJOS DOS mini Build/LMY47I) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/39.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 39.0.0.0
+    engine: Blink
+    engine_version: 39.0.0.0
+  device:
+    type: smartphone
+    brand: Chico Mobile
+    model: Ojos DOS Mini
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 6.0; OJOS DOS Build/LMY47I; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/72.0.3626.121 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 72.0.3626.121
+    engine: Blink
+    engine_version: 72.0.3626.121
+  device:
+    type: smartphone
+    brand: Chico Mobile
+    model: Ojos DOS
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 6.0; OBER_Primo E8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.101 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 75.0.3770.101
+    engine: Blink
+    engine_version: 75.0.3770.101
+  device:
+    type: smartphone
+    brand: Ober
+    model: Primo E8
+  os_family: Android
+  browser_family: Chrome
diff --git a/Tests/fixtures/tablet-9.yml b/Tests/fixtures/tablet-9.yml
index 1f41d714b8..4726c91960 100644
--- a/Tests/fixtures/tablet-9.yml
+++ b/Tests/fixtures/tablet-9.yml
@@ -6237,3 +6237,201 @@
     model: CITI Kids 80
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 10; SKY Kids 70 SS7238PG) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "10"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 111.0.0.0
+    engine: Blink
+    engine_version: 111.0.0.0
+  device:
+    type: tablet
+    brand: SUNWIND
+    model: Sky Kids 70
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; arm; Android 11; Optima 1240C TS1276AW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 YaSearchBrowser/23.33/apad BroPP/1.0 YaSearchApp/23.33/apad webOmni SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: "23.33"
+    engine: Blink
+    engine_version: 110.0.0.0
+  device:
+    type: tablet
+    brand: Digma
+    model: Optima 1240C
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm; Android 11; Optima 7 E200 3G TS7244PG) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 YaBrowser/23.3.3.88.01 Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 23.3.3.88.01
+    engine: Blink
+    engine_version: 110.0.0.0
+  device:
+    type: tablet
+    brand: Digma
+    model: Optima 7 E200 3G
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm; Android 11; Optima 8250C TS8274AW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 YaBrowser/23.3.2.86.01 Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 23.3.2.86.01
+    engine: Blink
+    engine_version: 110.0.0.0
+  device:
+    type: tablet
+    brand: Digma
+    model: Optima 8250C
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm; Android 11; Optima 8258C 4G TS8275ML) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 YaBrowser/23.3.2.86.01 Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 23.3.2.86.01
+    engine: Blink
+    engine_version: 110.0.0.0
+  device:
+    type: tablet
+    brand: Digma
+    model: Optima 8258C 4G
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; arm; Android 11; Sky 7143B 3G SS7265PG) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 YaApp_Android/23.34/apad YaSearchBrowser/23.34/apad BroPP/1.0 SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: "23.34"
+    engine: Blink
+    engine_version: 110.0.0.0
+  device:
+    type: tablet
+    brand: SUNWIND
+    model: Sky 7143B 3G
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 8.1.0; PIC7GS8 Build/O11019) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.78 Safari/537.36
+  os:
+    name: Android
+    version: 8.1.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    version: 102.0.5005.78
+    engine: Blink
+    engine_version: 102.0.5005.78
+  device:
+    type: tablet
+    brand: Advantage Air
+    model: PIC7GS8
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 8.1.0; BNT-801W Build/O11019; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/102.0.5005.99 Safari/537.36
+  os:
+    name: Android
+    version: 8.1.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 102.0.5005.99
+    engine: Blink
+    engine_version: 102.0.5005.99
+  device:
+    type: tablet
+    brand: Bluedot
+    model: BNT-801W
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 9; OneLernDB009) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.61 Safari/537.36
+  os:
+    name: Android
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    version: 101.0.4951.61
+    engine: Blink
+    engine_version: 101.0.4951.61
+  device:
+    type: tablet
+    brand: OneLern
+    model: DB009
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.4; tolino tab 8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36
+  os:
+    name: Android
+    version: 4.4.4
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    version: 81.0.4044.138
+    engine: Blink
+    engine_version: 81.0.4044.138
+  device:
+    type: tablet
+    brand: Tolino
+    model: Tolino Tab 8
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; Olkya Liger 71G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.73 Safari/537.36
+  os:
+    name: Android
+    version: 4.4.2
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    version: 77.0.3865.73
+    engine: Blink
+    engine_version: 77.0.3865.73
+  device:
+    type: tablet
+    brand: Olkya
+    model: Liger 71G
+  os_family: Android
+  browser_family: Chrome
diff --git a/Tests/fixtures/tv-2.yml b/Tests/fixtures/tv-2.yml
index 0b6f6b02ff..79b8cc6a5e 100644
--- a/Tests/fixtures/tv-2.yml
+++ b/Tests/fixtures/tv-2.yml
@@ -2121,3 +2121,57 @@
     model: Z10 Pro
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 9; AFTTIFF43) AppleWebKit/537.36 (KHTML, like Gecko) Silk/102.2.1 like Chrome/102.0.5005.125 Safari/537.36
+  os:
+    name: Android
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Mobile Silk
+    version: 102.2.1
+    engine: Blink
+    engine_version: 102.0.5005.125
+  device:
+    type: tv
+    brand: Amazon
+    model: Fire TV Omni QLED (2022)
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 9; Netta 3.100m) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Safari/537.36
+  os:
+    name: Android
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    version: 102.0.0.0
+    engine: Blink
+    engine_version: 102.0.0.0
+  device:
+    type: tv
+    brand: GoldMaster
+    model: Netta 3
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 9; Netta 2 Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36
+  os:
+    name: Android
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    version: 103.0.0.0
+    engine: Blink
+    engine_version: 103.0.0.0
+  device:
+    type: tv
+    brand: GoldMaster
+    model: Netta 2 Pro
+  os_family: Android
+  browser_family: Chrome
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
index a7e227f959..bf26849ed8 100644
--- a/regexes/device/mobiles.yml
+++ b/regexes/device/mobiles.yml
@@ -103,7 +103,7 @@ Adronix:
 
 # Cherry Mobile (cherrymobile.com)
 'Cherry Mobile':
-  regex: 'Cherry|Superion[_ ](?:S2|Radar Deluxe|S1 DTV|S1 Plus DTV|Tab Pro)|Flare([ _])?(2.[01]|2X|4|A[123]|J[1235678]|P[13]|S[4-8]|X2|Y[3567]|S[ _]Play|HD|LITE|XL|X_V[23]|Y3s|Tab|INFINITY)(?:[ _](?:Pro|Plus|Max|LTE))?|Fusion Aura 3s|Radar Deluxe 2|Desire R[678]|Desire_R[67]_Lite|Fusion Bolt|Omega[_ ](?:Icon 2|Icon Lite 2|lite[_ ][43][Cs]?|HD [45]|HD_Duo|X)|Spin Max 2|Selfie_Two|Flare X Lite|Flare_5|Android 1.*Aqua S9|Omega_HD_4|MAIA PAD PLUS|COSMOS THREE| Revel 3G'
+  regex: 'Cherry|Superion[_ ](?:S2|Radar Deluxe|S1 DTV|S1 Plus DTV|Tab Pro)|Flare([ _])?(2.[01]|2X|4|A[123]|J[1235678]|P[13]|S[4-8]|X2|Y[3567]|S[ _]Play|HD|LITE|XL|X_V[23]|Y3s|Tab|INFINITY)(?:[ _](?:Pro|Plus|Max|LTE))?|Fusion Aura 3s|Radar Deluxe 2|Desire R[678]|Desire_R[67]_Lite|Fusion Bolt|Omega[_ ](?:Icon 2|Icon Lite 2|lite[_ ][243][Cs]?|HD [45]|HD_Duo|X)|Spin Max 2|Selfie_Two|Flare X Lite|Flare_5|Android 1.*Aqua S9|Omega_HD_4|MAIA PAD PLUS|COSMOS THREE| Revel 3G'
   device: 'smartphone'
   models:
     - regex: '(Flare2X|Aqua S9(?: (?:Max|Lite|Pro))?)'
@@ -171,7 +171,7 @@ Adronix:
       model: 'Omega Icon Lite 2'
     - regex: 'Omega Icon 2'
       model: 'Omega Icon 2'
-    - regex: 'Omega[_ ]Lite[_ ](3[Cs]|4)'
+    - regex: 'Omega[_ ]Lite[_ ](3[Cs]|[24])'
       model: 'Omega Lite $1'
     - regex: 'Omega[_ ]X'
       model: 'Omega X'
@@ -4081,7 +4081,7 @@ VGO TEL:
 
 # Vivo (vivo.com.cn, vivo.com)
 Vivo:
-  regex: '((?:VIV-|BBG-)?(?<!FBCR/|NOA |Gtel )vivo(?!(?:Browser)| 4G_r))|(?:V1730(D[AT]|GA)|V18(01A0|13B[AT])|1819|V1937|I(?:192[78]|201[28])|V(?:2006|202[2-9]|203[0-35-9]|204[0-3568]|205[02-5789]|206[015689]|2070|210[12459]|211[01]|212[0469])|V(?:2026|2031|2036|2043)_21|V1936AL|V(?:1732|1809|181[3468]|182[149]|183[1268]|1901|191[13469]|192[1-48]|193[0246]|194[15]|195[05]|196[235]|198[16]|1990|200[125]|201[12]|202[03-5]|203[146]|204[6789]|205[45679]|2066B|206[1568]|207[23]|208[05]|2099|2106|211[18]|212[135]|213[346]|214[1358]|2162)A|V1824BA|V(?:1731|1818|2020)CA|V(?:1818|1938)CT|V(?:1730|2031)EA|V(?:1732|1809|181[3468]|182[19]|183[1268]|1901|1913|1938)T|V2029_PK|V2044|V2069A|V217[12]A|I201[19]|I2126|X50 Pro\+|I220[12368]|I2127|V211[4-8]A?|V204[57]A?|V210[28]A?|I2009|I2017|I2022|V215[4678]A|V215[0-478]|V218[0358]A|V2180GA|V219[069]A|V213[012459]A?|V2023EA|V1962BA|V212[57]|V214[0-79]|V1930|V216[0289]|V2164[KP]A|V216[234568]A|V217[08]A|PA2170|V220[37]A|V220[1-9]|V221[789]A|V221[247]|V222[079]A|V222[18]|V22[34]1A|V224[234]A|V223[18]A|V2230|S7t 5G| (?:Y30g|Y20T|Y31s 5G|Y33s|Y50t|Y55s 5G)|V2166(?:BA)?|iQOO U1x?|NEX 3s 5G)(?:[);/ ]|$)'
+  regex: '((?:VIV-|BBG-)?(?<!FBCR/|NOA |Gtel )vivo(?!(?:Browser)| 4G_r))|(?:V1730(D[AT]|GA)|V18(01A0|13B[AT])|1819|V1937|I(?:192[78]|201[28])|V(?:2006|202[2-9]|203[0-35-9]|204[0-3568]|205[02-5789]|206[015689]|2070|210[12459]|211[01]|212[0469])|V(?:2026|2031|2036|2043)_21|V1936AL|V(?:1732|1809|181[3468]|182[149]|183[1268]|1901|191[13469]|192[1-48]|193[0246]|194[15]|195[05]|196[235]|198[16]|1990|200[125]|201[12]|202[03-5]|203[146]|204[6789]|205[45679]|2066B|206[1568]|207[23]|208[05]|2099|2106|211[18]|212[135]|213[346]|214[1358]|2162)A|V1824BA|V(?:1731|1818|2020)CA|V(?:1818|1938)CT|V(?:1730|2031)EA|V(?:1732|1809|181[3468]|182[19]|183[1268]|1901|1913|1938)T|V2029_PK|V2044|V2069A|V217[12]A|I201[19]|I2126|X50 Pro\+|I220[12368]|I2127|V211[4-8]A?|V204[57]A?|V210[28]A?|I2009|I2017|I2022|V215[4678]A|V215[0-478]|V218[03568]A|V2180GA|V219[069]A|V213[012459]A?|V2023EA|V1962BA|V212[57]|V214[0-79]|V1930|V216[0289]|V2164[KP]A|V216[234568]A|V217[08]A|PA2170|V220[37]A|V220[1-9]|V221[789]A|V221[247]|V222[079]A|V222[18]|V22[34]1A|V224[234]A|V223[18]A|V2230|V2237|S7t 5G| (?:Y30g|Y20T|Y31s 5G|Y33s|Y50t|Y55s 5G)|V2166(?:BA)?|iQOO U1x?|NEX 3s 5G)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'PA2170(?:[);/ ]|$)'
@@ -4267,6 +4267,8 @@ Vivo:
       model: 'V25e'
     - regex: 'V2230'
       model: 'V27 Pro'
+    - regex: 'V2237'
+      model: 'V27e'
     - regex: 'V1932[AT](?:[);/ ]|$)'
       model: 'S5'
     - regex: 'V2207A'
@@ -4405,7 +4407,7 @@ Vivo:
       model: 'X90 Pro'
     - regex: 'V2227A'
       model: 'X90 Pro+'
-    - regex: 'V2185A|V2145'
+    - regex: 'V218[56]A|V2145'
       model: 'X80 Pro'
     - regex: 'V2208(?:[);/ ]|$)'
       model: 'X80 Lite 5G'
@@ -6696,7 +6698,7 @@ DoCoMo:
 
 # Doogee
 Doogee:
-  regex: 'DOOGEE[/ _-]|Valencia2_Y100(?:_?(?:pro|plus))?|Y100_Plus|X5max(?:[_ ]PRO)?|Shoot_[12]|x5_doogee|(KISSME|BIGBOY|COLLO[23]?|DAGGER|DISCOVERY2?|FIND|HOTWIND|LATTE|MAX|MINT|MOON|PIXELS|RAINBOX|TURBO|VALENCIA|VOYAGER2?|TITANS2?)[ -_](DG[0-9]+C?)(?:[);/ ]|$)|(?:BL12000|BL5500[_ ]Lite| Y6C|X9 Mini|LEO_DG280|Y9Plus|Y8 Plus|Hitman_DG850|S(?:4[01]|[568]8|9[05678]|59|61|8[69])Pro|X9[567]Pro|S[478]0Lite|S88Plus|BL[579]000|N[24]0Pro|(?<!Lenovo )S90C|Ibiza_F2|S55_Lite|T5_Lite|S60 ?Lite|Iron-bone DG750|X10S|X[569]0L|MIX2|Y6 Max|Y6_Piano(?:_black)?|X[679]pro|S96GT|android 10;(?: [\w-]+;)? (?:S59|S35|X95i?|X93|N30)|android 12;(?: [\w-]+;)? (?:S98|S61|S89)|Y7Plus|S35T|Android 9(?:[\d.]*);(?: [\w-]+;)? Y8|D60 Pro)(?:[);/ ]|$)'
+  regex: 'DOOGEE[/ _-]|Valencia2_Y100(?:_?(?:pro|plus))?|Y100_Plus|X5max(?:[_ ]PRO)?|Shoot_[12]|x5_doogee|(KISSME|BIGBOY|COLLO[23]?|DAGGER|DISCOVERY2?|FIND|HOTWIND|LATTE|MAX|MINT|MOON|PIXELS|RAINBOX|TURBO|VALENCIA|VOYAGER2?|TITANS2?)[ -_](DG[0-9]+C?)(?:[);/ ]|$)|(?:BL12000|BL5500[_ ]Lite| Y6C|X9 Mini|LEO_DG280|Y9Plus|Y8 Plus|Hitman_DG850|S(?:4[01]|[568]8|9[05678]|59|61|8[69])Pro|X9[567]Pro|S[478]0Lite|S88Plus|BL[579]000|N[24]0Pro|(?<!Lenovo )S90C|Ibiza_F2|S55_Lite|T5_Lite|S60 ?Lite|Iron-bone DG750|X10S|X[569]0L|MIX2|Y6 Max|Y6_Piano(?:_black)?|X[679]pro|S96GT|android 10;(?: [\w-]+;)? (?:S59|S35|X95i?|X93|N30)|android 12;(?: [\w-]+;)? (?:S98|S61|S89)|Y7Plus|S35T|Android 9(?:[\d.]*);(?: [\w-]+;)? Y8|D60 Pro|Turbo_mini_F1)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(?:Valencia2_)?Y100_Plus(?:[);/ ]|$)'
@@ -6761,6 +6763,8 @@ Doogee:
       model: 'Y7 Plus'
     - regex: 'X([679])pro'
       model: 'X$1 Pro'
+    - regex: 'Turbo_mini_F1'
+      model: 'Turbo Mini F1'
     - regex: 'Y([89]) ?Plus(?:[);/ ]|$)'
       model: 'Y$1 Plus'
     - regex: ' (S59|S35T?|S98|S89|Y8|Y6C|S61|N30)(?:[);/ ]|$)'
@@ -7164,11 +7168,13 @@ Senseit:
 
 # SunWind (sunwind.ru.com)
 SUNWIND:
-  regex: 'SUNWIND[_ ]|SUN[-_]LED\d+|(?:SKY 9 [EA]\d+ 3G|Sky (?:1262C|1123B|8244B|1430D) [43]G)(?:[);/ ]|$)'
+  regex: 'SUNWIND[_ ]|SUN[-_]LED\d+|(?:SKY 9 [EA]\d+ 3G|Sky (?:1262C|1123B|7143B|8244B|1430D) [43]G|SKY Kids 70 SS7238PG)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'SKY ([79]) ([EA]\d+) 3G'
       model: 'Sky $1 $2 3G'
+    - regex: 'SKY Kids 70'
+      model: 'Sky Kids 70'
     - regex: 'Sky (\d{4}[BCD]) ([34])G'
       model: 'Sky $1 $2G'
     - regex: 'SUN[-_]LED(\d+\w{1,2}\d+)'
@@ -15465,7 +15471,7 @@ Torque:
 
 # motorola
 Motorola:
-  regex: 'MOT(?!TO)|(?<!AN)DROID ?(?:Build|[a-z0-9]+)|portalmmm/2.0 (?:E378i|L6|L7|v3)|XOOM [^;/]*Build|XT1941-2|XT1924-9|XT1925-10|XT1965-6|XT1970-5|XT1799-2|XT1021|XT2171-3|XT2071-4|XT2201-6|XT2175-2|XT2125-4|XT2143-1|XT2153-1|XT2201-2|XT2241-1|XT2137-2|XT1710-08|XT180[3-5]|XT194[23]-1|XT1929-15|(?<!Xtreme )(?:XT|MZ|MB|ME)[0-9]{3,4}[a-z]?(?:\(Defy\)|-0[1-5])?(?:[;]? Build|\))|lineage_osprey|ATRIX HD'
+  regex: 'MOT(?!TO)|(?<!AN)DROID ?(?:Build|[a-z0-9]+)|portalmmm/2.0 (?:E378i|L6|L7|v3)|XOOM [^;/]*Build|XT1941-2|XT1924-9|XT1925-10|XT1965-6|XT1970-5|XT1799-2|XT1021|XT2171-3|XT2071-4|XT2201-6|XT2175-2|XT2125-4|XT2143-1|XT2153-1|XT2201-2|XT2241-1|XT2137-2|XT1710-08|XT180[3-5]|XT2335-3|XT194[23]-1|XT1929-15|(?<!Xtreme )(?:XT|MZ|MB|ME)[0-9]{3,4}[a-z]?(?:\(Defy\)|-0[1-5])?(?:[;]? Build|\))|lineage_osprey|ATRIX HD'
   device: 'smartphone'
   models:
     # Explicit feature phone models
@@ -15561,6 +15567,8 @@ Motorola:
       model: 'Droid RAZR Maxx'
     - regex: 'moto g52j 5G'
       model: 'Moto G52j 5G'
+    - regex: 'XT2335-3'
+      model: 'Moto G53'
     - regex: '(?:MOT-|Motorola-)?(?:XT102[12]|XT830C|XT15[12]4|XT152[67])' # 2015
       model: 'Moto E'
     - regex: 'Moto E \(XT2052DL\)'
@@ -16961,6 +16969,8 @@ Okapia:
       model: 'Signature $1'
     - regex: 'Okapia X1(?:[);/ ]|$)'
       model: 'X1'
+    - regex: 'Okapia[_ ]Mirage(?:[);/ ]|$)'
+      model: 'Mirage'
 
 # Olax
 Olax:
@@ -18246,7 +18256,7 @@ Pentagram:
 
 # Tcl (tcl.com)
 TCL:
-  regex: 'TCL,|TCL[_ -][a-z0-9]+|(?:TCL[_ -][^;/]+ Build)|(?:TCLGalaG60(?:\(9108A\))?|4163D|4187[DMU]|4188[CLRS]|5004S|5087Z|5101A|5102[BKLMOP]|5107G|5124J|5130[JM]|5133A|5148A|5152D|5159[AJ]|5164D|5199I|6102[ADH]|6125[ADFH]|6127[AI]|6156[ADH]|6159[AK]|6165[AHS]|7040N|8491X|9048S|9060[GX]|9080G|9081X|9295G|9296[GQ]|A(?:50[2789]|600)DL|T(?:60[123]|701)DL|T(?:506D|671[EFGHO]|676[HJK]|766[AHJSU]|767[GHW]|770[BH]|771K|773O|774[BH]|775[BH]|776[HO]|779W|780H|781SPP|781S|781|782H|790[SY]|799[BH]|810[HS])|Percee TV|9317X1|9161G| 9061| 8182| 8167|BeyondTV\d?|T507U)(?:_(?:RU|EEA|TR))?(?:[);/ ]|$)'
+  regex: 'TCL,|TCL[_ -][a-z0-9]+|(?:TCL[_ -][^;/]+ Build)|(?:TCLGalaG60(?:\(9108A\))?|4163D|4187[DMU]|4188[CLRS]|5004S|5087Z|5101A|5102[BKLMOP]|5107G|5124J|5130[JM]|5133A|5148A|5152D|5159[AJ]|5164D|5199I|6102[ADH]|6125[ADFH]|6127[AI]|6156[ADH]|6159[AK]|6165[AHS]|7040N|8491X|9048S|9060[GX]|9080G|9081X|9295G|9296[GQ]|A(?:50[2789]|600)DL|T(?:60[123]|701)DL|T(?:506D|671[EFGHO]|676[HJK]|766[AHJSU]|767[GHW]|770[BH]|771K|773O|774[BH]|775[BH]|776[HO]|779W|780H|781SPP|781S|781|782H|790[SY]|799[BH]|810[HS])|Percee TV|9317X1|9161G| 9061| 8182| 8167|BeyondTV\d?|T507U|T610[KE])(?:_(?:RU|EEA|TR))?(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'TCLGalaG60(?:\(9108A\))?(?:[);/ ]|$)'
@@ -18269,6 +18279,8 @@ TCL:
       model: '405'
     - regex: 'T507U(?:[);/ ]|$)'
       model: '408'
+    - regex: 'T610[KE](?:[);/ ]|$)'
+      model: '40 SE'
     - regex: 'T774[BH](?:[);/ ]|$)'
       model: '20L'
     - regex: 'T775B(?:[);/ ]|$)'
@@ -19850,6 +19862,8 @@ Samsung:
       model: 'Galaxy A53 5G UW'
     - regex: '(?:SAMSUNG-)?(?:SM-A536|SC-53C|SCG15|SM-S536DL)'
       model: 'Galaxy A53 5G'
+    - regex: '(?:SAMSUNG-)?(?:SM-A546)'
+      model: 'Galaxy A54 5G'
     - regex: '(?:SAMSUNG-)?SM-A705(?:GM|[MYF]N|[0FUWX])'
       model: 'Galaxy A70'
     - regex: '(?:SAMSUNG-)?SM-A707[0F]'
@@ -22035,6 +22049,9 @@ Amazon:
     - regex: 'AFTSS'
       model: 'Fire TV Stick Lite (Gen 1)'
       device: 'tv'
+    - regex: 'AFTTIFF43'
+      model: 'Fire TV Omni QLED (2022)'
+      device: 'tv'
     - regex: 'AFT[MST]'
       model: 'Fire TV Stick'
       device: 'tv'
@@ -22324,6 +22341,8 @@ Tecno Mobile:
       model: 'Phantom $1'
     - regex: 'TECNO[ _]AD8'
       model: 'Phantom X2'
+    - regex: 'TECNO[ _]AD9'
+      model: 'Phantom X2 Pro'
     - regex: 'TECNO[ _]AC8(?:[);/ ]|$)'
       model: 'Phantom X'
     - regex: 'TECNO[ _]AB7(?:[);/ ]|$)'
@@ -22352,6 +22371,8 @@ Tecno Mobile:
       model: 'Camon iClick 2'
     - regex: 'TECNO[ _]IN2(?:[);/ ]|$)'
       model: 'Camon iSky'
+    - regex: 'TECNO[ _]IN1 Pro(?:[);/ ]|$)'
+      model: 'Camon iSky 2'
     - regex: 'TECNO[ _]KB3(?:[);/ ]|$)'
       model: 'Camon iSky 3'
     - regex: 'Tecno[ _]7C(?:[);/ ]|$)'
@@ -22489,7 +22510,7 @@ Tecno Mobile:
       model: 'Pop 5 Pro'
     - regex: 'TECNO[ _]BD3(?:[);/ ]|$)'
       model: 'Pop 5P'
-    - regex: 'TECNO[ _]BE7(?:[);/ ]|$)'
+    - regex: 'TECNO[ _]B(?:E7|F6)(?:[);/ ]|$)'
       model: 'Pop 6'
     - regex: 'TECNO[ _]BE6j?(?:[);/ ]|$)'
       model: 'Pop 6 Go'
@@ -22553,6 +22574,10 @@ Tecno Mobile:
       model: 'Spark 9'
     - regex: 'TECNO[ _]KH6(?:[);/ ]|$)'
       model: 'Spark 9T'
+    - regex: 'TECNO[ _]KI5[km]'
+      model: 'Spark 10C'
+    - regex: 'TECNO[ _]KI5'
+      model: 'Spark 10'
     - regex: 'TECNO[ _]KC1h(?:[);/ ]|$)'
       model: 'Spark Go'
     - regex: 'TECNO[ _]KE5S(?:[);/ ]|$)'
@@ -22958,7 +22983,7 @@ Tooky:
 
 # Tolino
 Tolino:
-  regex: 'Tolino Tab ([^/;]+) Build'
+  regex: 'Tolino Tab ([^/);]+)(?: Build|[);])'
   device: 'tablet'
   model: 'Tolino Tab $1'
 
@@ -23983,6 +24008,12 @@ Vulcan:
       model: 'Koral 7W4'
       device: 'tablet'
 
+# Ober
+Ober:
+  regex: 'OBER[_ ](Primo E8)(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: '$1'
+
 # Walton (waltonbd.com)
 Walton:
   regex: 'Walton|Walpad|RX7 Mini|Primo[ _](C[1234]?|D[1-689]|E[1-589]|F8s|EF[23]?|EM|F[1-79]i?|G[1-9]|GF[234]?|GH[23]?|GM|H[2-689M]|H10|H7s|N[F1]?|NX2?|R[1-68]|R[HM]2?|RX[23]?|S[1-8]|V1|X[1-4]|Z|[ZV]X)'
@@ -24580,7 +24611,7 @@ Zopo:
 
 # Xiaomi
 Xiaomi:
-  regex: 'Xiaomi(?!/(?:Miui|Mint[ ])Browser)|MiTV-\w|MiProjA1|Mi9 Pro 5G|(?:MI [a-z0-9]+|Mi-4c|MI-One[ _]?[a-z0-9]+|MIX(?: 2S?)?|MIX 2S ART|pomelo)(?:[);/ ]|$)|HM (?:[^/;]+) (?:Build|MIUI)|(?:2014501|2014011|201481[12378]|201302[23]|2013061) Build|Redmi|POCOPHONE|(?:SHARK )?KTUS-[AH]0|(?:SHARK )?(KLE|KSR|MBU|PAR)-[AH]0|SK[RW]-[AH]0|PRS-[AH]0|POCO F1|DLT-[AH]0|MIBOX[234]([_ ]PRO)?|MiTV4[ACSX]?|AWM-A0|MI CC 9 Meitu Edition|MiBOX1S|M2006J10C|M2006C3(?:L[IGC]|LVG|MN?G|MT)|M2007J1(?:7[CGI]|SC)|M2002(?:J9[SEG]|F4LG)|HM2014819|WT88047|210611(?:8C|19BI)|M2001(?:J2G|C3K3I)|M2004J15SC|M2004J(?:7[AB]|19)[CG]|M2012K11(?:[CGI]|A[CI])|M2011K2[CG]|M2011J18C|M2006C3[ML]II|M2003J(?:15SC|15SS|6B2G|6A1G)|M2007J3S[ICYGP]|M2007J22[CG]|M2103K19[CGYI]|M2101K(?:[79]AG|7AI|7B[GI]|6[GIRP]|7BNY|9[GCR])|M2010J19S[CGYIL]|M2102(?:K1AC|K1[CG]|J2SC)|HM NOTE 1(?:LTE|W)|MI[_ ]PLAY|XIG01|Qin 1s\+|Qin ?2(?: Pro)?|MI_(NOTE_Pro|5X|4i|(?:A2|8)_Lite)|A001XM|lancelot|XIG02|21061119(?:[AD]G|AL)|2107119DC|M2101K(?:7BL|9AI)|A101XM|M2012K10C|M2104K10AC|M19(?:01F7[1S]|10F4S|08(?:F1XE|C3JGG)|08C3J[IH]|06F9S[IH]|02F1G)|21051182[CG]|21081111RG|2109119D[GI]|21091116(?:AI|[AU]?C|i|U[GI])|220111(?:7T[LGIY]|19TI|19UY|6S[IRC]|6TG|[67]SG|7SL)|21121(?:119S[CG]|23A[CG]|119VL|210C)|2204121(?:6[CI]|6UC|9[CGI]|9NY|1AC)|220333Q(?:AG|NY|L|BI)|2107113S[IGR]|22031(?:29G|116BG|21C)|PAR-H0|M2105K81A?C|2109119BC|22021119KR|22021211RC|220233L2[CGI]|22011(?:2[23][CG]|211C|16TI|17S[YI])|joyeuse|galahad|hydrogen|begonia|kenzo|willow|beryllium|rosemary| MDG1|KLE-AO|Mi ?Pad \d|220612(?:18C|[23]SC)|2208128(?:1AC|3[GC])|22081212(?:U?G|C)|220712(?:2MC|12AG|19AI)|220733S(?:F?G|[IL])|22087RA4DI|Black Shark|MZB8298IN|22101317C|22101316(?:[CI]|UP|UCP?)|22101(?:29SG|32[CG])|221113(?:3[CG]|17I)|23013RK75C|2209(?:5RA98C|116AG)|22120RN86G|22126RN91Y|23021RAA2Y|angelican|vnd_camellia'
+  regex: 'Xiaomi(?!/(?:Miui|Mint[ ])Browser)|MiTV-\w|MiProjA1|Mi9 Pro 5G|(?:MI [a-z0-9]+|Mi-4c|MI-One[ _]?[a-z0-9]+|MIX(?: 2S?)?|MIX 2S ART|pomelo)(?:[);/ ]|$)|HM (?:[^/;]+) (?:Build|MIUI)|(?:2014501|2014011|201481[12378]|201302[23]|2013061) Build|Redmi|POCOPHONE|(?:SHARK )?KTUS-[AH]0|(?:SHARK )?(KLE|KSR|MBU|PAR)-[AH]0|SK[RW]-[AH]0|PRS-[AH]0|POCO F1|DLT-[AH]0|MIBOX[234]([_ ]PRO)?|MiTV4[ACSX]?|AWM-A0|MI CC 9 Meitu Edition|MiBOX1S|M2006J10C|M2006C3(?:L[IGC]|LVG|MN?G|MT)|M2007J1(?:7[CGI]|SC)|M2002(?:J9[SEG]|F4LG)|HM2014819|WT88047|210611(?:8C|19BI)|M2001(?:J2G|C3K3I)|M2004J15SC|M2004J(?:7[AB]|19)[CG]|M2012K11(?:[CGI]|A[CI])|M2011K2[CG]|M2011J18C|M2006C3[ML]II|M2003J(?:15SC|15SS|6B2G|6A1G)|M2007J3S[ICYGP]|M2007J22[CG]|M2103K19[CGYI]|M2101K(?:[79]AG|7AI|7B[GI]|6[GIRP]|7BNY|9[GCR])|M2010J19S[CGYIL]|M2102(?:K1AC|K1[CG]|J2SC)|HM NOTE 1(?:LTE|W)|MI[_ ]PLAY|XIG01|Qin 1s\+|Qin ?2(?: Pro)?|MI_(NOTE_Pro|5X|4i|(?:A2|8)_Lite)|A001XM|lancelot|XIG02|21061119(?:[AD]G|AL)|2107119DC|M2101K(?:7BL|9AI)|A101XM|M2012K10C|M2104K10AC|M19(?:01F7[1S]|10F4S|08(?:F1XE|C3JGG)|08C3J[IH]|06F9S[IH]|02F1G)|21051182[CG]|21081111RG|2109119D[GI]|21091116(?:AI|[AU]?C|i|U[GI])|220111(?:7T[LGIY]|19TI|19UY|6S[IRC]|6TG|[67]SG|7SL)|21121(?:119S[CG]|23A[CG]|119VL|210C)|2204121(?:6[CI]|6UC|9[CGI]|9NY|1AC)|220333Q(?:AG|NY|L|BI)|2107113S[IGR]|22031(?:29G|116BG|21C)|PAR-H0|M2105K81A?C|2109119BC|22021119KR|22021211RC|220233L2[CGI]|22011(?:2[23][CG]|211C|16TI|17S[YI])|joyeuse|galahad|hydrogen|begonia|kenzo|willow|beryllium|rosemary| MDG1|KLE-AO|Mi ?Pad \d|220612(?:18C|[23]SC)|2208128(?:1AC|3[GC])|22081212(?:U?G|C)|220712(?:2MC|12AG|19AI)|220733S(?:F?G|[IL])|22087RA4DI|Black Shark|MZB8298IN|22101317C|22101316(?:[CI]|UP|UCP?)|22101(?:29SG|32[CG])|221113(?:3[CG]|17I)|23013RK75C|2209(?:5RA98C|116AG)|22120RN86G|22126RN91Y|23021RAA(?:EG|2Y)|angelican|vnd_camellia'
   device: 'smartphone'
   models:
     # specific smartphone models
@@ -25024,7 +25055,7 @@ Xiaomi:
     - regex: '(?:22101316[CI])(?:[);/ ]|$)'
       model: 'Redmi Note 12 Pro'
       device: 'phablet'
-    - regex: '(?:22101317C|23021RAA2Y)(?:[);/ ]|$)'
+    - regex: '(?:22101317C|23021RAA2Y|23021RAAEG)(?:[);/ ]|$)'
       model: 'Redmi Note 12'
       device: 'phablet'
     - regex: '(?:22101316UC)(?:[);/ ]|$)'
@@ -28222,11 +28253,14 @@ Magnus:
 
 # Newland (www.newland-id.com)
 Newland:
-  regex: 'NLS-(?:MT90|NFT10)(?:[);/ ]|$)'
+  regex: 'NLS-(?:MT90|NFT10|MT65)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'NLS-MT90'
       model: 'MT90 Orca'
+    - regex: 'NLS-MT65'
+      device: 'peripheral'
+      model: 'MT65 Beluga IV'
     - regex: 'NLS-NFT10'
       model: 'NFT10 Pilot Pro'
 
@@ -29045,7 +29079,7 @@ Oyyu:
 
 # Primux (primux.es)
 Primux:
-  regex: 'Primux|SirocoY'
+  regex: 'Primux|SirocoY|Omega6_4G(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Primux_ioxphone(?:[);/ ]|$)'
@@ -29060,6 +29094,8 @@ Primux:
       model: 'Beta 2'
     - regex: 'Primux_?Omega([57])(?:[);/ ]|$)'
       model: 'Omega $1'
+    - regex: 'Omega6_4G(?:[);/ ]|$)'
+      model: 'Omega 6 4G'
 
     - regex: 'PrimuxUP(?:[);/ ]|$)'
       device: 'tablet'
@@ -30076,13 +30112,13 @@ Silelis:
 
 # Bluedot (bluedot.co.jp)
 Bluedot:
-  regex: 'BLUEDOT[_ ]|(?:BNT-71)(?:[);/ ]|$)'
+  regex: 'BLUEDOT[_ ]|(?:BNT-71|BNT-801W)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: '(?:BLUEDOT[_ ])?(BNP-500)(?:[);/ ]|$)'
       device: 'smartphone'
       model: '$1'
-    - regex: '(BNT-71)(?:[);/ ]|$)'
+    - regex: '(BNT-71|BNT-801W)(?:[);/ ]|$)'
       model: '$1'
 
 # Planet Computers (https://www.www3.planetcom.co.uk/)
@@ -30251,11 +30287,13 @@ ELARI:
 
 # Epik One or EPIKONE (epikmobile.com)
 'Epik One':
-  regex: '(K501 Plus|[ ]K5(?:0[0-4]|1[01]|03[TS]|3[456]|4[05]|73|03HD)|[ ]K60[01]|[ ]X507T|[ ]K40[56]|[ ]T700|Android 8([\d.]*);(?: [\w-]+;)? X400)(?:[);/ ]|$)'
+  regex: '(K501 Plus|[ ]K5(?:0[0-4]|1[01]|03[TS]|3[456]|4[05]|73|03HD)|[ ]K60[01]|[ ]X507T|[ ]K40[56]|[ ]T700|Android 8([\d.]*);(?: [\w-]+;)? X400|RS550)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'K501 Plus'
       model: 'Leo Plus'
+    - regex: 'RS550'
+      model: 'RS550'
     - regex: 'K501'
       model: 'Leo'
     - regex: 'K500'
@@ -31033,7 +31071,7 @@ Invens:
 
 # Chico Mobile (chicomobile.ph)
 Chico Mobile:
-  regex: '(?:ALTO (?:Bombo|classic|Estrella|JUEGO|SUBIR|[235])|FUEGO MAX|OJOS[ _](?:CAMBIO|NUBE|[68i]|ORO)|AVANCE classic)(?:[);/ ]|$)'
+  regex: '(?:ALTO (?:Bombo|classic|Estrella|JUEGO|SUBIR|[235])|FUEGO MAX|OJOS[ _](?:CAMBIO|NUBE|[68i]|ORO|VIVIR|Plus|DOS mini|DOS)|AVANCE classic)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'ALTO Bombo'
@@ -31058,6 +31096,14 @@ Chico Mobile:
       model: 'Ojos Cambio'
     - regex: 'OJOS ORO'
       model: 'Ojos Oro'
+    - regex: 'OJOS PLUS'
+      model: 'Ojos Plus'
+    - regex: 'OJOS VIVIR'
+      model: 'Ojos Vivir'
+    - regex: 'OJOS DOS mini'
+      model: 'Ojos DOS Mini'
+    - regex: 'OJOS DOS'
+      model: 'Ojos DOS'
 
     - regex: 'FUEGO MAX'
       device: 'tablet'
@@ -31867,7 +31913,7 @@ F150:
   regex: '(?:Bison2021|B2021|[HR]2022|Air1 Pro| Air1| B1 Pro)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
-    - regex: '([HR]2022|Air1 (?:Ultra|Pro)|Air1|B1 Pro)(?:[);/ ]|$)'
+    - regex: '([HR]2022|Air1 (?:Ultra\+?|Pro)|Air1|B1 Pro)(?:[);/ ]|$)'
       model: '$1'
     - regex: '(?:Bison2021|B2021)(?:[);/ ]|$)'
       model: 'B2021'
@@ -34451,7 +34497,7 @@ PIRANHA:
 
 # CipherLab (www.cipherlab.com)
 CipherLab:
-  regex: '(RK25WO|RK[29]5|RS35)(?:[);/ ]|$)'
+  regex: '(RK25WO|RK[29]5|RS35|RS51_HS)(?:[);/ ]|$)'
   device: 'smartphone'
   model: '$1'
 
@@ -34985,11 +35031,19 @@ Blackpcs:
   device: 'tv'
   model: '$1-BL'
 
-# GoldMaster
+# GoldMaster (www.goldmaster.com.tr)
 GoldMaster:
-  regex: 'BENGAL_6(?:[);/ ]|$)'
+  regex: '(?:Netta 2 Pro|Netta 3\.100m|BENGAL_6)(?:[);/ ]|$)'
   device: 'tablet'
-  model: 'Bengal 6'
+  models:
+    - regex: 'Netta 2 Pro'
+      model: 'Netta 2 Pro'
+      device: 'tv'
+    - regex: 'Netta 3\.100m'
+      model: 'Netta 3'
+      device: 'tv'
+    - regex: 'BENGAL_6'
+      model: 'Bengal 6'
 
 # Facime
 Facime:
@@ -35810,6 +35864,40 @@ HAOQIN:
   device: 'tablet'
   model: '$1'
 
+# Advantage Air
+Advantage Air:
+  regex: '(PIC7GS8)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# OneLern
+OneLern:
+  regex: 'OneLern(DB\d{3})(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# Motiv
+Motiv:
+  regex: '(TurboPhone4G Compact 2108)(?:[);/ ]|$)'
+  device: 'smartphone'
+  model: '$1'
+
+# Olkya
+Olkya:
+  regex: 'Olkya (Liger 71G)(?:[);/ ]|$)'
+  device: 'tablet'
+  model: '$1'
+
+# Oking
+Oking:
+  regex: 'OK-(?:LS[12]|smart11|LX[56])(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'OK-smart11'
+      model: 'Smart 11'
+    - regex: 'OK-(LS[12]|LX[56])'
+      model: '$1'
+
 # Devices with undectable brand, but detectable model
 Unknown:
   regex: 'Plasma Mobile|WebTV/(\d+\.\d+)|TV Bro|(?:M10 Ultra|FO-R15|TVBOX|Smart[ _]?TV|SmartATV|M8S\+ 4K|PCBox|rk(?:3128|322x|3368)(?:[_-]box)?|H10 PLAY|Smart AIO TV|TVBOX_L|L-BOX|TVBOX-5G|mips.+(?:Opera TV|wireless|wired)|smartbox|TV BOX|I12Pro Max|(?:audi_)?ks1280x480|AT&T TV|RealtekATV|AOSP on r33a0|hx322x_box)(?:[);/ ]|$)'