diff --git a/DeviceDetector.php b/DeviceDetector.php index 89eec3f351..4a7a179b87 100644 --- a/DeviceDetector.php +++ b/DeviceDetector.php @@ -1017,12 +1017,19 @@ protected function parseDevice(): void } /** - * All unknown devices under running Java ME are more likely a features phones + * All unknown devices under running Java ME are more likely features phones */ if ('Java ME' === $osName && null === $this->device) { $this->device = AbstractDeviceParser::DEVICE_TYPE_FEATURE_PHONE; } + /** + * All devices running KaiOS are more likely features phones + */ + if ('KaiOS' === $osName) { + $this->device = AbstractDeviceParser::DEVICE_TYPE_FEATURE_PHONE; + } + /** * According to http://msdn.microsoft.com/en-us/library/ie/hh920767(v=vs.85).aspx * Internet Explorer 10 introduces the "Touch" UA string token. If this token is present at the end of the diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 657ef922e9..2452f0503a 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -279,6 +279,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'BLK' => 'Black Box', 'BF' => 'Black Fox', 'BPC' => 'Blackpcs', + 'BLP' => 'Blackphone', 'BLT' => 'Blackton', 'B2' => 'Blackview', '2Y' => 'b2m', @@ -690,6 +691,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'GD' => 'Gemini', 'GN' => 'General Mobile', '2G' => 'Genesis', + 'GEP' => 'Geo Phone', 'G2' => 'GEOFOX', 'GE' => 'Geotel', 'Q4' => 'Geotex', @@ -849,6 +851,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'IC' => 'iDroid', 'IDI' => 'iDino', '6Z' => 'iData', + 'IDC' => 'IDC', 'IG' => 'iGet', 'IHL' => 'iHome Life', 'IH' => 'iHunt', @@ -1471,6 +1474,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'WJ' => 'Qware', 'QWT' => 'QWATT', 'R2' => 'R-TV', + 'R3D' => 'R3Di', 'RA' => 'Ramos', '0R' => 'Raspberry', 'R9' => 'Ravoz', @@ -1487,6 +1491,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'RE' => 'Realme', 'RE1' => 'Redbean', 'R8' => 'RED', + 'RDX' => 'RED-X', 'REW' => 'Redway', '6F' => 'Redfox', 'RE2' => 'RedLine', diff --git a/Tests/Parser/Client/fixtures/mobile_app.yml b/Tests/Parser/Client/fixtures/mobile_app.yml index d7a74946c3..356d790963 100644 --- a/Tests/Parser/Client/fixtures/mobile_app.yml +++ b/Tests/Parser/Client/fixtures/mobile_app.yml @@ -2315,3 +2315,15 @@ type: mobile app name: Edmodo version: 10.43.5 +- + user_agent: Mozilla/5.0 (Mobile; LYF/F10Q/LYF-F10Q-000-01-31-071119; Android; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5 YouTube/1.92.52.J + client: + type: mobile app + name: YouTube + version: 1.92.52 +- + user_agent: Mozilla/5.0 (Mobile; ALCATEL A406DL; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.4 YouTube/1.92.52.K + client: + type: mobile app + name: YouTube + version: 1.92.52 diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index f317f0cfd8..bbc24d14c7 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -1804,3 +1804,1389 @@ model: WX310SA os_family: Unknown browser_family: NetFront +- + user_agent: Mozilla/5.0 (Mobile; Crosscall_Core-S4_4G; rv:48.0; CAEN) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.2 + os: + name: KaiOS + version: 2.5.3.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Crosscall + model: Core-S4 + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; ALCATEL4044T; rv:37.0) Gecko/37.0 Firefox/37.0 KaiOS/1.0 + os: + name: KaiOS + version: "1.0" + platform: "" + client: + type: browser + name: Firefox Mobile + version: "37.0" + engine: Gecko + engine_version: "37.0" + device: + type: feature phone + brand: Alcatel + model: Go Flip + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; LYF/LF-2403N/LYF-LF2403N-000-01-38-151217;Android; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.0 + os: + name: KaiOS + version: "2.0" + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: LYF + model: LF-2403N + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; LYF/F90M/LYF-F90M-000-02-28-130318; Android; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.0 + os: + name: KaiOS + version: "2.0" + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: LYF + model: F90M + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; LYF/F30C/LYF_F30C-000-09-10-140318; Android; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.0 + os: + name: KaiOS + version: "2.0" + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: LYF + model: F30C + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; IPRO_K2_3G; rv:48.0; CAEN) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1.2 + os: + name: KaiOS + version: 2.5.1.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: iPro + model: K2 3G + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; CAT B35; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1 + os: + name: KaiOS + version: 2.5.1 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Cat + model: B35 + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; LYF/F120B/LYF-F120B-001-02-05-011118_audio_patch-i;Android; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5 + os: + name: KaiOS + version: "2.5" + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: LYF + model: F120B + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; ATT_EA211101; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.4 + os: + name: KaiOS + version: 2.5.4 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: 'AT&T' + model: Cingular Flex + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Nokia 2720 V Flip; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.4 + os: + name: KaiOS + version: 2.5.4 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Nokia + model: 2720 V Flip + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Nokia_2720_Flip; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.2.2 + os: + name: KaiOS + version: 2.5.2.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Nokia + model: 2720 Flip + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; 3088X; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1.1 + os: + name: KaiOS + version: 2.5.1.1 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Alcatel + model: "3088" + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; ALCATEL 4052C; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.2 + os: + name: KaiOS + version: 2.5.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Alcatel + model: SmartFlip + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; ALCATEL 4052O; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.2 + os: + name: KaiOS + version: 2.5.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Alcatel + model: Go Flip 3 + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; ALCATEL 4052R; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.2 + os: + name: KaiOS + version: 2.5.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Alcatel + model: SmartFlip + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; ALCATEL 4052W; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.2 + os: + name: KaiOS + version: 2.5.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Alcatel + model: Go Flip 3 + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; ALCATEL 4052Z; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.2 + os: + name: KaiOS + version: 2.5.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Alcatel + model: Go Flip 3 + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; ALCATEL 4056W; rv:84.0) Gecko/84.0 Firefox/84.0 KAIOS/3.0 + os: + name: KaiOS + version: "3.0" + platform: "" + client: + type: browser + name: Firefox Mobile + version: "84.0" + engine: Gecko + engine_version: "84.0" + device: + type: feature phone + brand: Alcatel + model: Go Flip 4 + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; ALCATEL 4056Z; rv:84.0) Gecko/84.0 Firefox/84.0 KAIOS/3.0 + os: + name: KaiOS + version: "3.0" + platform: "" + client: + type: browser + name: Firefox Mobile + version: "84.0" + engine: Gecko + engine_version: "84.0" + device: + type: feature phone + brand: Alcatel + model: Go Flip 4 + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; ALCATEL A406DL; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.4 + os: + name: KaiOS + version: 2.5.4 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Alcatel + model: MyFlip 2 + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Mango_AKABUTO_4G; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.2 + os: + name: KaiOS + version: 2.5.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Mango + model: Akabuto 4G + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; ATT_U102AA; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.1 + os: + name: KaiOS + version: 2.5.3.1 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: 'AT&T' + model: Cingular Flip IV + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; ATT_U1030AA; rv:84.0) Gecko/84.0 Firefox/84.0 KAIOS/3.1 + os: + name: KaiOS + version: "3.1" + platform: "" + client: + type: browser + name: Firefox Mobile + version: "84.0" + engine: Gecko + engine_version: "84.0" + device: + type: feature phone + brand: 'AT&T' + model: Cingular Flex 2 + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; ALCATEL4044C; rv:37.0) Gecko/37.0 Firefox/37.0 KaiOS/1.0 + os: + name: KaiOS + version: "1.0" + platform: "" + client: + type: browser + name: Firefox Mobile + version: "37.0" + engine: Gecko + engine_version: "37.0" + device: + type: feature phone + brand: Alcatel + model: Quick Flip + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; ALCATEL4044O; rv:37.0) Gecko/37.0 Firefox/37.0 KaiOS/1.0 + os: + name: KaiOS + version: "1.0" + platform: "" + client: + type: browser + name: Firefox Mobile + version: "37.0" + engine: Gecko + engine_version: "37.0" + device: + type: feature phone + brand: Alcatel + model: Cingular Flip II + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; ALCATEL4044V; rv:37.0) Gecko/37.0 Firefox/37.0 KaiOS/1.0 + os: + name: KaiOS + version: "1.0" + platform: "" + client: + type: browser + name: Firefox Mobile + version: "37.0" + engine: Gecko + engine_version: "37.0" + device: + type: feature phone + brand: Alcatel + model: Go Flip V + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; CKT_U102AC; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.1 + os: + name: KaiOS + version: 2.5.3.1 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Cricket + model: Debut Flip + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; CKT_U1030AC; rv:84.0) Gecko/84.0 Firefox/84.0 KAIOS/3.1 + os: + name: KaiOS + version: "3.1" + platform: "" + client: + type: browser + name: Firefox Mobile + version: "84.0" + engine: Gecko + engine_version: "84.0" + device: + type: feature phone + brand: Cricket + model: Debut Flex + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; rv:48.0; A405DL) Gecko/48.0 Firefox/48.0 KAIOS/2.5 + os: + name: KaiOS + version: "2.5" + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Alcatel + model: MyFlip + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Doppio_TEXTER_3G; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1.1 + os: + name: KaiOS + version: 2.5.1.1 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Doppio + model: Texter + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; BLACKPHONE_Blackphone_K330_3G; rv:48.0; CAEN) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1.2 + os: + name: KaiOS + version: 2.5.1.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Blackphone + model: K330 + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; GEOPHONE_T19I_4G; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.2 + os: + name: KaiOS + version: 2.5.3.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Geo Phone + model: T19i + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Geo_Phone_T15_4G; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.1 + os: + name: KaiOS + version: 2.5.3.1 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Geo Phone + model: T15 + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Geo_Phone_T19_4G; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.1 + os: + name: KaiOS + version: 2.5.3.1 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Geo Phone + model: T19 + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Accent_Nubia50K; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1.1 + os: + name: KaiOS + version: 2.5.1.1 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Accent + model: Nubia 50K + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; ACCENT_NUBIA60K; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1.1 + os: + name: KaiOS + version: 2.5.1.1 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Accent + model: Nubia 60K + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Accent_60K28_512; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1.1 + os: + name: KaiOS + version: 2.5.1.1 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Accent + model: Nubia 60K + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; B300V; rv:84.0) Gecko/84.0 Firefox/84.0 KAIOS/3.1 + os: + name: KaiOS + version: "3.1" + platform: "" + client: + type: browser + name: Firefox Mobile + version: "84.0" + engine: Gecko + engine_version: "84.0" + device: + type: feature phone + brand: Blu + model: Flex + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; BLU_TankMega_3G; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1.1 + os: + name: KaiOS + version: 2.5.1.1 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Blu + model: Tank Mega + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; BLU_ZOEY_SMART; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1.1 + os: + name: KaiOS + version: 2.5.1.1 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Blu + model: Zoey Smart + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Jio/F491H/Jio-F491H-001-06-24-271223;Android; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.2 + os: + name: KaiOS + version: 2.5.3.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Jio + model: F491H + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Jio/JFP1AE/Jio-JFP1AE-001-01-47-080524;Android; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.2 + os: + name: KaiOS + version: 2.5.3.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Jio + model: JFP1AE + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Multilaser_ZAPP; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1.1 + os: + name: KaiOS + version: 2.5.1.1 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Multilaser + model: ZAPP + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Multilaser_ZAPP_II_3G; rv:48.0; CAEN) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1.2 + os: + name: KaiOS + version: 2.5.1.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Multilaser + model: ZAPP II + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; M560M3; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1 + os: + name: KaiOS + version: 2.5.1 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: MTN + model: Smart S + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; M561M3; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1.2 + os: + name: KaiOS + version: 2.5.1.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: MTN + model: Smart T + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; M562F3; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1.1 + os: + name: KaiOS + version: 2.5.1.1 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Orange + model: Sanza + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; M571M3; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1.2 + os: + name: KaiOS + version: 2.5.1.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: MTN + model: Smart Kamunye + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; RED_X_RX2441_4G; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.1 + os: + name: KaiOS + version: 2.5.3.1 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: RED-X + model: RX2441 + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; SIGMAMOBILE-S3500-3G; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1.1 + os: + name: KaiOS + version: 2.5.1.1 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Sigma + model: X-Style + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; R3Di_FR150; rv:48.0; CAEN) Gecko/48.0 Firefox/48.0 KAIOS/2.5.4 + os: + name: KaiOS + version: 2.5.4 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: R3Di + model: FR150 + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Symphony_PD1_4G_4G; rv:48.0; CAEN) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.2 + os: + name: KaiOS + version: 2.5.3.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Symphony + model: PD1 4G + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Bmobile_W125K_3G; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1.2 + os: + name: KaiOS + version: 2.5.1.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Bmobile + model: W125K + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Digit_Digit4G-Bold_4G; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.1 + os: + name: KaiOS + version: 2.5.3.1 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Digit4G + model: Bold + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Digit_Digit4G-Defender_4G; rv:48.0; CAEN) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.2 + os: + name: KaiOS + version: 2.5.3.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Digit4G + model: Defender + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Digit_Digit4G-Elite_4G; rv:48.0; CAEN) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.2 + os: + name: KaiOS + version: 2.5.3.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Digit4G + model: Elite + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Digit_Digit4G-Music_4G; rv:48.0; CAEN) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.2 + os: + name: KaiOS + version: 2.5.3.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Digit4G + model: Music + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Digit_Digit4G-Power_4G; rv:48.0; CAEN) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.2 + os: + name: KaiOS + version: 2.5.3.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Digit4G + model: Power + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Digit_Digit4G-Star_4G; rv:48.0; CAEN) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.2 + os: + name: KaiOS + version: 2.5.3.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Digit4G + model: Star + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Digit_Digit4GLite_4G; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.2 + os: + name: KaiOS + version: 2.5.3.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Digit4G + model: Lite + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Digit_Digit4GPowerMAX_4G; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.2 + os: + name: KaiOS + version: 2.5.3.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Digit4G + model: Power Max + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Digit_Digit4G_Shine_4G; rv:48.0; CAEN) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.2 + os: + name: KaiOS + version: 2.5.3.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Digit4G + model: Shine + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Sanza-M560F3; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1 + os: + name: KaiOS + version: 2.5.1 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Orange + model: Sanza + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Energizer_E241; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1.1 + os: + name: KaiOS + version: 2.5.1.1 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Energizer + model: E241 + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; ENERGIZER_E241S; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.2 + os: + name: KaiOS + version: 2.5.3.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Energizer + model: E241S + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Energizer_E242S_4G; rv:48.0; CAEN) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.2 + os: + name: KaiOS + version: 2.5.3.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Energizer + model: E242S + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; ENERGIZER_E280S; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.2 + os: + name: KaiOS + version: 2.5.3.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Energizer + model: E280S + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Energizer_E282SC_4G; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.2 + os: + name: KaiOS + version: 2.5.3.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Energizer + model: E282SC + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; ENERGIZER_H280A_512; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1.1 + os: + name: KaiOS + version: 2.5.1.1 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Energizer + model: H280A + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; IDC_Voice_20_4G; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.2 + os: + name: KaiOS + version: 2.5.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: IDC + model: Voice 20 + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Free_Wi-Kif4G_4G; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.2 + os: + name: KaiOS + version: 2.5.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: free + model: Wi-Kif 4G + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Telma_Wi-Kif+3G_3G; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1.1 + os: + name: KaiOS + version: 2.5.1.1 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Telma + model: Wi-Kif+ 3G + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Telma_Wi-Kif+4G_4G; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.2 + os: + name: KaiOS + version: 2.5.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Telma + model: Wi-Kif+ 4G + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; Telma_Wikif_Max_4G; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.2 + os: + name: KaiOS + version: 2.5.3.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Telma + model: Wi-Kif Max + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile; KLT_K301; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1.1 + os: + name: KaiOS + version: 2.5.1.1 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: K-Lite + model: K301 + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile;Orange_Nevalink;rv:48.0; CAEN) Gecko/48.0 Firefox/48.0 KAIOS/2.5.2 + os: + name: KaiOS + version: 2.5.2 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Orange + model: Neva Link + os_family: Firefox OS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Mobile;Orange_Nevamini;rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.2.1 + os: + name: KaiOS + version: 2.5.2.1 + platform: "" + client: + type: browser + name: Firefox Mobile + version: "48.0" + engine: Gecko + engine_version: "48.0" + device: + type: feature phone + brand: Orange + model: Neva Mini + os_family: Firefox OS + browser_family: Firefox diff --git a/Tests/fixtures/podcasting.yml b/Tests/fixtures/podcasting.yml index 609532d9bc..fb8853af73 100644 --- a/Tests/fixtures/podcasting.yml +++ b/Tests/fixtures/podcasting.yml @@ -382,7 +382,7 @@ name: KaiOS Downloader version: "" device: - type: "" + type: feature phone brand: "" model: "" os_family: Firefox OS @@ -398,7 +398,7 @@ name: PodKast version: "" device: - type: "" + type: feature phone brand: "" model: "" os_family: Firefox OS @@ -5988,7 +5988,7 @@ name: PodKast version: "" device: - type: smartphone + type: feature phone brand: Safaricom model: Kimem Kerefa 4G os_family: Firefox OS @@ -6036,7 +6036,7 @@ name: PodLP version: 1.3.2.0 device: - type: smartphone + type: feature phone brand: LYF model: F271i os_family: Firefox OS @@ -6052,9 +6052,9 @@ name: PodLP version: 2.2.1 device: - type: smartphone + type: feature phone brand: Nokia - model: 2720 Flip + model: 2720 V Flip os_family: Firefox OS browser_family: Unknown - diff --git a/Tests/fixtures/smart_speaker.yml b/Tests/fixtures/smart_speaker.yml index 639d7f6f56..7c5d70615f 100644 --- a/Tests/fixtures/smart_speaker.yml +++ b/Tests/fixtures/smart_speaker.yml @@ -347,3 +347,57 @@ model: Station 2 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 9; AEORH) AppleWebKit/537.36 (KHTML, like Gecko) Silk/130.5.2 like Chrome/130.0.6723.142 Safari/537.36 + os: + name: Android + version: "9" + platform: "" + client: + type: browser + name: Mobile Silk + version: 130.5.2 + engine: Blink + engine_version: 130.0.6723.142 + device: + type: smart speaker + brand: Amazon + model: Echo Show 8 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.1.2; AEOHP Build/NS6546;) AppleWebKit/537.36 (KHTML, like Gecko) Silk/126.3.601 like Chrome/126.0.6478.242 Safari/537.36 + os: + name: Fire OS + version: "6" + platform: "" + client: + type: browser + name: Mobile Silk + version: 126.3.601 + engine: Blink + engine_version: 126.0.6478.242 + device: + type: smart speaker + brand: Amazon + model: Echo Show 5 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; OS 1.1; AEOHP user/43; wv) AppleWebKit/537.36 (KHTML, like Gecko) Mobile Chrome/118.0.5993.159 Safari/537.36 + os: + name: Fire OS + version: "" + platform: "" + client: + type: browser + name: Chrome Webview + version: 118.0.5993.159 + engine: Blink + engine_version: 118.0.5993.159 + device: + type: smart speaker + brand: Amazon + model: Echo Show 5 + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/smartphone-29.yml b/Tests/fixtures/smartphone-29.yml index a3abdda500..afff69ac03 100644 --- a/Tests/fixtures/smartphone-29.yml +++ b/Tests/fixtures/smartphone-29.yml @@ -6311,24 +6311,6 @@ model: A46 os_family: Android browser_family: Chrome -- - user_agent: Mozilla/5.0 (Mobile; LYF/F120B/LYF-F120B-001-02-05-011118_audio_patch-i;Android; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5 - os: - name: KaiOS - version: "2.5" - platform: "" - client: - type: browser - name: Firefox Mobile - version: "48.0" - engine: Gecko - engine_version: "48.0" - device: - type: smartphone - brand: LYF - model: F120B - os_family: Firefox OS - browser_family: Firefox - user_agent: Mozilla/5.0 (Linux; Android 10; beryllium) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.157 Mobile Safari/537.36 os: diff --git a/Tests/fixtures/smartphone-3.yml b/Tests/fixtures/smartphone-3.yml index 82a73ee210..916fb8f457 100644 --- a/Tests/fixtures/smartphone-3.yml +++ b/Tests/fixtures/smartphone-3.yml @@ -5211,24 +5211,6 @@ model: B15Q os_family: Android browser_family: Chrome -- - user_agent: Mozilla/5.0 (Mobile; CAT B35; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1 - os: - name: KaiOS - version: 2.5.1 - platform: "" - client: - type: browser - name: Firefox Mobile - version: "48.0" - engine: Gecko - engine_version: "48.0" - device: - type: smartphone - brand: Cat - model: B35 - os_family: Firefox OS - browser_family: Firefox - user_agent: Mozilla/5.0 (Linux; Android 8.1.0; CUBOT A5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.157 Mobile Safari/537.36 os: diff --git a/Tests/fixtures/smartphone-40.yml b/Tests/fixtures/smartphone-40.yml index 6fee609d8b..77b7e2a582 100644 --- a/Tests/fixtures/smartphone-40.yml +++ b/Tests/fixtures/smartphone-40.yml @@ -3273,24 +3273,6 @@ model: A3 Pro 5G os_family: Android browser_family: Unknown -- - user_agent: Mozilla/5.0 (Mobile; IPRO_K2_3G; rv:48.0; CAEN) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1.2 - os: - name: KaiOS - version: 2.5.1.2 - platform: "" - client: - type: browser - name: Firefox Mobile - version: "48.0" - engine: Gecko - engine_version: "48.0" - device: - type: smartphone - brand: iPro - model: K2 3G - os_family: Firefox OS - browser_family: Firefox - user_agent: Mozilla/5.0 (Linux; Android 6.0.0; DOOV L525) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Mobile Safari/537.36 os: diff --git a/Tests/fixtures/smartphone-41.yml b/Tests/fixtures/smartphone-41.yml index f3f7339471..ea825bf776 100644 --- a/Tests/fixtures/smartphone-41.yml +++ b/Tests/fixtures/smartphone-41.yml @@ -4532,3 +4532,127 @@ model: Shark 9 os_family: Android browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Linux; Android 11; Concord_M20) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.64 Mobile Safari/537.36 Instabridge/22' + os: + name: Android + version: "11" + platform: "" + client: + type: mobile app + name: Instabridge + version: "22" + device: + type: smartphone + brand: Concord + model: M20 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; Movic F4501) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Mobile Safari/537.36 + os: + name: Android + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 70.0.3538.110 + engine: Blink + engine_version: 70.0.3538.110 + device: + type: smartphone + brand: Movic + model: F4501 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 13; Premier Pro Build/TP1A.220624.014) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.6099.230 Mobile Safari/537.36 + os: + name: Android + version: "13" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 120.0.6099.230 + engine: Blink + engine_version: 120.0.6099.230 + device: + type: smartphone + brand: UnoPhone + model: Premier Pro + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 8.0; Pixel 2 Build/OPD3.170816.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.3997.1011 Mobile Safari/537.36 + os: + name: Android + version: "8.0" + platform: "" + client: + type: browser + name: Chrome Mobile + version: 57.0.3997.1011 + engine: Blink + engine_version: 57.0.3997.1011 + device: + type: smartphone + brand: Google + model: Pixel 2 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 9.0; Mione Q11 Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/103.0.5060.71 Mobile Safari/537.36 OPR/63.0.2254.62069 + os: + name: Android + version: "9.0" + platform: "" + client: + type: browser + name: Opera Mobile + version: 63.0.2254.62069 + engine: Blink + engine_version: 103.0.5060.71 + device: + type: smartphone + brand: Mione + model: Q11 + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; U; Android 9.0; mione Q1 Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/60.0.3112.78 Mobile Safari/537.36 OPR/65.1.2254.63284 + os: + name: Android + version: "9.0" + platform: "" + client: + type: browser + name: Opera Mobile + version: 65.1.2254.63284 + engine: Blink + engine_version: 60.0.3112.78 + device: + type: smartphone + brand: Mione + model: Q1 + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; Viewphone Q5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.74 Mobile Safari/537.36 + os: + name: Android + version: 5.1.1 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 95.0.4638.74 + engine: Blink + engine_version: 95.0.4638.74 + device: + type: smartphone + brand: ViewSonic + model: ViewPhone Q5 + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/smartphone-8.yml b/Tests/fixtures/smartphone-8.yml index 9391c82c3a..be13b12247 100644 --- a/Tests/fixtures/smartphone-8.yml +++ b/Tests/fixtures/smartphone-8.yml @@ -8821,42 +8821,6 @@ model: Earth 2 os_family: Android browser_family: Chrome -- - user_agent: Mozilla/5.0 (Mobile; LYF/F30C/LYF_F30C-000-09-10-140318; Android; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.0 - os: - name: KaiOS - version: "2.0" - platform: "" - client: - type: browser - name: Firefox Mobile - version: "48.0" - engine: Gecko - engine_version: "48.0" - device: - type: smartphone - brand: LYF - model: F30C - os_family: Firefox OS - browser_family: Firefox -- - user_agent: Mozilla/5.0 (Mobile; LYF/F90M/LYF-F90M-000-02-28-130318; Android; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.0 - os: - name: KaiOS - version: "2.0" - platform: "" - client: - type: browser - name: Firefox Mobile - version: "48.0" - engine: Gecko - engine_version: "48.0" - device: - type: smartphone - brand: LYF - model: F90M - os_family: Firefox OS - browser_family: Firefox - user_agent: Mozilla/5.0 (Linux; Android 5.1; LS-4004 Build/LMY47D; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/55.0.2883.91 Mobile Safari/537.36 os: @@ -9019,24 +8983,6 @@ model: Next os_family: Android browser_family: Opera -- - user_agent: Mozilla/5.0 (Mobile; ALCATEL4044T; rv:37.0) Gecko/37.0 Firefox/37.0 KaiOS/1.0 - os: - name: KaiOS - version: "1.0" - platform: "" - client: - type: browser - name: Firefox Mobile - version: "37.0" - engine: Gecko - engine_version: "37.0" - device: - type: smartphone - brand: Alcatel - model: Go Flip - os_family: Firefox OS - browser_family: Firefox - user_agent: Dalvik/2.1.0 (Linux; U; Android 6.0; Dash G Build/MRA58K) os: diff --git a/Tests/fixtures/smartphone-9.yml b/Tests/fixtures/smartphone-9.yml index ba30dab786..d111be6a14 100644 --- a/Tests/fixtures/smartphone-9.yml +++ b/Tests/fixtures/smartphone-9.yml @@ -89,24 +89,6 @@ model: Flame LS-4503 os_family: Android browser_family: Chrome -- - user_agent: Mozilla/5.0 (Mobile; LYF/LF-2403N/LYF-LF2403N-000-01-38-151217;Android; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.0 - os: - name: KaiOS - version: "2.0" - platform: "" - client: - type: browser - name: Firefox Mobile - version: "48.0" - engine: Gecko - engine_version: "48.0" - device: - type: smartphone - brand: LYF - model: LF-2403N - os_family: Firefox OS - browser_family: Firefox - user_agent: Mozilla/5.0 (Linux; Android 5.1.1; LS-5002 Build/LMY47V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.91 Mobile Safari/537.36 os: diff --git a/Tests/fixtures/tablet-12.yml b/Tests/fixtures/tablet-12.yml index 27fef4ebb3..c9dc8de67f 100644 --- a/Tests/fixtures/tablet-12.yml +++ b/Tests/fixtures/tablet-12.yml @@ -1439,3 +1439,21 @@ model: Tab M10 os_family: Android browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; neocore_E1R1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36 + os: + name: Android + version: "7.0" + platform: "" + client: + type: browser + name: Chrome + version: 103.0.0.0 + engine: Blink + engine_version: 103.0.0.0 + device: + type: tablet + brand: neoCore + model: E1 R1 + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index e22057c437..56002340b3 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -7284,3 +7284,21 @@ model: V78 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.143 Safari/537.36 OPR/40.0.2207.0 OMI/4.9.0.237.DOM3-OPT.235 Model/Vestel-MB130 VSTVB MB100 HbbTV/1.2.1 (; JVC; MB130; 3.62.35.2; _TV_G10_2017;) SmartTvA/3.0.0 + os: + name: GNU/Linux + version: "" + platform: ARM + client: + type: browser + name: Opera Devices + version: 4.9.0.237 + engine: Blink + engine_version: 53.0.2785.143 + device: + type: tv + brand: JVC + model: Smart TV (2017) + os_family: GNU/Linux + browser_family: Opera diff --git a/regexes/client/mobile_apps.yml b/regexes/client/mobile_apps.yml index a9781c5b97..59ed32c9dc 100644 --- a/regexes/client/mobile_apps.yml +++ b/regexes/client/mobile_apps.yml @@ -181,6 +181,9 @@ - regex: 'com\.google\.android\.youtube(?:/([\d.]+))?' name: 'YouTube' version: '$1' +- regex: 'YouTube/([\d.]+)[JK]' + name: 'YouTube' + version: '$1' # Rutube - regex: 'Rutube(?:TV)?BlackAndroid' diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index d208b97720..4350cdfc38 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -602,8 +602,10 @@ Nokia: model: '$1 Classic' - regex: 'Nokia ?([0-9]{4})s(?:-)?' model: '$1 Slide' - - regex: 'Nokia ?([0-9]{4}) V Flip' + - regex: 'Nokia[ _]?([0-9]{4})[ _]?Flip' model: '$1 Flip' + - regex: 'Nokia[ _]?([0-9]{4})[ _]?V[ _]?Flip' + model: '$1 V Flip' - regex: 'Nokia ?([0-9]{4})' model: '$1' - regex: '(?: )?Nokia([235][0-9]{2})(?: Build|[_);/])' @@ -2236,7 +2238,7 @@ Acer: # Advan or advan digital (https://www.advan.id/) Advan: - regex: '(?:ADVAN (?:M4|S40|T5C)|i7U|S45E|S50H|I7D|i55[KD]|i4U|S7D|S4Z|i5[KE]|S5E[ _]NXT|S5J\+|S4\+|1011|E1C_3G|ADVANNASAPro)(?:[);/ ]|$)| (?:E1C Pro|5505|5202|50(?:[46]1|5[89]|62)|600[234]|6[25]01|Android [56](?:[\d.]*);(?: [\w-]+;)? (?:i5C|i7A)|i5G|E1C 3G)(?: Build|[;)])' + regex: '(?:ADVAN (?:M4|S40|T5C|1011)|i7U|S45E|S50H|I7D|i55[KD]|i4U|S7D|S4Z|i5[KE]|S5E[ _]NXT|S5J\+|S4\+|E1C_3G|ADVANNASAPro)(?:[);/ ]|$)| (?:E1C Pro|5505|5202|50(?:[46]1|5[89]|62)|600[234]|6[25]01|Android [56](?:[\d.]*);(?: [\w-]+;)? (?:i5C|i7A)|i5G|E1C 3G)(?: Build|[;)])' device: 'smartphone' models: - regex: 'ADVAN M4' @@ -2436,9 +2438,36 @@ Arian Space: # Alcatel (alcatelmobile.com) Alcatel: - regex: 'Alcatel|Alc(?!or )[a-z0-9]+|One[ _]?Touch|idol[3X]|TIMXL|(?:(?:4003[AJ]|4009[ADEFIKMSX]|4013[DEJKMX]|4014[ADEKMX]|4015[ADNTX]|4016[ADX]|4017[ADEFSX]|4018[ADEFMX]|4024[DEX]|4027[ADNX]|4028[AEJS]|4032[ADEX]|4034[ADEFGLTX]|4035[ADXY]|4045[ADELX]|4047[ADFGNX]|4049[DEGMX]|4060[SW]|4063[FT]|4065F|4087U|4114E|5001[ADJTU]|5002[ABDEFHJLMRSUWX]|5003[ADGUX]|5006[ADG]|5007[AGUOS]|5008[ADTUY]|5009[AD]|5010[DEGSUX]|5011A|5012[DFG]|5015[ADEX]|5016[AJX]|5017[ABDEOX]|5019D|5022[DEX]|5023[EF]|5024[ADFIJ]|5025[DEG]|5026[ADJ]|5027B|5028[ADY]|5029[ADEFY]|5030[ADEFJMU]|5031[ADGJ]|5032[OW]|5033(?:[DFTXY]R|[EFM]P|[ADEFGJMOQSTXY])|5034D|5036D|5038[ADEX]|5039[DY]|5041[CD]|5042[ADEFGTWX]|5044[ADGIKOPSTY]|5045[ADFGIJTXY]|5046[ADGIJSTUY]|5047[DIUY]|5048[AIUY]|5049[EGSWZ]|5050[ASXY]|5051[ADEJMTWX]|5052[ADY]|5053[ADKY]|5054[ADNSTWX]|5056[ADEGIJMNTUWX]|5057M|5058[AIJY]|5059[ADIJSTXYZ]|5060[ADJ]|5061[AKU]|5065[ADNWX]|5070D|5080[ADFQUX]|5085[ABCDGHIJNOQY]|5086[ADY]|5090[AIY]|5095[IKY]|5098[OS]|5099[ADIUY]|5116J|5131E|5145A|6002[ADJ]|6016[ADEX]|6025[ADH]|6027A|6036[AXY]|6037[BKY]|6039[AHJKSY]|6042D|6043[AD]|6044D|6045[BFIKOXY]|6050[AFY]|6055[ABDHIKPUYZ]|6056[ADH]|6058[ADX]|6060[SXC]|6062W|6065A|6070K|7040[ADEFKRT]|7041[DX]|7042A|7043[AEKY]|7044[AX]|7045Y|7048[ASWX]|7053D|7055A|7070X|7071[ADX]|8030Y|8050[DEGX]|8063|8088[MQX]|8094[MTX]|9001[DIX]|9002X|9003[AX]|9005X|9006W|9007[ATX]|9008[ADIJNTUX]|9009[AFG]|9010X|9013[ATX]|9015B|9020A|9022X|9024[OW]|9025Q|9026X|9027[FQTWX]|9029[ZW]|9032[TWXZ]|9203A|9309X|A(?:46[46]BG|57[04]BL|576CC|621BL|50[13]DL|57[17]VL)|I213|I216[AX]|(?