From 73b6f74424301aae6ddfead8f376714835361cf6 Mon Sep 17 00:00:00 2001 From: Tutik Alexsandr Date: Fri, 21 Jun 2019 00:23:02 +0300 Subject: [PATCH] Detect devices: Odys, Advan, Evercoss, Dapeng, Figo (#5975) * Odys Xelio A10 * #5974 Detect Advan I Lite i7U * #5974 Detect Advan S45E * #5974 Detect InFocus IF9007 * #5974 Detect Advan 5061 * Detect Evercoss A75A Star, Advan I7D * #5974 Detect devies: Advan I55K, Advan I55D, Advan I4U * #5974 Detect Dapeng A75 * #5974 Detect devies: Advan S4Z, Advan S7D, Advan I5E, Advan I5K, FiGO Trio F40LT * #5974 Detect Figo devices * #5974 Detect Odys devices * Detect devices Samsung, Vito, T-Mobile * fix fixtures * #5974 Remove Dapeng A75 * Fix change rover * Detect devices Oneplus 7, X-TIGI V28 LTE --- Parser/Device/DeviceParserAbstract.php | 5 + Tests/fixtures/smartphone-10.yml | 1041 +++++++++++++++++++++++- regexes/device/mobiles.yml | 211 +++-- 3 files changed, 1209 insertions(+), 48 deletions(-) diff --git a/Parser/Device/DeviceParserAbstract.php b/Parser/Device/DeviceParserAbstract.php index 09a2803446..8af4a56def 100644 --- a/Parser/Device/DeviceParserAbstract.php +++ b/Parser/Device/DeviceParserAbstract.php @@ -65,6 +65,7 @@ abstract class DeviceParserAbstract extends ParserAbstract '4G' => '4Good', 'AA' => 'AllCall', 'AC' => 'Acer', + 'A9' => 'Advan', 'AD' => 'Advance', 'A3' => 'AGM', 'AZ' => 'Ainol', @@ -189,6 +190,7 @@ abstract class DeviceParserAbstract extends ParserAbstract 'E5' => 'Extrem', 'EZ' => 'Ezze', 'E8' => 'E-tel', + 'E9' => 'Evercoss', 'FA' => 'Fairphone', 'FI' => 'FiGO', 'FL' => 'Fly', @@ -241,6 +243,7 @@ abstract class DeviceParserAbstract extends ParserAbstract 'IW' => 'iNew', 'IP' => 'iPro', 'IF' => 'Infinix', + 'I0' => 'InFocus', 'I5' => 'InnJoo', 'IN' => 'Innostream', 'I4' => 'Inoi', @@ -405,6 +408,7 @@ abstract class DeviceParserAbstract extends ParserAbstract 'RM' => 'RIM', 'RK' => 'Roku', 'RO' => 'Rover', + 'R1' => 'Rokit', 'RT' => 'RT Project', 'SQ' => 'Santin BiTBiZ', 'SA' => 'Samsung', @@ -539,6 +543,7 @@ abstract class DeviceParserAbstract extends ParserAbstract // legacy brands, might be removed in future versions 'WB' => 'Web TV', + 'XT' => 'X-TIGI', 'XX' => 'Unknown' ); diff --git a/Tests/fixtures/smartphone-10.yml b/Tests/fixtures/smartphone-10.yml index c5677375df..6f0db78179 100644 --- a/Tests/fixtures/smartphone-10.yml +++ b/Tests/fixtures/smartphone-10.yml @@ -2176,4 +2176,1043 @@ model: P30 Pro os_family: Android browser_family: Chrome - +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; XELIO_A10 Build/O11019) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Safari/537.36 + os: + name: Android + short_name: AND + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome + short_name: CH + version: 69.0.3497.100 + engine: Blink + engine_version: "" + device: + type: tablet + brand: O1 + model: Xelio A10 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; IO Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 73.0.3683.90 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: R1 + model: IO Pro + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; i7U Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/63.0.3239.111 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 63.0.3239.111 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: A9 + model: I Lite i7U + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; S45E Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/55.0.2883.91 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 55.0.2883.91 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: A9 + model: S45E + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; IF9007 Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/61.0.3163.98 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 61.0.3163.98 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: I0 + model: IF9007 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; 5061 Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/59.0.3071.125 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 59.0.3071.125 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: A9 + model: "5061" + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; S50H Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/51.0.2704.91 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 51.0.2704.91 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: A9 + model: S50H + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; I7D Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/55.0.2883.91 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 55.0.2883.91 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: A9 + model: I7D + os_family: Android + browser_family: Chrome +- + user_agent: 'Mozilla/5.0 (Linux; Android 5.1; A75A* Build/LMY47D; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/43.0.2357.121 Mobile Safari/537.36' + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 43.0.2357.121 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: E9 + model: A75A Star + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; i55K Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/62.0.3202.84 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 62.0.3202.84 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: A9 + model: I55K + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; i55D Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/63.0.3239.111 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 63.0.3239.111 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: A9 + model: I55D + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; i4U Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/63.0.3239.111 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 63.0.3239.111 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: A9 + model: I4U + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; S7D Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/61.0.3163.98 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 61.0.3163.98 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: A9 + model: S7D + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; S4Z Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/55.0.2883.91 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 55.0.2883.91 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: A9 + model: S4Z + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; i5E Build/LMY47D; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/49.0.2623.105 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 49.0.2623.105 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: A9 + model: I5E + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; i5K Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/44.0.2403.119 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 44.0.2403.119 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: A9 + model: I5K + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; TRIO F40LT Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/61.0.3163.98 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 61.0.3163.98 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: FI + model: Trio F40LT + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; EPIC F50G Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.132 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Epic + short_name: EI + version: "" + engine: Gecko + engine_version: "" + device: + type: smartphone + brand: FI + model: Epic F50G + os_family: Android + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; F55L Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.111 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 63.0.3239.111 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: FI + model: F55L + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; Gravity X55L Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.84 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 62.0.3202.84 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: FI + model: Gravity X55L + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; M405B Build/LMY47I; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/64.0.3282.137 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 64.0.3282.137 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: FI + model: Virtue II + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; M405B_8GB Build/LMY47I) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.83 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 58.0.3029.83 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: FI + model: Virtue II 8GB + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; Orion M50L Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/65.0.3325.109 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 65.0.3325.109 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: FI + model: Orion M50L + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; ULTRA M50G Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.84 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 62.0.3202.84 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: FI + model: Prime + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; VIRTUE3 Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/68.0.3440.91 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 68.0.3440.91 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: FI + model: Virtue III + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.0.3; ar-eg; ADM816HC Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 + os: + name: Android + short_name: AND + version: 4.0.3 + platform: "" + client: + type: browser + name: Android Browser + short_name: AN + version: "" + engine: WebKit + engine_version: "534.30" + device: + type: tablet + brand: O1 + model: Neo X + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.1.1; de-de; ADM8000KP Build/JRO03H) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 + os: + name: Android + short_name: AND + version: 4.1.1 + platform: "" + client: + type: browser + name: Android Browser + short_name: AN + version: "" + engine: WebKit + engine_version: "534.30" + device: + type: tablet + brand: O1 + model: Titan + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; NEO6_LTE Build/LMY47D; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/59.0.3071.125 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 59.0.3071.125 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: O1 + model: Neo 6 LTE + os_family: Android + browser_family: Chrome +- + user_agent: Kinder-Tablet-1.0-Weltbild-Mozilla/5.0 (Linux; U; Android 4.2.2; en-US; EOS10 Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 + os: + name: Android + short_name: AND + version: 4.2.2 + platform: "" + client: + type: browser + name: Android Browser + short_name: AN + version: "" + engine: WebKit + engine_version: "534.30" + device: + type: tablet + brand: O1 + model: EOS 10 + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.1.1; de-de; AEON Build/JRO03H) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 + os: + name: Android + short_name: AND + version: 4.1.1 + platform: "" + client: + type: browser + name: Android Browser + short_name: AN + version: "" + engine: WebKit + engine_version: "534.30" + device: + type: tablet + brand: O1 + model: Aeon + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; FALCON_10_PLUS_3G Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.68 Safari/537.36 + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: browser + name: Chrome + short_name: CH + version: 67.0.3396.68 + engine: Blink + engine_version: "" + device: + type: tablet + brand: O1 + model: Falcon 10 Plus 3G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.1.1; de-de; FUSION Build/JRO03H) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 + os: + name: Android + short_name: AND + version: 4.1.1 + platform: "" + client: + type: browser + name: Android Browser + short_name: AN + version: "" + engine: WebKit + engine_version: "534.30" + device: + type: tablet + brand: O1 + model: Fusion 7 + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; SM-J610F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.99 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 71.0.3578.99 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: SA + model: GALAXY J6+ + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; V1813BA Build/OPM1.171019.026; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/62.0.3202.84 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 62.0.3202.84 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: VV + model: Z3 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; V1818T Build/OPM1.171019.026; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/62.0.3202.84 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 62.0.3202.84 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: VV + model: Y93 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; V1731CA Build/OPM1.171019.026; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/62.0.3202.84 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 62.0.3202.84 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: VV + model: Y73 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; vivo 1816 Build/O11019) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.91 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 68.0.3440.91 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: VV + model: Y91i + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 9; LYA-AL00P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.99 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "9" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 71.0.3578.99 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: HU + model: Mate 20 RS + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; SM-J410F Build/M1AJB) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.91 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 68.0.3440.91 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: SA + model: GALAXY J4 Core + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; vivo 1817 Build/OPM1.171019.026) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.91 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 68.0.3440.91 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: VV + model: Y91 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.0.0; SAMSUNG SM-J737U Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/7.4 Chrome/59.0.3071.125 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 8.0.0 + platform: "" + client: + type: browser + name: Samsung Browser + short_name: SB + version: "7.4" + engine: WebKit + engine_version: "537.36" + device: + type: smartphone + brand: SA + model: GALAXY J7 (2018) + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 8.0.0; SAMSUNG SM-J337W Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/7.4 Chrome/59.0.3071.125 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 8.0.0 + platform: "" + client: + type: browser + name: Samsung Browser + short_name: SB + version: "7.4" + engine: WebKit + engine_version: "537.36" + device: + type: smartphone + brand: SA + model: GALAXY J3 (2018) + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; V1809T Build/OPM1.171019.026; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/62.0.3202.84 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 62.0.3202.84 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: VV + model: X23 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; V1813T Build/O11019; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/62.0.3202.84 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 62.0.3202.84 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: VV + model: Y97 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; DRA-LX5 Build/HUAWEIDRA-LX5; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/67.0.3396.87 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 67.0.3396.87 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: HU + model: Y5 lite + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; SAMSUNG SM-T830X Build/M1AJQ) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/8.0 Chrome/63.0.3239.111 Safari/537.36 + os: + name: Android + short_name: AND + version: 8.1.0 + platform: "" + client: + type: browser + name: Samsung Browser + short_name: SB + version: "8.0" + engine: WebKit + engine_version: "537.36" + device: + type: tablet + brand: SA + model: GALAXY Tab S4 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; vivo 1812 Build/O11019; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/62.0.3202.84 Mobile Safari/537.36 VivoBrowser/5.5.2 + os: + name: Android + short_name: AND + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 62.0.3202.84 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: VV + model: Y81i + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; VFD 820 Build/OPM1.171019.019) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 69.0.3497.100 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: VF + model: Smart X9 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; REVVL 2 PLUS Build/OPM1.171019.011) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.137 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 64.0.3282.137 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: TM + model: REVVL 2 Plus + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 9; SH-Z10) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "9" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 73.0.3683.90 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: SH + model: Aquos zero + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 9; GM1903) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.157 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "9" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 74.0.3729.157 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: 'ON' + model: "7" + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; X-TIGI_V28 LTE) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 70.0.3538.110 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: XT + model: V28 LTE + os_family: Android + browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index f57590ad1a..f4abc28bda 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -606,6 +606,20 @@ Acer: model: 'Iconia Tab A$1' device: 'tablet' +# Advan +Advan: + regex: '(i7U|S45E|5061|S50H|I7D|i55[KD]|i4U|S7D|S4Z|i5[KE]) Build' + device: 'smartphone' + models: + - regex: 'i7U' + model: 'I Lite i7U' + - regex: 'i(55[KD]|5[KE])' + model: 'I$1' + - regex: 'i4U' + model: 'I4U' + - regex: '(S45E|5061|S50H|I7D|S7D|S4Z)' + model: '$1' + # Advance Advance: regex: 'Hollogram|HL6246|IntroTr3544|Tr3845' @@ -1723,11 +1737,27 @@ Brondi: # Vivo Vivo: - regex: '(?:VIV-|BBG-)?vivo' + regex: '((?:VIV-|BBG-)?vivo)|V1813BA|V1818T|V1731CA|V1809T|V1813T' device: 'smartphone' models: - regex: '(?:VIV-|BBG-)?vivo[ _]1601 Build' model: 'V5' + - regex: 'V1813BA' + model: 'Z3' + - regex: 'V1809T' + model: 'X23' + - regex: 'V1818T' + model: 'Y93' + - regex: 'V1813T' + model: 'Y97' + - regex: 'V1731CA' + model: 'Y73' + - regex: 'vivo 1816' + model: 'Y91i' + - regex: 'vivo 1817' + model: 'Y91' + - regex: 'vivo 1812' + model: 'Y81i' - regex: '(?:VIV-|BBG-)?vivo[ _]([^/;]+) Build' model: '$1' - regex: '(?:VIV-|BBG-)?vivo[ _]([^);/]+)[);/]+' @@ -2380,6 +2410,7 @@ Datsun: - regex: 'DATSUN_D5500' model: 'D5500' + # Danew Danew: regex: 'Dslide ?([^;/]+) Build|Konnect_(504|601)' @@ -2757,6 +2788,14 @@ E-tel: - regex: 'E-tel[_ ]i250' model: 'i250' +# Evercoss +Evercoss: + regex: 'A75A\* Build' + device: 'smartphone' + models: + - regex: 'A75A\*' + model: 'A75A Star' + # Eton Eton: regex: 'Eton' @@ -3347,11 +3386,27 @@ Fairphone: # FiGO FiGO: - regex: 'ATRIUM II F55L2' + regex: 'ATRIUM II F55L2|TRIO F40LT|EPIC F50G|Gravity X55L|Orion M50L|ULTRA M50G|M405B|VIRTUE3|F55L Build' device: 'smartphone' models: - regex: 'ATRIUM II F55L2' model: 'Atrium II' + - regex: '(F55L)' + model: '$1' + - regex: 'TRIO F40LT' + model: 'Trio F40LT' + - regex: 'EPIC F50G' + model: 'Epic F50G' + - regex: '(Gravity X55L|Orion M50L)' + model: '$1' + - regex: 'ULTRA M50G' + model: 'Prime' + - regex: 'M405B_8GB' + model: 'Virtue II 8GB' + - regex: 'M405B' + model: 'Virtue II' + - regex: 'VIRTUE3' + model: 'Virtue III' # FNB FNB: @@ -4018,6 +4073,8 @@ Huawei: model: 'Y5 Lite (2018)' - regex: 'DRA-LX2' model: 'Y5 Prime (2018)' + - regex: 'DRA-LX5' + model: 'Y5 lite' - regex: 'MYA-L13' model: 'Y5 Pro (2017)' - regex: 'SCC-U21' @@ -4074,6 +4131,8 @@ Huawei: model: 'Mate 20' - regex: 'VOG-AL10' model: 'P30 Pro' + - regex: 'LYA-AL00P' + model: 'Mate 20 RS' - regex: 'LYA-(?:AL[01]0|L[02]9)' model: 'Mate 20 Pro' - regex: 'SNE-(?:AL00|LX[0-3])' @@ -4570,6 +4629,14 @@ Infinix: - regex: 'Infinix[ _-]([a-z0-9_\-]+)' model: '$1' +# InFocus +InFocus: + regex: '(IF9007) Build' + device: 'smartphone' + models: + - regex: '(IF9007)' + model: '$1' + # InnJoo InnJoo: regex: 'InnJoo' @@ -6520,51 +6587,13 @@ O2: - regex: 'O2-([a-z0-9]+)' model: '$1' -# Obi -Obi: - regex: 'Obi[ _-]|(SJ1\.5|SJ2\.6|S400|S452\+|S451|S453|S501|S502|S503\+?|S507|S520|S550|S551|falcon)[ _]' - device: 'smartphone' - models: - - regex: 'SJ2\.6' - model: 'SJ2.6' - - regex: 'SJ1\.5' - model: 'SJ1.5' - - regex: '(?:Obi_)?S400' - model: 'Skipper' - - regex: '(?:Obi_)?S451|falcon' - model: 'Flacon' - - regex: '(?:Obi_)?S452\+' - model: 'Python' - - regex: '(?:Obi_)?S453' - model: 'Fox' - - regex: '(?:Obi_)?S501' - model: 'Wolverine' - - regex: '(?:Obi_)?S502' - model: 'Leopard' - - regex: '(?:Obi_)?S503\+' - model: 'Boa Plus' - - regex: '(?:Obi_)?S503' - model: 'Boa' - - regex: '(?:Obi_)?S507' - model: 'Pelican' - - regex: '(?:Obi_)?S520' - model: 'Octopus' - - regex: '(?:Obi_)?S550' - model: 'Crane' - - regex: '(?:Obi_)?S551' - model: 'Hornbill' - - regex: '(?:Obi_)?S454' - model: 'Alligator' - - regex: 'Obi[ _-]([^;/]+) Build' - model: '$1' - - regex: 'Obi[ _-]([^;/)]+)[;/)]' - model: '$1' - # Odys Odys: - regex: 'ODYS[ _-]|IEOS[_ ]([^/;]+)|NOON(?:_PRO)? Build|SPACE10_(?:PLUS|PRO)_3G|THOR_?10|TAO_X10|RAPID_?(?:10|7)_?LTE|MAVEN_?10_|CONNECT[78]|ELEMENT10_PLUS_3G|XELIO[_0-9P]' + regex: 'ODYS[ _-]|IEOS[_ ]([^/;]+)|NOON(?:_PRO)? Build|SPACE10_(?:PLUS|PRO)_3G|THOR_?10|TAO_X10|RAPID_?(?:10|7)_?LTE|MAVEN_?10_|CONNECT[78]|ELEMENT10_PLUS_3G|XELIO[_0-9P]|ADM816HC|ADM8000KP|NEO6_LTE|EOS10|AEON|FALCON_10_PLUS_3G|FUSION' device: 'tablet' models: + - regex: 'XELIO[_ ]A10' + model: 'Xelio A10' - regex: 'XELIOPHONETAB3' model: 'Xelio Phonetab 3' - regex: 'XELIO_NEXT_10_PLUS_3G' @@ -6601,6 +6630,21 @@ Odys: model: 'Space 10 Pro 3G' - regex: 'THOR_?10 Build' model: 'Thor 10' + - regex: 'ADM816HC' + model: 'Neo X' + - regex: 'EOS10' + model: 'EOS 10' + - regex: 'AEON' + model: 'Aeon' + - regex: 'FALCON_10_PLUS_3G' + model: 'Falcon 10 Plus 3G' + - regex: 'FUSION' + model: 'Fusion 7' + - regex: 'NEO6[_ ]LTE' + model: 'Neo 6 LTE' + device: 'smartphone' + - regex: 'ADM8000KP' + model: 'Titan' - regex: 'THOR_?10_PLUS_3G' model: 'Thor 10 Plus 3G' - regex: 'IEOS[ _]([^/;]+) Build' @@ -6612,6 +6656,46 @@ Odys: - regex: 'Odys[ _-]([^/;]+) Build' model: '$1' +# Obi +Obi: + regex: 'Obi[ _-]|(SJ1\.5|SJ2\.6|S400|S452\+|S451|S453|S501|S502|S503\+?|S507|S520|S550|S551|falcon)[ _]' + device: 'smartphone' + models: + - regex: 'SJ2\.6' + model: 'SJ2.6' + - regex: 'SJ1\.5' + model: 'SJ1.5' + - regex: '(?:Obi_)?S400' + model: 'Skipper' + - regex: '(?:Obi_)?S451|falcon' + model: 'Flacon' + - regex: '(?:Obi_)?S452\+' + model: 'Python' + - regex: '(?:Obi_)?S453' + model: 'Fox' + - regex: '(?:Obi_)?S501' + model: 'Wolverine' + - regex: '(?:Obi_)?S502' + model: 'Leopard' + - regex: '(?:Obi_)?S503\+' + model: 'Boa Plus' + - regex: '(?:Obi_)?S503' + model: 'Boa' + - regex: '(?:Obi_)?S507' + model: 'Pelican' + - regex: '(?:Obi_)?S520' + model: 'Octopus' + - regex: '(?:Obi_)?S550' + model: 'Crane' + - regex: '(?:Obi_)?S551' + model: 'Hornbill' + - regex: '(?:Obi_)?S454' + model: 'Alligator' + - regex: 'Obi[ _-]([^;/]+) Build' + model: '$1' + - regex: 'Obi[ _-]([^;/)]+)[;/)]' + model: '$1' + # onda Onda: regex: 'Onda' @@ -6629,11 +6713,13 @@ Onda: # OnePlus OnePlus: - regex: '(?:du_)?ONEPLUS|(?:A0001|A200[135]|A300[03]|A3010|A5000|A600[03]|A601[03]|E100[135]|GM1911)(?: Build|\))' + regex: '(?:du_)?ONEPLUS|(?:A0001|A200[135]|A300[03]|A3010|A5000|A600[03]|A601[03]|E100[135]|GM1911|GM1903)(?: Build|\))' device: 'smartphone' models: - regex: 'GM1911' model: '7 Pro' + - regex: 'GM1903' + model: '7' - regex: 'A0001' model: 'One' - regex: 'A200[135]|OnePlus2' @@ -7141,6 +7227,14 @@ Roku: device: 'tv' model: 'Digital Video Player' +# Rokit +Rokit: + regex: 'IO Pro' + device: 'smartphone' + models: + - regex: 'IO Pro' + model: 'IO Pro' + # Rover Rover: regex: 'Rover ([0-9]+)' @@ -7284,6 +7378,9 @@ Samsung: - regex: '(?:SAMSUNG-)?SM-T110' device: 'tablet' model: 'GALAXY Tab 3 7.0" Lite WiFi' + - regex: '(?:SAMSUNG-)?SM-T830X' + device: 'tablet' + model: 'GALAXY Tab S4' - regex: '(?:SAMSUNG-)?SM-T111' device: 'tablet' model: 'GALAXY Tab 3 7.0" Lite' @@ -7702,6 +7799,8 @@ Samsung: model: 'GALAXY J3 (2016)' - regex: '(?:SAMSUNG-)?SM-J330(?:F|G)' model: 'GALAXY J3 (2017)' + - regex: '(?:SAMSUNG-)?SM-J337W' + model: 'GALAXY J3 (2018)' - regex: '(?:SAMSUNG-)?SM-J400[FGM]' model: 'GALAXY J4' - regex: '(?:SAMSUNG-)?SM-J500(?:F|FN|G|Y|M|H)' @@ -7714,12 +7813,16 @@ Samsung: model: 'GALAXY J5 Prime' - regex: '(?:SAMSUNG-)?SM-J600[FG]' model: 'GALAXY J6' - - regex: '(?:SAMSUNG-)?SM-J610G' + - regex: '(?:SAMSUNG-)?SM-J610[GF]' model: 'GALAXY J6+' + - regex: '(?:SAMSUNG-)?SM-J410F' + model: 'GALAXY J4 Core' - regex: '(?:SAMSUNG-)?SM-J7[01]0(?:8|F|FN|H|K|M|MN)' model: 'GALAXY J7' - regex: '(?:SAMSUNG-)?SM-J700P' model: 'GALAXY J7 (2015)' + - regex: '(?:SAMSUNG-)?SM-J737U' + model: 'GALAXY J7 (2018)' - regex: '(?:SAMSUNG-)?SM-J700(?:T1|T)' model: 'GALAXY J7 (2016)' - regex: '(?:SAMSUNG-)?SM-C710F' @@ -8427,12 +8530,14 @@ Spice: # Sharp Sharp: - regex: 'SHARP|SBM|SH-?[0-9]+[a-z]?[);/ ]|AQUOS|506SH|SHL22|FS8010[);/ ]|TG-L900S' + regex: 'SHARP|SBM|SH-?[0-9]+[a-z]?[);/ ]|SH-Z10|AQUOS|506SH|SHL22|FS8010[);/ ]|TG-L900S' device: 'smartphone' models: # explicit smartphone models - regex: '506SH' model: 'Aquos Xx3' + - regex: 'SH-Z10' + model: 'Aquos zero' - regex: 'SH-02E' model: 'Aquos Phone Zeta' - regex: 'SH06D' @@ -8567,9 +8672,11 @@ Qtek: # T-Mobile T-Mobile: - regex: 'T-Mobile[ _][a-z0-9 ]+' + regex: 'T-Mobile[ _][a-z0-9 ]+|REVVL 2 PLUS' device: 'smartphone' models: + - regex: 'REVVL 2 PLUS' + model: 'REVVL 2 Plus' - regex: 'T-Mobile[ _]([a-z0-9_ ]+) Build' model: '$1' - regex: 'T-Mobile[ _]([a-z0-9_ ]+)' @@ -9190,6 +9297,8 @@ Vodafone: model: 'Smart Prime 7' - regex: 'VFD320' model: 'Smart C9' + - regex: 'VFD 820' + model: 'Smart X9' - regex: 'VFD 610' model: 'Smart N8' - regex: 'VFD 700' @@ -10394,3 +10503,11 @@ Savio: models: - regex: '(TB-PO1)' model: '$1' + +# X-TIGI +X-TIGI: + regex: 'X-TIGI' + device: 'smartphone' + models: + - regex: 'X-TIGI[ _-]([^/;\)]+)(?:Build)?' + model: '$1'