Skip to content

Commit 97f3c8e

Browse files
Improves version detection for Fire OS from client hints (#7884)
1 parent 727ac23 commit 97f3c8e

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

Parser/OperatingSystem.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -426,11 +426,11 @@ public function parse(): ?array
426426
$version = $osFromUserAgent['version'];
427427
}
428428

429-
if ('Fire OS' === $osFromUserAgent['name']) {
430-
$majorVersion = (int) (\explode('.', $version, 1)[0] ?? '0');
429+
if ('Fire OS' === $name && !empty($osFromClientHints['version'])) {
430+
$majorVersion = (int) (\explode('.', $version, 1)[0] ?? '0');
431431

432-
$version = $this->fireOsVersionMapping[$version]
433-
?? $this->fireOsVersionMapping[$majorVersion] ?? '';
432+
$version = $this->fireOsVersionMapping[$version]
433+
?? $this->fireOsVersionMapping[$majorVersion] ?? '';
434434
}
435435
}
436436

Tests/Parser/fixtures/oss.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5699,3 +5699,13 @@
56995699
version: "18.2"
57005700
platform: ""
57015701
family: iOS
5702+
-
5703+
user_agent: Mozilla/5.0 (Linux; Android 11; AFTT) AppleWebKit/537.36 (KHTML, like Gecko) Silk/122.3.1 like Chrome/122.0.6261.160 Safari/537.36
5704+
os:
5705+
name: Fire OS
5706+
short_name: FIR
5707+
version: "8"
5708+
platform: ""
5709+
family: Android
5710+
headers:
5711+
Sec-CH-UA-Platform: Android

0 commit comments

Comments
 (0)