Skip to content

Commit

Permalink
Improves detection for Aloha Browser family (matomo-org#7850)
Browse files Browse the repository at this point in the history
  • Loading branch information
liviuconcioiu authored Oct 1, 2024
1 parent 789e278 commit 7dc1c2d
Show file tree
Hide file tree
Showing 18 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion Parser/Client/Browser.php
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ class Browser extends AbstractClientParser
'K4', 'WK', 'T3', 'K5', 'MU', '9P', 'K6', 'VR', 'N9',
'M9', 'F9', '0P', '0A', 'JR', 'D3', 'TK', 'BP', '2F',
'2M', 'K7', '1N', '8A', 'H7', 'X3', 'T4', 'X4', '5O',
'8C', '3M', '6I', '2P', 'PU', '7I', 'X5',
'8C', '3M', '6I', '2P', 'PU', '7I', 'X5', 'AL',
],
'Firefox' => [
'FF', 'BI', 'BF', 'BH', 'BN', 'C0', 'CU', 'EI', 'F1',
Expand Down
10 changes: 5 additions & 5 deletions Tests/Parser/Client/fixtures/browser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1789,7 +1789,7 @@
version: "1.4"
engine: WebKit
engine_version: 602.1.50
family: ""
family: Chrome
-
user_agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:30.0) Gecko/20100101 Waterfox/30.0 Firefox/30.0
client:
Expand Down Expand Up @@ -4318,7 +4318,7 @@
version: ""
engine: ""
engine_version: ""
family: ""
family: Chrome
-
user_agent: Mozilla/5.0 (Linux; U; Tizen 2.0; xx) AppleWebKit/537.1 (KHTML, like Gecko) Mobile TizenBrowser/2.0
client:
Expand Down Expand Up @@ -5447,7 +5447,7 @@
version: 3.13.1
engine: Blink
engine_version: 83.0.4103.96
family: ""
family: Chrome
headers:
http-x-requested-with: AlohaBrowser
-
Expand Down Expand Up @@ -7195,7 +7195,7 @@
version: 4.1.0
engine: ""
engine_version: ""
family: ""
family: Chrome
-
user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) Version/10.0 YaBrowser/17.6.2.226.10 Mobile/14E304 Safari/602.1
client:
Expand Down Expand Up @@ -10110,7 +10110,7 @@
version: 5.10.2
engine: Blink
engine_version: 123.0.0.0
family: ""
family: Chrome
headers:
Sec-CH-UA: '"Not_A Brand";v="99", "Aloha Browser";v="123", "Chromium";v="123"'
http-x-requested-with: AlohaBrowser
Expand Down
2 changes: 1 addition & 1 deletion Tests/fixtures/clienthints.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1225,7 +1225,7 @@
brand: Fairphone
model: FP5
os_family: Android
browser_family: Unknown
browser_family: Chrome
-
user_agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Mobile Safari/537.36
headers:
Expand Down
2 changes: 1 addition & 1 deletion Tests/fixtures/desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6829,7 +6829,7 @@
brand: ""
model: ""
os_family: Windows
browser_family: Unknown
browser_family: Chrome
-
user_agent: Microsoft Office Excel/16.42.1011 (Mac OS/10.13.6; Desktop; es-MX; NonAppStore; Apple/Macmini7,1)
os:
Expand Down
4 changes: 2 additions & 2 deletions Tests/fixtures/podcasting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1785,7 +1785,7 @@
brand: Apple
model: ""
os_family: iOS
browser_family: Unknown
browser_family: Chrome
-
user_agent: Aloha/4 CFNetwork/1399 Darwin/22.1.0
os:
Expand All @@ -1803,7 +1803,7 @@
brand: Apple
model: ""
os_family: iOS
browser_family: Unknown
browser_family: Chrome
-
user_agent: Amazon;AFTT;756a522d9f1648b89e76e80be654456a;;tpapi
os:
Expand Down
2 changes: 1 addition & 1 deletion Tests/fixtures/smartphone-11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6507,7 +6507,7 @@
brand: Casper
model: VIA G3
os_family: Android
browser_family: Unknown
browser_family: Chrome
-
user_agent: Mozilla/5.0 (Linux; Android 9; VIA_G4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.143 Mobile Safari/537.36
os:
Expand Down
2 changes: 1 addition & 1 deletion Tests/fixtures/smartphone-12.yml
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@
brand: Ryte
model: U55 LTE
os_family: Android
browser_family: Unknown
browser_family: Chrome
-
user_agent: Mozilla/5.0 (Linux; Android 9; Phone 2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Mobile Safari/537.36
os:
Expand Down
2 changes: 1 addition & 1 deletion Tests/fixtures/smartphone-17.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3542,7 +3542,7 @@
brand: Artel
model: U3 4G
os_family: Android
browser_family: Unknown
browser_family: Chrome
-
user_agent: Mozilla/5.0 (Linux; Android 7.0; Artel Z5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.62 Mobile Safari/537.36
os:
Expand Down
2 changes: 1 addition & 1 deletion Tests/fixtures/smartphone-18.yml
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@
brand: Oukitel
model: WP2
os_family: Android
browser_family: Unknown
browser_family: Chrome
-
user_agent: Mozilla/5.0 (Linux; Android 10; ASUS_X00T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.110 Mobile Safari/537.36
os:
Expand Down
6 changes: 3 additions & 3 deletions Tests/fixtures/smartphone-23.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5764,7 +5764,7 @@
brand: Leagoo
model: Z5c
os_family: Android
browser_family: Unknown
browser_family: Chrome
-
user_agent: com.google.android.apps.searchlite/63665 (Linux; U; Android 8.1.0; ru_UA; Ulefone_S1; Build/O11019; Cronet/90.0.4430.82)
os:
Expand Down Expand Up @@ -7086,7 +7086,7 @@
brand: Vertex
model: Impress Open
os_family: Android
browser_family: Unknown
browser_family: Chrome
-
user_agent: Mozilla/5.0 (Linux; Android 6.0.1; MotoG3-TE) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.101 Mobile Safari/537.36
os:
Expand Down Expand Up @@ -7122,7 +7122,7 @@
brand: Motorola
model: Moto X Play
os_family: Android
browser_family: Unknown
browser_family: Chrome
-
user_agent: Mozilla/5.0 (Linux; Android 7.0; INTEX AQUA LIONS T1 LITE) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.73 Mobile Safari/537.36
os:
Expand Down
2 changes: 1 addition & 1 deletion Tests/fixtures/smartphone-24.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2214,7 +2214,7 @@
brand: Samsung
model: Galaxy A10
os_family: Android
browser_family: Unknown
browser_family: Chrome
-
user_agent: Mozilla/5.0 (Linux; Android 8.0.0; ZE552KL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.99 Mobile Safari/537.36
os:
Expand Down
2 changes: 1 addition & 1 deletion Tests/fixtures/smartphone-26.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7470,7 +7470,7 @@
brand: Nokia
model: "2.3"
os_family: Android
browser_family: Unknown
browser_family: Chrome
-
user_agent: Mozilla/5.0 (Linux; Android 11; BQ-6051G Build/RP1A.201005.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/90.0.4430.210 Mobile Safari/537.36 MobileAppClient/Android/0.9
os:
Expand Down
4 changes: 2 additions & 2 deletions Tests/fixtures/smartphone-27.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2570,7 +2570,7 @@
brand: Blu
model: Vivo 5 Mini
os_family: Android
browser_family: Unknown
browser_family: Chrome
-
user_agent: Mozilla/5.0 (Linux; Android 6.0.1; vivo Y66L) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Mobile Safari/537.36
os:
Expand Down Expand Up @@ -9800,7 +9800,7 @@
brand: Samsung
model: Galaxy A03s
os_family: Android
browser_family: Unknown
browser_family: Chrome
-
user_agent: Mozilla/5.0 (Linux; U; Android 7.1.1; zh-CN; koobee Y3 Build/N6F26Q) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/78.0.3904.108 UCBrowser/13.8.9.1170 Mobile Safari/537.36
os:
Expand Down
2 changes: 1 addition & 1 deletion Tests/fixtures/smartphone-37.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8524,7 +8524,7 @@
brand: Cat
model: S61
os_family: Android
browser_family: Unknown
browser_family: Chrome
-
user_agent: Mozilla/5.0 (Linux; U; Android 12; COOLMINTT X7 Build/SP1A.210812.016; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/114.0.5735.196 Mobile Safari/537.36 OPR/73.0.2254.68338
os:
Expand Down
2 changes: 1 addition & 1 deletion Tests/fixtures/smartphone-4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4028,7 +4028,7 @@
brand: Fly
model: Cirrus 11
os_family: Android
browser_family: Unknown
browser_family: Chrome
-
user_agent: Mozilla/5.0 Linux; Android 6.0; FS516 Build/MRA58K; wv AppleWebKit/537.36 KHTML, like Gecko Version/4.0 Chrome/74.0.3729.136 Mobile Safari/537.36
os:
Expand Down
6 changes: 3 additions & 3 deletions Tests/fixtures/smartphone-5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@
brand: Hoffmann
model: X Max
os_family: Android
browser_family: Unknown
browser_family: Chrome
-
user_agent: Mozilla/5.0 (Linux; Android 8.1.0; HOFFMANN X-Prime Build/O11019; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/68.0.3440.91 Mobile Safari/537.36
os:
Expand Down Expand Up @@ -916,7 +916,7 @@
brand: Highscreen
model: Easy Power Pro
os_family: Android
browser_family: Unknown
browser_family: Chrome
-
user_agent: Mozilla/5.0 (Linux; Android 7.0; Easy Power Pro Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.91 Mobile Safari/537.36
os:
Expand Down Expand Up @@ -9523,7 +9523,7 @@
brand: Mintt
model: UltraMintt X6
os_family: Android
browser_family: Unknown
browser_family: Chrome
-
user_agent: Mozilla/5.0 (Linux; Android 9; ULTRAMINTT Y3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Mobile Safari/537.36
os:
Expand Down
2 changes: 1 addition & 1 deletion Tests/fixtures/smartphone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2698,7 +2698,7 @@
brand: Nomu
model: S30 Mini
os_family: Android
browser_family: Unknown
browser_family: Chrome
-
user_agent: Mozilla/5.0 (Linux; Android 7.0; NOMU_T18) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36
os:
Expand Down
2 changes: 1 addition & 1 deletion Tests/fixtures/tablet-3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9279,7 +9279,7 @@
brand: RCA Tablets
model: Atlas 10.0"
os_family: Android
browser_family: Unknown
browser_family: Chrome
-
user_agent: Mozilla/5.0 (Linux; Android 9; TBBVNC100005208) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36
os:
Expand Down

0 comments on commit 7dc1c2d

Please sign in to comment.