From 956d7f37ceae682edba4867a13b3f455e31cf946 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sat, 28 Dec 2024 17:45:33 +0100 Subject: [PATCH 01/51] Adds detection for Concord M20 --- Tests/fixtures/smartphone-41.yml | 16 ++++++++++++++++ regexes/device/mobiles.yml | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Tests/fixtures/smartphone-41.yml b/Tests/fixtures/smartphone-41.yml index f3f7339471..63013b1c25 100644 --- a/Tests/fixtures/smartphone-41.yml +++ b/Tests/fixtures/smartphone-41.yml @@ -4532,3 +4532,19 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index d208b97720..f8028f616e 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -7053,8 +7053,8 @@ Concord: regex: 'Concord[ _-]|(?:Flyfix 6|C-721|Plus-7_C777|Plus_M19_C779|Plus-9_C778|Dream_Edition_C-754)(?:[);/ ]|$)' device: 'smartphone' models: - - regex: 'M10' - model: 'M10' + - regex: 'Concord[ _-](M[12]0)' + model: '$1' - regex: 'Flyfix 6' model: 'Flyfix 6' - regex: 'C-721' From 79630067b8ae4b123a830e6d3f6b87f221f56d62 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sat, 28 Dec 2024 17:48:36 +0100 Subject: [PATCH 02/51] Adds detection for neoCore E1 R1 --- Tests/fixtures/tablet-12.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 2 ++ 2 files changed, 20 insertions(+) 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/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index f8028f616e..43e8d01c59 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -38147,6 +38147,8 @@ neoCore: model: 'N1 G1' - regex: 'neocore E1-2(?:[);/ ]|$)' model: 'E1+' + - regex: 'neocore_E1R1(?:[);/ ]|$)' + model: 'E1 R1' - regex: 'NEOCORE_E2(?:[);/ ]|$)' model: 'E2' From 8069ee50719b5b6ebac04ab62eb2561932a8d518 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sat, 28 Dec 2024 17:51:23 +0100 Subject: [PATCH 03/51] Adds detection for Movic F4501 --- Tests/fixtures/smartphone-41.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Tests/fixtures/smartphone-41.yml b/Tests/fixtures/smartphone-41.yml index 63013b1c25..9872cb5639 100644 --- a/Tests/fixtures/smartphone-41.yml +++ b/Tests/fixtures/smartphone-41.yml @@ -4548,3 +4548,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 43e8d01c59..9ebff8fe93 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -18397,8 +18397,8 @@ Movic: model: 'K$1' - regex: 'MOVIC[ -]W([2345])' model: 'W$1' - - regex: 'F4502' - model: 'F4502' + - regex: '(F450[12])' + model: '$1' # Movitel Movitel: From 1e81e8d6a671929e8711bee44b69a0c2dba30b49 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sat, 28 Dec 2024 17:53:33 +0100 Subject: [PATCH 04/51] Improves detection for JVC --- Tests/fixtures/tv-4.yml | 18 ++++++++++++++++++ regexes/device/televisions.yml | 2 ++ 2 files changed, 20 insertions(+) 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/device/televisions.yml b/regexes/device/televisions.yml index 7f24772fdb..b20023289f 100644 --- a/regexes/device/televisions.yml +++ b/regexes/device/televisions.yml @@ -467,6 +467,8 @@ JVC: models: - regex: 'AFTSO001' model: '4K (2019)' + - regex: '_TV_[A-Z0-9]+_([0-9]{4});' + model: 'Smart TV ($1)' # Kalley Kalley: From 09cfb7c1ba895f12e23a27acc3d0f09666ce97ea Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sat, 28 Dec 2024 17:58:58 +0100 Subject: [PATCH 05/51] Adds detection for Crosscall Core-S4 --- Tests/fixtures/feature_phone.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 3 +++ 2 files changed, 21 insertions(+) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index f317f0cfd8..bdda14cce4 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -1804,3 +1804,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 9ebff8fe93..3a25f852f8 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -6747,6 +6747,9 @@ Crosscall: model: 'Action-X3 Pro' - regex: 'Action-X([35])(?:[);/ ]|$)' model: 'Action-X$1' + - regex: 'Crosscall_Core-S4_4G(?:[);/ ]|$)' + device: 'feature phone' + model: 'Core-S4' - regex: 'Core-(M4) GO(?:[);/ ]|$)' model: 'Core-$1 Go' - regex: 'Core-(M[45]|X[345]|Z5)(?:[);/ ]|$)' From 31e4cafde901aa96ca78ac14e666281c275e1fbf Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sat, 28 Dec 2024 18:23:27 +0100 Subject: [PATCH 06/51] Improves detection for feature phones --- DeviceDetector.php | 9 ++- Tests/fixtures/feature_phone.yml | 126 +++++++++++++++++++++++++++++++ Tests/fixtures/podcasting.yml | 6 +- Tests/fixtures/smartphone-29.yml | 18 ----- Tests/fixtures/smartphone-3.yml | 18 ----- Tests/fixtures/smartphone-40.yml | 18 ----- Tests/fixtures/smartphone-8.yml | 54 ------------- Tests/fixtures/smartphone-9.yml | 18 ----- 8 files changed, 137 insertions(+), 130 deletions(-) diff --git a/DeviceDetector.php b/DeviceDetector.php index 89eec3f351..86478cdc83 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 smartphones running KaiOS are more likely features phones + */ + if ('KaiOS' === $osName && AbstractDeviceParser::DEVICE_TYPE_SMARTPHONE === $this->device) { + $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/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index bdda14cce4..4ad2a39f7a 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -1822,3 +1822,129 @@ 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 diff --git a/Tests/fixtures/podcasting.yml b/Tests/fixtures/podcasting.yml index 609532d9bc..a6b8f37382 100644 --- a/Tests/fixtures/podcasting.yml +++ b/Tests/fixtures/podcasting.yml @@ -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,7 +6052,7 @@ name: PodLP version: 2.2.1 device: - type: smartphone + type: feature phone brand: Nokia model: 2720 Flip os_family: Firefox OS 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-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: From 6959d6e882db181e68e144c71cb172941ef4ec46 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sat, 28 Dec 2024 18:24:44 +0100 Subject: [PATCH 07/51] Adds detection for AT&T Cingular Flex --- Tests/fixtures/feature_phone.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 8 +++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 4ad2a39f7a..44d745f000 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -1948,3 +1948,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 3a25f852f8..e06b3a19e8 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -33167,16 +33167,18 @@ Tone: # AT&T AT&T: - regex: '(?:EA1002|EA21100[125]|EABF22206A|U(?:202|304|31[89]|328|626|668|6080|705)AA|QS5509A|V340U|V350U|WTATTRW2|SL112A)(?:[);/ ]|$)' + regex: 'ATT_|(?:EA1002|EA21100[125]|EABF22206A|U(?:202|304|31[89]|328|626|668|6080|705)AA|QS5509A|V340U|V350U|WTATTRW2|SL112A)(?:[);/ ]|$)' device: 'smartphone' models: + - regex: '(?:ATT_)?EA211101(?:[);/ ]|$)' + model: 'Cingular Flex' - regex: 'EA211005' model: 'Fusion 5G' - regex: 'U304AA(?:[);/ ]|$)' model: 'Radiant Core' - regex: 'U705AA(?:[);/ ]|$)' model: 'Radiant Max' - - regex: 'EA211001(?:[);/ ]|$)' + - regex: 'EA211001' model: 'Radiant Max 5G' - regex: 'QS5509A(?:[);/ ]|$)' model: 'Axia' @@ -33194,7 +33196,7 @@ AT&T: model: 'Maestro Plus' - regex: 'U626AA(?:[);/ ]|$)' model: 'Maestro 3' - - regex: 'EA211002(?:[);/ ]|$)' + - regex: 'EA211002' model: 'Motivate 2' - regex: 'EABF22206A(?:[);/ ]|$)' model: 'Motivate 3' From 3956a83f3aea39f7bacef3107377756e6d2bc3c4 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sat, 28 Dec 2024 18:35:21 +0100 Subject: [PATCH 08/51] Adds detection for UnoPhone Premier Pro ref #7957 --- Tests/fixtures/smartphone-41.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/smartphone-41.yml b/Tests/fixtures/smartphone-41.yml index 9872cb5639..915b3a2125 100644 --- a/Tests/fixtures/smartphone-41.yml +++ b/Tests/fixtures/smartphone-41.yml @@ -4566,3 +4566,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index e06b3a19e8..0d9722d669 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -23745,13 +23745,15 @@ Visual Land: # UnoPhone UnoPhone: - regex: '(?:Premier5Max|Premier5)(?:[);/ ]|$)' + regex: '(?:Premier5Max|Premier5|Premier Pro)(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'Premier5Max' model: 'Premier 5 Max' - regex: 'Premier5' model: 'Premier 5' + - regex: 'Premier Pro' + model: 'Premier Pro' # Sky or Sky Devices or SKY EVO (skydevices.com) Sky: From 2ad7a71cf2c090dcbad25e59dc535310ee88a6be Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sat, 28 Dec 2024 19:54:24 +0100 Subject: [PATCH 09/51] Improves detection for Advan --- Tests/fixtures/smartphone-41.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/smartphone-41.yml b/Tests/fixtures/smartphone-41.yml index 915b3a2125..913667b618 100644 --- a/Tests/fixtures/smartphone-41.yml +++ b/Tests/fixtures/smartphone-41.yml @@ -4584,3 +4584,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 0d9722d669..7f3021eeb3 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -2236,7 +2236,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' From 934fa2d45a2d5b7db51e99d24daa11bcdedb9641 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sat, 28 Dec 2024 19:57:15 +0100 Subject: [PATCH 10/51] Improves detection for Amazon Echo Show 8 --- Tests/fixtures/smart_speaker.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/smart_speaker.yml b/Tests/fixtures/smart_speaker.yml index 639d7f6f56..e758f20386 100644 --- a/Tests/fixtures/smart_speaker.yml +++ b/Tests/fixtures/smart_speaker.yml @@ -347,3 +347,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 7f3021eeb3..ca0e44e447 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -25606,7 +25606,7 @@ Amazon: - regex: 'AEOBP(?:[);/ ]|$)' model: 'Echo Show (Gen 2)' device: 'smart speaker' - - regex: 'AEOC[HW](?:[);/ ]|$)' + - regex: '(?:AEOC[HW]|AEORH)(?:[);/ ]|$)' model: 'Echo Show 8' device: 'smart speaker' - regex: 'AEOHY(?:[);/ ]|$)' From 8ec79d53ec0b8e00938b95637dac6fb207bba3f5 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sat, 28 Dec 2024 20:00:35 +0100 Subject: [PATCH 11/51] Improves detection for Amazon Echo Show 5 --- Tests/fixtures/smart_speaker.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 3 +++ 2 files changed, 21 insertions(+) diff --git a/Tests/fixtures/smart_speaker.yml b/Tests/fixtures/smart_speaker.yml index e758f20386..ee39c4abf9 100644 --- a/Tests/fixtures/smart_speaker.yml +++ b/Tests/fixtures/smart_speaker.yml @@ -365,3 +365,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index ca0e44e447..34ab1d84a1 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -25606,6 +25606,9 @@ Amazon: - regex: 'AEOBP(?:[);/ ]|$)' model: 'Echo Show (Gen 2)' device: 'smart speaker' + - regex: 'AEOHP(?:[);/ ]|$)' + model: 'Echo Show 5' + device: 'smart speaker' - regex: '(?:AEOC[HW]|AEORH)(?:[);/ ]|$)' model: 'Echo Show 8' device: 'smart speaker' From 2f8bde62f61f9a84c318a53e5d707b391bc7cc85 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sat, 28 Dec 2024 20:03:08 +0100 Subject: [PATCH 12/51] Improves detection for Amazon Echo Show 5 --- Tests/fixtures/smart_speaker.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/smart_speaker.yml b/Tests/fixtures/smart_speaker.yml index ee39c4abf9..7c5d70615f 100644 --- a/Tests/fixtures/smart_speaker.yml +++ b/Tests/fixtures/smart_speaker.yml @@ -383,3 +383,21 @@ 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/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 34ab1d84a1..4efa6c5b35 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -25455,7 +25455,7 @@ Amazon Basics: # Kindle Amazon: - regex: '(?:smarttv_)?(?:AFT[ABMNRST]|AFTSSS?|AFTANNA0|AFTGAZL|AFTMM|AFTK(?:A|M|RT)|AFTTI43|AFTTIFF43|AFTHA001|AFTKA(?:DE|UK)?00[12]|SD4930UR|AEO(?:AT|B[CP]|C[HNW]|HY|KN|TA)|KF(?:OT|ONWI|TT|JWI|JWA|[DFS]OWI|A[PRSU]WI|T[BH]WI|TRP?WI|SAW[IA]|GIWI|[KMR]AWI|MEWI|[MSTQ]UWI|SNWI|RAPWI))(?:[);/ _]|$)|Kindle|AlexaMediaPlayer|Amazon (?:Tate|Jem)|Silk/\d+\.\d+|Echo/1|.+FIRETVSTICK|Amazon;Echo' + regex: '(?:smarttv_)?(?:AFT[ABMNRST]|AFTSSS?|AFTANNA0|AFTGAZL|AFTMM|AFTK(?:A|M|RT)|AFTTI43|AFTTIFF43|AFTHA001|AFTKA(?:DE|UK)?00[12]|SD4930UR|AEO(?:AT|B[CP]|C[HNW]|H[PY]|KN||RH|TA)|KF(?:OT|ONWI|TT|JWI|JWA|[DFS]OWI|A[PRSU]WI|T[BH]WI|TRP?WI|SAW[IA]|GIWI|[KMR]AWI|MEWI|[MSTQ]UWI|SNWI|RAPWI))(?:[);/ _]|$)|Kindle|AlexaMediaPlayer|Amazon (?:Tate|Jem)|Silk/\d+\.\d+|Echo/1|.+FIRETVSTICK|Amazon;Echo' device: 'tablet' models: - regex: '(?:smarttv_)?AFTA(?:[);/ _]|$)' From 8b80d14bcf6ef251c791f637458f01777dec4ea6 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sat, 28 Dec 2024 20:08:35 +0100 Subject: [PATCH 13/51] Improves detection for Mione devices --- Tests/fixtures/smartphone-41.yml | 36 ++++++++++++++++++++++++++++++++ regexes/device/mobiles.yml | 6 +++++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/smartphone-41.yml b/Tests/fixtures/smartphone-41.yml index 913667b618..b67ed00a31 100644 --- a/Tests/fixtures/smartphone-41.yml +++ b/Tests/fixtures/smartphone-41.yml @@ -4602,3 +4602,39 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 4efa6c5b35..517dcd2241 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -17423,7 +17423,7 @@ Mecer: - regex: 'MF716' model: 'Xpress Smartlife M716' -# Mione +# Mione or MiOne (https://mione.ug/) Mione: regex: 'Mione[_ ]' device: 'smartphone' @@ -17444,6 +17444,10 @@ Mione: model: 'Pro+' - regex: 'Mione[_ ]N10pro(?:[);/ ]|$)' model: 'N10 Pro' + - regex: 'Mione[_ ]Q1(?:[);/ ]|$)' + model: 'Q1' + - regex: 'Mione[_ ]Q11(?:[);/ ]|$)' + model: 'Q11' # mio Mio: From 99e9bbfb349b5ba13b50a4a9b90e72afda0c9f86 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sat, 28 Dec 2024 20:11:51 +0100 Subject: [PATCH 14/51] Improves detection for ViewSonic ViewPhone Q5 --- Tests/fixtures/smartphone-41.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/smartphone-41.yml b/Tests/fixtures/smartphone-41.yml index b67ed00a31..ea825bf776 100644 --- a/Tests/fixtures/smartphone-41.yml +++ b/Tests/fixtures/smartphone-41.yml @@ -4638,3 +4638,21 @@ 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/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 517dcd2241..fae23caaef 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -27192,7 +27192,7 @@ ViewSonic: - regex: 'ViewSonic A8\+(?:[);/ ]|$)' model: 'A8 Plus' device: 'smartphone' - - regex: '(?:ViewSonic-)?ViewPhone ?([^;/]+) Build' + - regex: '(?:ViewSonic-)?ViewPhone ?([^;/]+)(?: Build|[;)])' model: 'ViewPhone $1' device: 'smartphone' - regex: 'vsi7q_1' From 133fa4057bbf0b6dd56b97820ad4d404c960e0a0 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sat, 28 Dec 2024 20:23:54 +0100 Subject: [PATCH 15/51] Improves detection for Nokia devices --- Tests/fixtures/feature_phone.yml | 36 ++++++++++++++++++++++++++++++++ Tests/fixtures/podcasting.yml | 2 +- regexes/device/mobiles.yml | 4 +++- 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 44d745f000..270f130a98 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -1966,3 +1966,39 @@ 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 diff --git a/Tests/fixtures/podcasting.yml b/Tests/fixtures/podcasting.yml index a6b8f37382..ce65275f82 100644 --- a/Tests/fixtures/podcasting.yml +++ b/Tests/fixtures/podcasting.yml @@ -6054,7 +6054,7 @@ device: type: feature phone brand: Nokia - model: 2720 Flip + model: 2720 V Flip os_family: Firefox OS browser_family: Unknown - diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index fae23caaef..c74f2ad16d 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|[_);/])' From 5666bf81fa040a166708d93d398b484db5d5f0ad Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sat, 28 Dec 2024 20:24:17 +0100 Subject: [PATCH 16/51] Fix regex --- regexes/device/mobiles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index c74f2ad16d..f896d44e88 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -25461,7 +25461,7 @@ Amazon Basics: # Kindle Amazon: - regex: '(?:smarttv_)?(?:AFT[ABMNRST]|AFTSSS?|AFTANNA0|AFTGAZL|AFTMM|AFTK(?:A|M|RT)|AFTTI43|AFTTIFF43|AFTHA001|AFTKA(?:DE|UK)?00[12]|SD4930UR|AEO(?:AT|B[CP]|C[HNW]|H[PY]|KN||RH|TA)|KF(?:OT|ONWI|TT|JWI|JWA|[DFS]OWI|A[PRSU]WI|T[BH]WI|TRP?WI|SAW[IA]|GIWI|[KMR]AWI|MEWI|[MSTQ]UWI|SNWI|RAPWI))(?:[);/ _]|$)|Kindle|AlexaMediaPlayer|Amazon (?:Tate|Jem)|Silk/\d+\.\d+|Echo/1|.+FIRETVSTICK|Amazon;Echo' + regex: '(?:smarttv_)?(?:AFT[ABMNRST]|AFTSSS?|AFTANNA0|AFTGAZL|AFTMM|AFTK(?:A|M|RT)|AFTTI43|AFTTIFF43|AFTHA001|AFTKA(?:DE|UK)?00[12]|SD4930UR|AEO(?:AT|B[CP]|C[HNW]|H[PY]|KN|RH|TA)|KF(?:OT|ONWI|TT|JWI|JWA|[DFS]OWI|A[PRSU]WI|T[BH]WI|TRP?WI|SAW[IA]|GIWI|[KMR]AWI|MEWI|[MSTQ]UWI|SNWI|RAPWI))(?:[);/ _]|$)|Kindle|AlexaMediaPlayer|Amazon (?:Tate|Jem)|Silk/\d+\.\d+|Echo/1|.+FIRETVSTICK|Amazon;Echo' device: 'tablet' models: - regex: '(?:smarttv_)?AFTA(?:[);/ _]|$)' From 68f01ca8ed6e9c1feba11e6530d82c0c458796e9 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sat, 28 Dec 2024 22:18:43 +0100 Subject: [PATCH 17/51] Improves detection for feature phones --- DeviceDetector.php | 2 +- Tests/fixtures/podcasting.yml | 4 ++-- regexes/oss.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DeviceDetector.php b/DeviceDetector.php index 86478cdc83..403db9b3bb 100644 --- a/DeviceDetector.php +++ b/DeviceDetector.php @@ -1026,7 +1026,7 @@ protected function parseDevice(): void /** * All smartphones running KaiOS are more likely features phones */ - if ('KaiOS' === $osName && AbstractDeviceParser::DEVICE_TYPE_SMARTPHONE === $this->device) { + if ('KaiOS' === $osName) { $this->device = AbstractDeviceParser::DEVICE_TYPE_FEATURE_PHONE; } diff --git a/Tests/fixtures/podcasting.yml b/Tests/fixtures/podcasting.yml index ce65275f82..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 diff --git a/regexes/oss.yml b/regexes/oss.yml index 46af8a8c5b..d0441e8fdc 100644 --- a/regexes/oss.yml +++ b/regexes/oss.yml @@ -546,7 +546,7 @@ version: '10' ########## -# KaiOS +# KaiOS (https://www.kaiostech.com/) ########## - regex: 'KAIOS(?:/(\d+[.\d]+))?' name: 'KaiOS' From 859c0d2ca04b3b89a6cf24de8d99228a8ac7abbc Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sat, 28 Dec 2024 22:25:11 +0100 Subject: [PATCH 18/51] Adds detection for Alcatel 3088 --- Tests/fixtures/feature_phone.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 5 ++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 270f130a98..b797dd40bd 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2002,3 +2002,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index f896d44e88..6074af8e18 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -2438,9 +2438,12 @@ 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]|(? Date: Sat, 28 Dec 2024 22:35:03 +0100 Subject: [PATCH 19/51] Improves detection for Alcatel devices --- Tests/fixtures/feature_phone.yml | 126 +++++++++++++++++++++++++++++++ regexes/device/mobiles.yml | 11 ++- 2 files changed, 136 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index b797dd40bd..04f2f3b1f2 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2020,3 +2020,129 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 6074af8e18..f89f3d5bee 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -2438,12 +2438,21 @@ Arian Space: # Alcatel (alcatelmobile.com) Alcatel: - regex: 'Alcatel|Alc(?!or )[a-z0-9]+|One[ _]?Touch|idol[3X]|TIMXL|(?:(?:3088X|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]|(? Date: Sat, 28 Dec 2024 22:38:49 +0100 Subject: [PATCH 20/51] Adds detection for Alcatel MyFlip 2 --- Tests/fixtures/feature_phone.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 5 ++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 04f2f3b1f2..6e4dd46783 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2146,3 +2146,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index f89f3d5bee..f752e8d77d 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -2438,7 +2438,7 @@ Arian Space: # Alcatel (alcatelmobile.com) Alcatel: - regex: 'Alcatel|Alc(?!or )[a-z0-9]+|One[ _]?Touch|idol[3X]|TIMXL|(?:(?:3088X|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]|4052[CORWZ]|4056[WZ]|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]|(? Date: Sat, 28 Dec 2024 22:44:24 +0100 Subject: [PATCH 21/51] Adds detection for Mango Akabuto 4G --- Tests/fixtures/feature_phone.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 11 ++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 6e4dd46783..c521be22d0 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2164,3 +2164,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index f752e8d77d..094e5b9071 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -39930,11 +39930,16 @@ Lumitel: device: 'smartphone' model: '$1' -# Mango +# Mango or Mango 4G (http://www.mango4g.rw/) Mango: - regex: 'Mango[_ ](S5|SQ7)(?:[);/ ]|$)' + regex: 'Mango[_ ](?:AKABUTO_4G|S5|SQ7)(?:[);/ ]|$)' device: 'smartphone' - model: '$1' + models: + - regex: 'Mango_AKABUTO_4G' + device: 'feature phone' + model: 'Akabuto 4G' + - regex: 'Mango[_ ](S5|SQ7)' + model: '$1' # NTT West (www.ntt-west.co.jp) NTT West: From 4d437fa48487fb291f779da05fd76cc74f2d6110 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sat, 28 Dec 2024 22:47:45 +0100 Subject: [PATCH 22/51] Improves detection for AT&T devices --- Tests/fixtures/feature_phone.yml | 36 ++++++++++++++++++++++++++++++++ regexes/device/mobiles.yml | 7 +++++++ 2 files changed, 43 insertions(+) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index c521be22d0..3492e06044 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2182,3 +2182,39 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 094e5b9071..19df255f90 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -33197,7 +33197,14 @@ AT&T: device: 'smartphone' models: - regex: '(?:ATT_)?EA211101(?:[);/ ]|$)' + device: 'feature phone' model: 'Cingular Flex' + - regex: '(?:ATT_)?U1030AA(?:[);/ ]|$)' + device: 'feature phone' + model: 'Cingular Flex 2' + - regex: '(?:ATT_)?U102AA(?:[);/ ]|$)' + device: 'feature phone' + model: 'Cingular Flip IV' - regex: 'EA211005' model: 'Fusion 5G' - regex: 'U304AA(?:[);/ ]|$)' From 8902941ff04f8ba5b6b7a9593e93b37dfc8c1987 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sat, 28 Dec 2024 23:02:54 +0100 Subject: [PATCH 23/51] Improves detection for Alcatel devices --- Tests/fixtures/feature_phone.yml | 54 ++++++++++++++++++++++++++++++++ regexes/device/mobiles.yml | 11 ++++++- 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 3492e06044..6d5c203a1a 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2218,3 +2218,57 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 19df255f90..f0e2524dbe 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -2438,7 +2438,7 @@ Arian Space: # Alcatel (alcatelmobile.com) Alcatel: - regex: 'Alcatel|Alc(?!or )[a-z0-9]+|One[ _]?Touch|idol[3X]|TIMXL|(?:(?:3088X|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]|4052[CORWZ]|4056[WZ]|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(?:406DL|46[46]BG|57[04]BL|576CC|621BL|50[13]DL|57[17]VL)|I213|I216[AX]|(? Date: Sat, 28 Dec 2024 23:07:31 +0100 Subject: [PATCH 24/51] Improves detection for Cricket devices --- Tests/fixtures/feature_phone.yml | 36 ++++++++++++++++++++++++++++++++ regexes/device/mobiles.yml | 8 ++++++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 6d5c203a1a..16633c6bd8 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2272,3 +2272,39 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index f0e2524dbe..357056a2e7 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -6715,9 +6715,15 @@ Cosmote: # Cricket Cricket: - regex: 'Cricket-([a-z0-9]+)|(?:U(?:304|325|380|6080|668|680|705)AC|V350C|EC1002|EC21100[1-4]|SL100EA|SL101AE|WTCKT01|SL112C|SN304AE)(?:[);/ ]|$)' + regex: 'Cricket-([a-z0-9]+)|CKT_|(?:U(?:102|304|325|380|6080|668|680|705|1030)AC|V350C|EC1002|EC21100[1-4]|SL100EA|SL101AE|WTCKT01|SL112C|SN304AE)(?:[);/ ]|$)' device: 'smartphone' models: + - regex: '(?:CKT_)?U102AC' + device: 'feature phone' + model: 'Debut Flip' + - regex: '(?:CKT_)?U1030AC' + device: 'feature phone' + model: 'Debut Flex' - regex: 'SL101AE' model: 'Debut Smart' - regex: 'U6080AC' From a75509daba41f8e6460482832d94275e04aefb52 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sat, 28 Dec 2024 23:15:46 +0100 Subject: [PATCH 25/51] Adds detection for Alcatel MyFlip --- Tests/fixtures/feature_phone.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 5 ++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 16633c6bd8..9aecf9d654 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2308,3 +2308,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 357056a2e7..35747d2255 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -2438,7 +2438,7 @@ Arian Space: # Alcatel (alcatelmobile.com) Alcatel: - regex: 'Alcatel|Alc(?!or )[a-z0-9]+|One[ _]?Touch|idol[3X]|TIMXL|(?:(?:3088X|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]|4044[COV]|4045[ADELX]|4047[ADFGNX]|4049[DEGMX]|4052[CORWZ]|4056[WZ]|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(?:406DL|46[46]BG|57[04]BL|576CC|621BL|50[13]DL|57[17]VL)|I213|I216[AX]|(? Date: Sat, 28 Dec 2024 23:59:49 +0100 Subject: [PATCH 26/51] Adds detection for Doppio Texter --- Tests/fixtures/feature_phone.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 9aecf9d654..d5e7643b7b 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2326,3 +2326,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 35747d2255..09395e76b4 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -7853,11 +7853,13 @@ Dopod: # Doppio Doppio: - regex: 'Doppio ' + regex: 'Doppio[ _]' device: 'smartphone' models: - regex: 'Doppio DP355(?:[);/ ]|$)' model: 'DP355' + - regex: 'Doppio_TEXTER_3G(?:[);/ ]|$)' + model: 'Texter' - regex: 'Doppio ([0-9a-z]+)' model: '$1' From c4ae247025c75bd46560728ca413c837cb940905 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 29 Dec 2024 00:05:42 +0100 Subject: [PATCH 27/51] Adds detection for Blackphone brand --- Parser/Device/AbstractDeviceParser.php | 1 + Tests/fixtures/feature_phone.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 6 ++++++ 3 files changed, 25 insertions(+) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 657ef922e9..b738f3e173 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', diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index d5e7643b7b..86fb252479 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2344,3 +2344,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 09395e76b4..14482d13b6 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -43209,6 +43209,12 @@ Biegedy: device: 'tablet' model: 'B$1' +# Blackphone +Blackphone: + regex: '(?:BLACKPHONE_Blackphone_K330_3G)(?:[);/ ]|$)' + device: 'feature phone' + model: 'K330' + # Blackton (https://blackton.tv) Blackton: regex: 'Bt[_ -](\d{2}FS\d{2}B)(?:[);/ ]|$)' From b23e11204f3df27f06018ad42cccca2ee0f962fc Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 29 Dec 2024 00:13:12 +0100 Subject: [PATCH 28/51] Adds detection for Geo Phone brand --- Parser/Device/AbstractDeviceParser.php | 1 + Tests/fixtures/feature_phone.yml | 54 ++++++++++++++++++++++++++ regexes/device/mobiles.yml | 10 +++++ 3 files changed, 65 insertions(+) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index b738f3e173..8c87b1a8c6 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -691,6 +691,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'GD' => 'Gemini', 'GN' => 'General Mobile', '2G' => 'Genesis', + 'GEP' => 'Geo Phone', 'G2' => 'GEOFOX', 'GE' => 'Geotel', 'Q4' => 'Geotex', diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 86fb252479..5b7306f5dd 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2362,3 +2362,57 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 14482d13b6..22657f56b2 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -34721,6 +34721,16 @@ Starlight: - regex: 'star_plus_plus' model: 'Star++' +# Geo Phone or GeoPhone (https://geophonebd.com/) +Geo Phone: + regex: 'GEO_?PHONE_' + device: 'feature phone' + models: + - regex: 'GEO_?PHONE_(T1[59])_4G(?:[);/ ]|$)' + model: '$1' + - regex: 'GEO_?PHONE_T19I_4G(?:[);/ ]|$)' + model: 'T19i' + # GEOFOX GEOFOX: regex: 'GEOFOX[_ ]MID ?(743\+?)(?:[);/ ]|$)' From f5ad3334b2558557b6abfaeda37bf0abeab99cfe Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 29 Dec 2024 00:23:20 +0100 Subject: [PATCH 29/51] Improves detection for Accent devices --- Tests/fixtures/feature_phone.yml | 54 ++++++++++++++++++++++++++++++++ regexes/device/mobiles.yml | 4 ++- 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 5b7306f5dd..0cbb4d3b4b 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2416,3 +2416,57 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 22657f56b2..b40071493a 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -34225,11 +34225,13 @@ Nos: # Accent (DBM Maroc) (accent.ma) Accent: - regex: '(?:ACCENT[_ ]NEON|FAST7 ?3G|PEARL[_ ]A[24567]|TANK_P55|CAMELEON[_ ](?:C[456]|A1|H2)(?:[_ ]PLUS)?|Speed[- ](?:[AXYM]2|X2\+)|SURF1000|KIDZY70|SPEED_S8)(?:[);/ ]|$)' + regex: 'Accent_|(?:FAST7 ?3G|PEARL[_ ]A[24567]|TANK_P55|CAMELEON[_ ](?:C[456]|A1|H2)(?:[_ ]PLUS)?|Speed[- ](?:[AXYM]2|X2\+)|SURF1000|KIDZY70|SPEED_S8)(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'ACCENT[_ ]NEON(?:[);/ ]|$)' model: 'Neon' + - regex: 'ACCENT[_ ](?:Nubia)?([56]0K)(?:28_512)?(?:[);/ ]|$)' + model: 'Nubia $1' - regex: 'CAMELEON[_ ]C([65])[_ ]PLUS(?:[);/ ]|$)' model: 'Cameleon C$1 Plus' - regex: 'Speed[- _]([AXYM]2|S8)(?:[);/ ]|$)' From 9c290acec9057645133814597b3b01383581e6d6 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 29 Dec 2024 09:59:20 +0100 Subject: [PATCH 30/51] Adds detection for Blu Flex --- Tests/fixtures/feature_phone.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 6 ++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 0cbb4d3b4b..51656cb80f 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2470,3 +2470,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index b40071493a..fe455e3ff8 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -4051,9 +4051,9 @@ GDL: device: 'smartphone' model: '$1' -# Blu +# Blu (https://www.bluproducts.com/B300V) Blu: - regex: 'BLU[ _]|(?:blu|(? Date: Sun, 29 Dec 2024 10:05:19 +0100 Subject: [PATCH 31/51] Improves detection for Blu devices --- Tests/fixtures/feature_phone.yml | 36 ++++++++++++++++++++++++++++++++ regexes/device/mobiles.yml | 4 ++++ 2 files changed, 40 insertions(+) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 51656cb80f..c23af02100 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2488,3 +2488,39 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index fe455e3ff8..b53c8f1282 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -4192,6 +4192,8 @@ Blu: model: 'R$1 Plus' - regex: 'C([456]) 20(19|20)' model: 'C$1 (20$2)' + - regex: '(?:BLU[_ ])?TankMega_3G' + model: 'Tank Mega' - regex: 'Tank Xtreme ([45])\.0' model: 'Tank Xtreme $1.0"' - regex: 'Tank Xtreme Pro' @@ -4224,6 +4226,8 @@ Blu: model: 'Vivo $1' - regex: '(?:BLU[_ ])?VIVO GO' model: 'Vivo Go' + - regex: '(?:BLU[_ ])?ZOEY_SMART' + model: 'Zoey Smart' - regex: '(?:BLU[_ ])?(D600|D5[01]0)' model: '$1' From 1164b90a69ecfb0f7525aff6ac548042ed709d5e Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 29 Dec 2024 10:10:18 +0100 Subject: [PATCH 32/51] Improves detection for Jio devices --- Tests/fixtures/feature_phone.yml | 36 ++++++++++++++++++++++++++++++++ regexes/device/mobiles.yml | 4 +++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index c23af02100..16db8eacb9 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2524,3 +2524,39 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index b53c8f1282..a6e7e8ccb3 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -33698,11 +33698,13 @@ Jinga: # Jio (https://www.jio.com/) Jio: - regex: 'LS1542QWN?(?:[);/ ]|$)' + regex: 'Jio/[^/]+/|LS1542QWN?(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'LS1542QWN?(?:[);/ ]|$)' model: 'JioPhone Next' + - regex: 'Jio/([^/]+)/' + model: '$1' # Twoe Twoe: From a4ce8f5708fd4ed0c8933311814185604d2e9a96 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 29 Dec 2024 10:15:31 +0100 Subject: [PATCH 33/51] Improves detection for Multilaser devices --- Tests/fixtures/feature_phone.yml | 36 ++++++++++++++++++++++++++++++++ regexes/device/mobiles.yml | 4 ++++ 2 files changed, 40 insertions(+) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 16db8eacb9..af47a8ffc4 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2560,3 +2560,39 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index a6e7e8ccb3..01654f91f7 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -32981,6 +32981,10 @@ Multilaser: model: '$1 5G' - regex: 'Multilaser[ _]([FEH])(?:[);/ ]|$)' model: '$1' + - regex: 'Multilaser[ _]ZAPP(?:[);/ ]|$)' + model: 'ZAPP' + - regex: 'Multilaser[ _]ZAPP[ _]II[ _]3G(?:[);/ ]|$)' + model: 'ZAPP II' - regex: 'MS60F_PLUS(?:[);/ ]|$)' model: 'MS60F Plus' - regex: 'MS45S_A6_Senior' From c67978edfddc0e6438887c91626825d47e53f4c1 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 29 Dec 2024 10:18:48 +0100 Subject: [PATCH 34/51] Improves detection for MTN devices --- Tests/fixtures/feature_phone.yml | 36 ++++++++++++++++++++++++++++++++ regexes/device/mobiles.yml | 8 +++++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index af47a8ffc4..b76d08009c 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2596,3 +2596,39 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 01654f91f7..4987e73274 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -18458,9 +18458,9 @@ Movitel: - regex: 'M(\d{4}[AB]?)(?:[);/ ]|$)' model: 'M$1' -# MTN +# MTN (https://www.mtn.com/) MTN: - regex: 'MTN-|(?:Kafit V900|Faith29|Ka ?Chocolate)(?:[);/ ]|$)' + regex: 'MTN-|(?:Kafit V900|Faith29|Ka ?Chocolate|M56[01]M3)(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'Faith29(?:[);/ ]|$)' @@ -18471,6 +18471,10 @@ MTN: model: 'KaFit V900' - regex: 'MTN-(L860|S620)' model: 'Sm@rt Mini $1' + - regex: 'M560M3' + model: 'Smart S' + - regex: 'M561M3' + model: 'Smart T' - regex: 'MTN-8978P' device: 'tablet' model: 'Steppa' From 49f0baea0fc22e9835dbf2ce7be2ce436f75d849 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 29 Dec 2024 10:20:52 +0100 Subject: [PATCH 35/51] Adds detection for Orange Sanza --- Tests/fixtures/feature_phone.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index b76d08009c..7ba320f1ab 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2632,3 +2632,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 4987e73274..a0135c0425 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -20958,7 +20958,7 @@ OPPO: # orange Orange: - regex: 'SPV[ -]?([a-z0-9]+)|(? Date: Sun, 29 Dec 2024 10:22:33 +0100 Subject: [PATCH 36/51] Adds detection for MTN Smart Kamunye --- Tests/fixtures/feature_phone.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 7ba320f1ab..1d640bd0f4 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2650,3 +2650,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index a0135c0425..52cd6b6f75 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -18460,7 +18460,7 @@ Movitel: # MTN (https://www.mtn.com/) MTN: - regex: 'MTN-|(?:Kafit V900|Faith29|Ka ?Chocolate|M56[01]M3)(?:[);/ ]|$)' + regex: 'MTN-|(?:Kafit V900|Faith29|Ka ?Chocolate|M56[01]M3|M571M3)(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'Faith29(?:[);/ ]|$)' @@ -18475,6 +18475,8 @@ MTN: model: 'Smart S' - regex: 'M561M3' model: 'Smart T' + - regex: 'M571M3' + model: 'Smart Kamunye' - regex: 'MTN-8978P' device: 'tablet' model: 'Steppa' From e7d8710b44b7826c6112dd9341857e2e5e625e51 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 29 Dec 2024 10:59:18 +0100 Subject: [PATCH 37/51] Adds detection for RED-X brand --- Parser/Device/AbstractDeviceParser.php | 1 + Tests/fixtures/feature_phone.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 8 ++++++++ 3 files changed, 27 insertions(+) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 8c87b1a8c6..0381ad218c 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1489,6 +1489,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/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 1d640bd0f4..0d7504f3e3 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2668,3 +2668,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 52cd6b6f75..966792c8d4 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -32906,6 +32906,14 @@ RED: device: 'smartphone' model: 'Hydrogen One' +# RED-X (http://red-x.com/) +RED-X: + regex: 'RED_X_' + device: 'smartphone' + models: + - regex: 'RED_X_RX2441_4G(?:[);/ ]|$)' + model: 'RX2441' + # Contixo Contixo: regex: 'Contixo|(?:CX-1045 3G|KT995 3G|CX1045|B108_4G)(?:[);/ ]|$)' From 47b18bec85296ac0cb6f5d84d6690547bf7bd05e Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 29 Dec 2024 11:02:27 +0100 Subject: [PATCH 38/51] Adds detection for Sigma X-Style --- Tests/fixtures/feature_phone.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 2 ++ 2 files changed, 20 insertions(+) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 0d7504f3e3..42e1089867 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2686,3 +2686,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 966792c8d4..a9a92b4b40 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -25056,6 +25056,8 @@ Sigma: regex: 'Sigma(?!Designs)|(X[_-]Style[ _]?Tab[_ ]A(\d+)|Tab_A1025_X-treme|X[-_ ]?treme[-_ ]?(?:PQ[0-9]{2}|PQ18_MAX)|X-Style_(?:S550[12]|S3502)|Tab A1015|Tab A802|Tab_A1010_Neo)(?:[);/ ]|$)' device: 'smartphone' models: + - regex: 'SIGMAMOBILE-S3500-3G(?:[);/ ]|$)' + model: 'X-Style' - regex: '(?:Sigma[ _])?X[-_ ]?treme[-_ ]?PQ([0-9]{2})[_ ]Max(?:[);/ ]|$)' model: 'X-Treme PQ$1 Max' - regex: '(?:Sigma[ _])?X[-_ ]?treme[-_ ]?PQ([0-9]{2})(?:[);/ ]|$)' From e717953f22ab367cb5fe90a37efb1d6287f256d3 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 29 Dec 2024 11:06:11 +0100 Subject: [PATCH 39/51] Adds detection for R3Di brand --- Parser/Device/AbstractDeviceParser.php | 1 + Tests/fixtures/feature_phone.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 6 ++++++ 3 files changed, 25 insertions(+) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 0381ad218c..15ebc23f5e 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1473,6 +1473,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'WJ' => 'Qware', 'QWT' => 'QWATT', 'R2' => 'R-TV', + 'R3D' => 'R3Di', 'RA' => 'Ramos', '0R' => 'Raspberry', 'R9' => 'Ravoz', diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 42e1089867..210283893c 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2704,3 +2704,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index a9a92b4b40..36cc1a6026 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -24980,6 +24980,12 @@ Quipus: - regex: 'TINKU LTE(?:[);/ ]|$)' model: 'Tinku' +# R3Di (https://r3di.com/) +R3Di: + regex: 'R3Di_FR150(?:[);/ ]|$)' + device: 'feature phone' + model: 'FR150' + # Ramos Ramos: regex: 'Ramos ?([^/);]+)(?: Build|[);])|(?:MOS1(?:max)?|W22PRO 3G)(?:[);/ ]|$)' From f2282bfa366019662e1093738237c2f5c3363e16 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 29 Dec 2024 11:09:36 +0100 Subject: [PATCH 40/51] Adds detection for Symphony PD1 4G --- Tests/fixtures/feature_phone.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 2 ++ 2 files changed, 20 insertions(+) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 210283893c..bb8403638a 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2722,3 +2722,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 36cc1a6026..53d92ac290 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -25699,6 +25699,8 @@ Symphony: regex: 'SYMPHONY[ \_]([a-z0-9]+)|(?:(?:roar[ _](?:V20|A50|V78|E80|V150))|innova[123]0|roarV95|ZVIII?|V10[25]|V1[23]0|V128|V14[012]|V1[45]5|SYMTAB\d+| (?:i9[79]|i7[245]|i8[05]|i6[568]|i30|i1[58]|i120|Z30 pro|Z60 plus|[ZR]30|V9[246789]|V75m)|INOVA|Android 7(?:[\d.]*);(?: [\w-]+;)? P11|Android 6.*; (?:V75|i2[015])|EASY_NAV_2|G10\+|helio 30)(?:[);/ ]|$)' device: 'smartphone' models: + - regex: 'Symphony_PD1_4G_4G(?:[);/ ]|$)' + model: 'PD1 4G' - regex: 'ZVIII' model: 'ZVIII' - regex: 'innova([123]0)' From d3e1677f69ce4226ab39601fa6ea7453befdc34d Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 29 Dec 2024 11:24:30 +0100 Subject: [PATCH 41/51] Add test for Bmobile W125K --- Tests/fixtures/feature_phone.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index bb8403638a..50cb0ef3d2 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2740,3 +2740,21 @@ 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 From 34912c1dc2a0adde85f75e5b00fb46dd5351aa9e Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 29 Dec 2024 11:33:15 +0100 Subject: [PATCH 42/51] Improves detection for Digit4G devices --- Tests/fixtures/feature_phone.yml | 162 +++++++++++++++++++++++++++++++ regexes/device/mobiles.yml | 10 +- 2 files changed, 170 insertions(+), 2 deletions(-) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 50cb0ef3d2..5b26dc2efa 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2758,3 +2758,165 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 53d92ac290..4dd624a752 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -7435,9 +7435,9 @@ Digiland: - regex: '(Compumax Blue)' # Compumax model: '$1' -# Digit4G or DIGIT (https://digit4g.com/p) +# Digit4G or DIGIT (https://digit4g.com/) Digit4G: - regex: 'Digit4G|Digit(?:4G|play1|next_Ultra)|DIGIT (?:INFINITY|Glory1)' + regex: 'Digit_|Digit4G|Digit(?:4G|play1|next_Ultra)|DIGIT (?:INFINITY|Glory1)' device: 'smartphone' models: - regex: 'Digitplay1(?:[);/ ]|$)' @@ -7452,6 +7452,12 @@ Digit4G: model: 'Infinity' - regex: 'Energy Max(?:[);/ ]|$)' model: 'Energy Max' + - regex: 'Digit_Digit4G[_-](Bold|Defender|Elite|Music|Power|Shine|Star)_4G(?:[);/ ]|$)' + model: '$1' + - regex: 'Digit_Digit4GLite_4G(?:[);/ ]|$)' + model: 'Lite' + - regex: 'Digit_Digit4GPowerMAX_4G(?:[);/ ]|$)' + model: 'Power Max' - regex: 'Digit4G[ _]E([234])[ _]pro(?:[);/ ]|$)' model: 'E$1 Pro' - regex: 'Digit4G[ -](Energy|Pro)' From 1b76ad4927fa626926a1198cb3df90a62ea79202 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 29 Dec 2024 11:35:52 +0100 Subject: [PATCH 43/51] Improves detection for Orange Sanza --- Tests/fixtures/feature_phone.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 5b26dc2efa..50755e0d5a 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2920,3 +2920,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 4dd624a752..5abd3b0f56 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -20966,7 +20966,7 @@ OPPO: # orange Orange: - regex: 'SPV[ -]?([a-z0-9]+)|(? Date: Sun, 29 Dec 2024 11:41:45 +0100 Subject: [PATCH 44/51] Improves detection for Energizer devices --- Tests/fixtures/feature_phone.yml | 108 +++++++++++++++++++++++++++++++ regexes/device/mobiles.yml | 4 +- 2 files changed, 111 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 50755e0d5a..47a01851bd 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -2938,3 +2938,111 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 5abd3b0f56..24b8ab2cbc 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -8923,7 +8923,7 @@ Ericsson: # Energizer (www.energizeyourdevice.com) Energizer: - regex: 'Energizer[ _](?:Energy|Ultimate|Power Max|Hard ?case)|PowerMax|HARDCASEH5[05]0S|ENERGY[_ ]?(?:[45]00|400S|S[56]00|E12|E5[02]0S?)(?:[_ ](?:LTE|EU))?' + regex: 'Energizer_|Energizer[ _](?:Energy|Ultimate|Power Max|Hard ?case)|PowerMax|HARDCASEH5[05]0S|ENERGY[_ ]?(?:[45]00|400S|S[56]00|E12|E5[02]0S?)(?:[_ ](?:LTE|EU))?' device: 'smartphone' models: - regex: 'Power ?Max ?(P[0-9]+S?)' @@ -8942,6 +8942,8 @@ Energizer: model: 'Hard Case $1' - regex: 'Ultimate 65G' model: 'Ultimate 65G' + - regex: 'Energizer_(E24[12]S|E280S|E282SC|H280A|E241)(?:_(?:4G|512))?(?:[);/ ]|$)' + model: '$1' # eTouch eTouch: From 475644c746ecaff9caec26ef0a3c7e0e176641ee Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 29 Dec 2024 11:47:29 +0100 Subject: [PATCH 45/51] Adds detection for IDC brand --- Parser/Device/AbstractDeviceParser.php | 1 + Tests/fixtures/feature_phone.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 6 ++++++ 3 files changed, 25 insertions(+) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 15ebc23f5e..2452f0503a 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -851,6 +851,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'IC' => 'iDroid', 'IDI' => 'iDino', '6Z' => 'iData', + 'IDC' => 'IDC', 'IG' => 'iGet', 'IHL' => 'iHome Life', 'IH' => 'iHunt', diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 47a01851bd..0a66cac7c5 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -3046,3 +3046,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 24b8ab2cbc..51558d1610 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -38667,6 +38667,12 @@ iDino: device: 'tablet' model: 'Notebook 6' +# IDC (https://www.idc.md/) +IDC: + regex: 'IDC_Voice_20_4G(?:[);/ ]|$)' + device: 'feature phone' + model: 'Voice 20' + # AIDATA AIDATA: regex: '(?:AIDATA ELDE 10 TABLET|ADT_?1061(?:_1)?|ADT1012L)(?:[);/ ]|$)' From 1b3598f2c30a638b5d8d52a73e1f0de1b3219c57 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 29 Dec 2024 11:55:20 +0100 Subject: [PATCH 46/51] Adds detection for free Wi-Kif 4G --- Tests/fixtures/feature_phone.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 9 +++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 0a66cac7c5..c4397352f0 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -3064,3 +3064,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 51558d1610..51911aaa8a 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -42026,9 +42026,14 @@ FOSSiBOT: # free (https://www.free.fr/) free: - regex: '(Freebox Player Mini)(?:[);/ ]|$)' + regex: '(?:Freebox Player Mini|Free_Wi-Kif4G_4G)(?:[);/ ]|$)' device: 'tv' - model: '$1' + models: + - regex: 'Freebox Player Mini' + model: 'Freebox Player Mini' + - regex: 'Free_Wi-Kif4G_4G' + device: 'feature phone' + model: 'Wi-Kif 4G' # Nanho Nanho: From e81df43a4ff78c5f72433481186b728f1c0663e5 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 29 Dec 2024 11:59:16 +0100 Subject: [PATCH 47/51] Improves detection for Telma devices --- Tests/fixtures/feature_phone.yml | 54 ++++++++++++++++++++++++++++++++ regexes/device/mobiles.yml | 6 ++++ 2 files changed, 60 insertions(+) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index c4397352f0..4ebe7dfd00 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -3082,3 +3082,57 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 51911aaa8a..eed77ea91b 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -26674,6 +26674,12 @@ Telma: model: 'Feel' - regex: 'Telma[_ ](F2|Titan[_ ]4G|EGO)' model: '$1' + - regex: 'Telma_Wi-Kif\+3G_3G' + model: 'Wi-Kif+ 3G' + - regex: 'Telma_Wi-Kif\+4G_4G' + model: 'Wi-Kif+ 4G' + - regex: 'Telma_Wikif_Max_4G' + model: 'Wi-Kif Max' # Telpo (https://www.telpo.com.cn/) Telpo: From d3c064a88e72d144fe913dd2a41f5144060ab7de Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 29 Dec 2024 12:15:26 +0100 Subject: [PATCH 48/51] Improves detection for YouTube on KaiOS --- Tests/Parser/Client/fixtures/mobile_app.yml | 12 ++++++++++++ regexes/client/mobile_apps.yml | 3 +++ 2 files changed, 15 insertions(+) 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/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' From 2659d73c74a5c73102f9f882dfdae8adbb4a8c89 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 29 Dec 2024 12:29:48 +0100 Subject: [PATCH 49/51] Adds detection for K-Lite K301 --- Tests/fixtures/feature_phone.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 6 ++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 4ebe7dfd00..725b3608de 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -3136,3 +3136,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index eed77ea91b..ed1726c796 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -16890,11 +16890,13 @@ Konrow: device: 'tablet' model: 'K-Tab 1003' -# K-Lite +# K-Lite (https://navtech.com.sg/house-brands/) K-Lite: - regex: 'NAVTECH_TOUCHY_F2' + regex: '(?:KLT_K301|NAVTECH_TOUCHY_F2)(?:[);/ ]|$)' device: 'smartphone' models: + - regex: 'KLT_K301' + model: 'K301' - regex: 'NAVTECH_TOUCHY_F2' model: 'Navtech Touchy F2' From d3de0bb52373aba32660ef790040721a02ffe6e4 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 29 Dec 2024 12:34:01 +0100 Subject: [PATCH 50/51] Improves detection for Orange devices --- Tests/fixtures/feature_phone.yml | 36 ++++++++++++++++++++++++++++++++ regexes/device/mobiles.yml | 6 +++++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 725b3608de..bbc24d14c7 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -3154,3 +3154,39 @@ 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/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index ed1726c796..4350cdfc38 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -20970,7 +20970,7 @@ OPPO: # orange Orange: - regex: 'SPV[ -]?([a-z0-9]+)|(? Date: Sun, 29 Dec 2024 12:38:10 +0100 Subject: [PATCH 51/51] Fix comment --- DeviceDetector.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DeviceDetector.php b/DeviceDetector.php index 403db9b3bb..4a7a179b87 100644 --- a/DeviceDetector.php +++ b/DeviceDetector.php @@ -1024,7 +1024,7 @@ protected function parseDevice(): void } /** - * All smartphones running KaiOS are more likely features phones + * All devices running KaiOS are more likely features phones */ if ('KaiOS' === $osName) { $this->device = AbstractDeviceParser::DEVICE_TYPE_FEATURE_PHONE;