diff --git a/Tests/fixtures/smartphone-2.yml b/Tests/fixtures/smartphone-2.yml index 984d80216b..3b19ac59d3 100644 --- a/Tests/fixtures/smartphone-2.yml +++ b/Tests/fixtures/smartphone-2.yml @@ -2170,6 +2170,26 @@ model: Honor 7X os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 7.0; zh-cn; FRD-AL00 Build/HUAWEIFRD-AL00) AppleWebKit/537.36 (KHTML, like Gecko) MQQBrowser/7.3 Chrome/37.0.0.0 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: browser + name: QQ Browser + short_name: QQ + version: "7.3" + engine: WebKit + engine_version: "537.36" + device: + type: smartphone + brand: HU + model: Honor 8 + os_family: Android + browser_family: Unknown - user_agent: Mozilla/5.0 (Linux; Android 7.0; PRA-AL00X Build/HONORPRA-AL00X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36 os: @@ -2600,6 +2620,26 @@ model: Nova 2I os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.0.0; ANE-AL00 Build/HUAWEIANE-AL00) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "8.0.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: Nova 3e + os_family: Android + browser_family: Chrome - user_agent: Mozilla/5.0 (Linux; Android 8.0.0; FIG-LX1 Build/HUAWEIFIG-LX1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.109 Mobile Safari/537.36 os: @@ -2640,6 +2680,26 @@ model: P10 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.0.0; VTR-L29 Build/HUAWEIVTR-L29) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "8.0.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: P10 + os_family: Android + browser_family: Chrome - user_agent: Mozilla/5.0 (Linux; Android 7.0; WAS-LX1 Build/HUAWEIWAS-LX1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.116 Mobile Safari/537.36 os: @@ -2680,6 +2740,26 @@ model: P10 Plus os_family: Android browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; VKY-L29 Build/HUAWEIVKY-L29) AppleWebKit/537.36 (KHTML, like Gecko) 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: HU + model: P10 Plus + os_family: Android + browser_family: Chrome - user_agent: Mozilla/5.0 (Linux; Android 7.0; BAC-L23 Build/HUAWEIBAC-L23) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.137 Mobile Safari/537.36 mCent/0.13.1127 os: @@ -3617,6 +3697,26 @@ model: Y6II os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.0.0; LDN-L21 Build/HUAWEILDN-L21) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "8.0.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: Y7 Prime + os_family: Android + browser_family: Chrome - user_agent: Mozilla/5.0 (Linux; Android 4.2.1; iOCEAN X7 Build/JOP40D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.111 Mobile Safari/537.36 os: @@ -8908,6 +9008,26 @@ model: G5 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; LG-H860 Build/NRD90U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "67.0.3396.87" + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LG + model: G5 + os_family: Android + browser_family: Chrome - user_agent: Mozilla/5.0 (Linux; Android 6.0.1; LG-H840 Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.109 Mobile Safari/537.36 os: @@ -8968,6 +9088,26 @@ model: GT540 os_family: Android browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; LG-K350 Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.89 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "50.0.2661.89" + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LG + model: K8 + os_family: Android + browser_family: Chrome - user_agent: AndroidDownloadManager/5.1.1 (Linux; U; Android 5.1.1; LG-K420 Build/LMY47V) os: @@ -9105,6 +9245,26 @@ model: K7 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; LG-K332 Build/LMY47V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.89 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "50.0.2661.89" + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LG + model: K7 + os_family: Android + browser_family: Chrome - user_agent: Mozilla/5.0 (Linux; Android 4.0.4; LG-KU5400 Build/IMM76D) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Mobile Safari/535.19 os: diff --git a/Tests/fixtures/smartphone-3.yml b/Tests/fixtures/smartphone-3.yml index 4b7d0fc412..2c235d1b56 100644 --- a/Tests/fixtures/smartphone-3.yml +++ b/Tests/fixtures/smartphone-3.yml @@ -159,6 +159,26 @@ model: Risio os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; LG-H650 Build/LMY47V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/43.0.2357.93 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "43.0.2357.93" + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LG + model: Zero + os_family: Android + browser_family: Chrome - user_agent: Mozilla/5.0 (Linux; Android 8.1.0; LM-Q710(FGN) Build/OPM1.171019.019) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.109 Mobile Safari/537.36 os: @@ -3907,6 +3927,26 @@ model: Canvas Mega os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; Micromax Q424 Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.85 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "54.0.2840.85" + engine: Blink + engine_version: "" + device: + type: smartphone + brand: MI + model: Bolt Selfie + os_family: Android + browser_family: Chrome - user_agent: Mozilla/5.0 (Linux; Android 4.2.2; CRONO 22 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.131 Mobile Safari/537.36 os: @@ -5655,7 +5695,7 @@ device: type: smartphone brand: MR - model: Moto C + model: Moto C Plus os_family: Android browser_family: Chrome - @@ -5918,6 +5958,26 @@ model: Moto G5S Plus os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.0.0; Moto Z2 Play Build/OPSS27.76-12-25-7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "8.0.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "69.0.3497.100" + engine: Blink + engine_version: "" + device: + type: smartphone + brand: MR + model: Moto Z2 Play + os_family: Android + browser_family: Chrome - user_agent: Mozilla/5.0 (Linux; Android 7.0; XT1663 Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.111 Mobile Safari/537.36 os: @@ -9603,6 +9663,26 @@ model: F5 Youth os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 7.1.1; en-us; CPH1801 Build/NMF26F) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/53.0.2785.134 Mobile Safari/537.36 OppoBrowser/1.0.0 + os: + name: Android + short_name: AND + version: "7.1.1" + platform: "" + client: + type: browser + name: Oppo Browser + short_name: PP + version: "1.0.0" + engine: WebKit + engine_version: "537.36" + device: + type: smartphone + brand: OP + model: A71 + os_family: Android + browser_family: Unknown - user_agent: Mozilla/5.0 (Linux; Android 8.1.0; CPH1859 Build/O11019) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.91 Mobile Safari/537.36 os: diff --git a/Tests/fixtures/smartphone-4.yml b/Tests/fixtures/smartphone-4.yml index 649988f2cc..db82bd7952 100644 --- a/Tests/fixtures/smartphone-4.yml +++ b/Tests/fixtures/smartphone-4.yml @@ -4304,6 +4304,26 @@ model: GALAXY A8 os_family: Android browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 6.0.1; SAMSUNG SM-A800F Build/MMB29K) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/5.4 Chrome/51.0.2704.106 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0.1" + platform: "" + client: + type: browser + name: Samsung Browser + short_name: SB + version: "5.4" + engine: WebKit + engine_version: "537.36" + device: + type: smartphone + brand: SA + model: GALAXY A8 + os_family: Android + browser_family: Unknown - user_agent: Mozilla/5.0 (Linux; Android 5.1.1; SAMSUNG SM-A9000 Build/LMY47V) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/4.0 Chrome/44.0.2403.133 Mobile Safari/537.36 os: @@ -4844,6 +4864,26 @@ model: GALAXY E5 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; SM-E700H Build/LMY47X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.109 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "65.0.3325.109" + engine: Blink + engine_version: "" + device: + type: smartphone + brand: SA + model: GALAXY E7 + os_family: Android + browser_family: Chrome - user_agent: Mozilla/5.0 (Linux; U; Android 4.1.2; de-de; GT-I8730 Build/JZO54K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 os: @@ -5324,6 +5364,26 @@ model: GALAXY J5 Prime os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; SM-G570Y Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.137 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: "64.0.3282.137" + engine: Blink + engine_version: "" + device: + type: smartphone + brand: SA + model: GALAXY J5 Prime + os_family: Android + browser_family: Chrome - user_agent: Mozilla/5.0 (Linux; Android 8.0.0; SM-J600F Build/R16NW; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/68.0.3440.70 Mobile Safari/537.36 os: diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index b4e62ca212..a3ea3c834c 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -454,6 +454,8 @@ MicroMax: model: 'Bolt' - regex: 'Q417' model: 'Canvas Mega' + - regex: 'Q424' + model: 'Bolt Selfie' - regex: 'Q426' model: 'Canvas Mega 2' - regex: 'MicroMax(?:[ \-\_])?(P[a-z0-9]+)' @@ -3086,6 +3088,8 @@ Huawei: model: 'Honor 6X' - regex: '(?:HONOR[ _]?)?BND-(?:AL10|L21)' model: 'Honor 7X' + - regex: 'FRD-AL00' + model: 'Honor 8' - regex: 'PRA-AL00X' model: 'Honor 8 Lite' - regex: 'LLD-AL20' @@ -3100,17 +3104,19 @@ Huawei: model: 'P8 Lite (2017)' - regex: 'RNE-L22' model: 'Nova 2I' + - regex: 'ANE-AL00' + model: 'Nova 3e' - regex: 'EVA-L[012]9' model: 'P9' - regex: 'VNS-L[23]1' model: 'P9 Lite' - - regex: 'VTR-L09' + - regex: 'VTR-L[02]9' model: 'P10' - regex: 'WAS-L(?:X1|X1A|X2|X2J|X3|03T)' model: 'P10 Lite' - regex: 'BAC-L[02]3' model: 'P10 Selfie' - - regex: 'VKY-(?:L09|L029|AL00)' + - regex: 'VKY-(?:L09|L29|AL00)' model: 'P10 Plus' - regex: 'ANE-LX[123]' model: 'P20 Lite' @@ -3120,6 +3126,10 @@ Huawei: model: 'P smart' - regex: 'CAM-L(?:03|21)' model: 'Y6II' + - regex: 'LDN-L(?:01|X3)' + model: 'Y7' + - regex: 'LDN-L21' + model: 'Y7 Prime' - regex: 'MHA-L[02]9' model: 'Mate 9' - regex: 'RNE-L(?:03|21)' @@ -4048,7 +4058,7 @@ LG: model: 'G4 Stylus' - regex: 'LG-H735' model: 'G4 Beat' - - regex: 'LG-H85[08]' + - regex: 'LG-H8(?:20|30|5[08]|60)' model: 'G5' - regex: 'LG-H84[05]' model: 'G5 SE' @@ -4058,6 +4068,8 @@ LG: model: 'Magna' - regex: '(?:LG-)?H343' model: 'Risio' + - regex: '(?:LG-)?H650' + model: 'Zero' - regex: '(?:LG-)?M154' model: 'Risio 2' - regex: 'P713' @@ -4098,8 +4110,10 @@ LG: model: 'Optimus Zone 3' - regex: '(?:LG-)?K100' model: 'K3' - - regex: '(?:LG-?)?(?:K|MS)330' + - regex: '(?:LG-?)?(?:K|MS)33[02]' model: 'K7' + - regex: '(?:LG-?)?(?:K|MS)350' + model: 'K8' - regex: '(?:LG-)?K420(?:N)?' model: 'K10' - regex: '(?:LG-)?K430(?:DS|DSF|DSY)?' @@ -4757,12 +4771,12 @@ Motorola: - regex: '(?:MOT-|Motorola-)?XT1663' model: 'Moto M' - - regex: 'Moto ([CGE]) \(([a-z0-9]+)\)( Plus)?' + - regex: 'Moto ([CGEZ]) \(([a-z0-9]+)\)( Plus| Play)?' + model: 'Moto $1$2$3' + - regex: 'Moto ?([CGEZ])([0-9]+)( Plus| Play)?' model: 'Moto $1$2$3' - - regex: 'Moto ?([CGE])([0-9]+)' + - regex: 'Moto ?([CGEZ])( Plus| Play)?' model: 'Moto $1$2' - - regex: 'Moto ?([CGE])' - model: 'Moto $1' - regex: 'Motorola[ _\-]([a-z0-9]+)' model: '$1' @@ -5165,6 +5179,8 @@ OPPO: model: 'A57' - regex: '(?:OPPO[ _]?)?CPH1729[);/ ]' model: 'A83' + - regex: '(?:OPPO[ _]?)?CPH1801[);/ ]' + model: 'A71' - regex: '(?:OPPO[ _]?)?CPH1819[);/ ]' model: 'F7' - regex: '(?:OPPO[ _]?)?CPH1859[);/ ]' @@ -5720,6 +5736,8 @@ Samsung: model: 'GALAXY Express' - regex: '(?:SAMSUNG-)?SM-E500(?:F|H|HQ|M)' model: 'GALAXY E5' + - regex: '(?:SAMSUNG-)?SM-E700(?:0|9|F|H|M)' + model: 'GALAXY E7' - regex: '(?:SAMSUNG-)?GT-I90(?:00|08|18|88)' model: 'GALAXY S' - regex: '(?:SAMSUNG-)?GT-I9001' @@ -5874,7 +5892,7 @@ Samsung: model: 'GALAXY A5 (2017)' - regex: '(?:SAMSUNG-)?SM-(?:A720F|A700[FKLS]|A710[FMY0])' model: 'GALAXY A7' - - regex: '(?:SAMSUNG-)?SM-A530F' + - regex: '(?:SAMSUNG-)?SM-A(?:530F|800F)' model: 'GALAXY A8' - regex: '(?:SAMSUNG-)?SM-A9000' model: 'GALAXY A9' @@ -5908,7 +5926,7 @@ Samsung: model: 'GALAXY J5 (2016)' - regex: '(?:SAMSUNG-)?SM-J530[FY]' model: 'GALAXY J5 (2017)' - - regex: '(?:SAMSUNG-)?SM-G570F' + - regex: '(?:SAMSUNG-)?SM-G570[FY]' model: 'GALAXY J5 Prime' - regex: '(?:SAMSUNG-)?SM-J600[FG]' model: 'GALAXY J6'