Skip to content

Commit 10ab810

Browse files
faisalmanfaisalman
committed
Improve detection for Nokia device & Symbian OS
1 parent e8a3012 commit 10ab810

File tree

5 files changed

+117
-12
lines changed

5 files changed

+117
-12
lines changed

‎src/main/ua-parser.js‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -618,8 +618,8 @@
618618
// Nokia
619619
/(nokia) (t[12][01])/i
620620
], [VENDOR, MODEL, [TYPE, TABLET]], [
621-
/(?:maemo|nokia).*(n900|lumia \d+)/i,
622-
/nokia[-_ ]?(([-\w\.]*))/i
621+
/(?:maemo|nokia).*(n900|lumia \d+|rm-\d+)/i,
622+
/nokia[-_ ]?(([-\w\. ]*))/i
623623
], [[MODEL, /_/g, ' '], [TYPE, MOBILE], [VENDOR, 'Nokia']], [
624624

625625
// Google
@@ -930,15 +930,12 @@
930930
], [VERSION, NAME], [
931931
/(ubuntu) ([\w\.]+) like android/i // Ubuntu Touch
932932
], [[NAME, /(.+)/, '$1 Touch'], VERSION], [
933-
// Android/WebOS/QNX/Bada/RIM/Maemo/MeeGo/Sailfish OS/OpenHarmony
934-
/(android|webos|qnx|bada|rim tablet os|maemo|meego|sailfish|openharmony)[-\/ ]?([\w\.]*)/i,
935-
/(blackberry)\w*\/([\w\.]*)/i, // Blackberry
936-
/(tizen|kaios)[\/ ]([\w\.]+)/i, // Tizen/KaiOS
937-
/\((series40);/i // Series 40
933+
// Android/Blackberry/WebOS/QNX/Bada/RIM/KaiOS/Maemo/MeeGo/S40/Sailfish OS/OpenHarmony/Tizen
934+
/(android|bada|blackberry|kaios|maemo|meego|openharmony|qnx|rim tablet os|sailfish|series40|symbian|tizen|webos)\w*[-\/; ]?([\d\.]*)/i
938935
], [NAME, VERSION], [
939936
/\(bb(10);/i // BlackBerry 10
940937
], [VERSION, [NAME, BLACKBERRY]], [
941-
/(?:symbian ?os|symbos|s60(?=;)|series60)[-\/ ]?([\w\.]*)/i // Symbian
938+
/(?:symbian ?os|symbos|s60(?=;)|series ?60)[-\/ ]?([\w\.]*)/i // Symbian
942939
], [VERSION, [NAME, 'Symbian']], [
943940
/mozilla\/[\d\.]+ \((?:mobile|tablet|tv|mobile; [\w ]+); rv:.+ gecko\/([\w\.]+)/i // Firefox OS
944941
], [VERSION, [NAME, FIREFOX+' OS']], [

‎test/data/ua/device/nokia.json‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,15 @@
1717
"type": "mobile"
1818
}
1919
},
20+
{
21+
"desc": "Nokia 5800 XpressMusic",
22+
"ua": "Mozilla/5.0 (SymbianOS/9.4; U; Series60/5.0 Nokia5800d-1/10.4.016; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/413 (KHTML, like Gecko) Safari/413",
23+
"expect": {
24+
"vendor": "Nokia",
25+
"model": "5800d-1",
26+
"type": "mobile"
27+
}
28+
},
2029
{
2130
"desc": "Nokia 7",
2231
"ua": "Mozilla/5.0 (Linux; Android 11; Nokia 7.2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Mobile Safari/537.36",
@@ -26,6 +35,33 @@
2635
"type": "mobile"
2736
}
2837
},
38+
{
39+
"desc": "Nokia 808 PureView",
40+
"ua": "Mozilla/5.0 (Symbian; U; Nokia808 PureView; en-GB) AppleWebKit/534.3 (KHTML, like Gecko) Version/3.0 Mobile/1A543a Mobile Safari/534.3",
41+
"expect": {
42+
"vendor": "Nokia",
43+
"model": "808 PureView",
44+
"type": "mobile"
45+
}
46+
},
47+
{
48+
"desc": "Nokia 808 PureView",
49+
"ua": "Mozilla/5.0 (Symbian/3; Series60/5.5 Nokia808PureView/113.010.1508; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/535.1 (KHTML, like Gecko) NokiaBrowser/8.3.2.21 Mobile Safari/535.1 3gpp-gba",
50+
"expect": {
51+
"vendor": "Nokia",
52+
"model": "808PureView",
53+
"type": "mobile"
54+
}
55+
},
56+
{
57+
"desc": "Nokia Lumia 630",
58+
"ua": "UCWEB/2.0 (Windows; U; wds 8.10; en-IN; NOKIA; RM-978_1046) U2/1.0.0 UCBrowser/4.2.0.524 U2/1.0.0 Mobile",
59+
"expect": {
60+
"vendor": "Nokia",
61+
"model": "RM-978",
62+
"type": "mobile"
63+
}
64+
},
2965
{
3066
"desc": "Nokia N9",
3167
"ua": "Mozilla/5.0 (MeeGo; NokiaN9) AppleWebKit/534.13 (KHTML, like Gecko) NokiaBrowser/8.5.0 Mobile Safari/534.13",
@@ -35,6 +71,15 @@
3571
"type": "mobile"
3672
}
3773
},
74+
{
75+
"desc": "Nokia N900",
76+
"ua": "Mozilla/5.0 (Linux; Maemo 5.0; Nokia N900; Build/4.0.0.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0 Mobile Safari/537.36",
77+
"expect": {
78+
"vendor": "Nokia",
79+
"model": "N900",
80+
"type": "mobile"
81+
}
82+
},
3883
{
3984
"desc": "Nokia T20",
4085
"ua": "Mozilla/5.0 (Linux; Android 12; Nokia T20) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36",

‎test/data/ua/os/maemo.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,23 @@
77
"name" : "Maemo",
88
"version" : "undefined"
99
}
10+
},
11+
{
12+
"desc" : "Nokia N900 Linux mobile, on the Maemo browser",
13+
"ua" : "Mozilla/5.0(X11; U; Linux armv7l; fr-FR; rv:1.9.2a1pre) Gecko/20091127 Firefox/3.5 Maemo Browser 1.5.6 RX-51 N900",
14+
"expect" :
15+
{
16+
"name" : "Maemo",
17+
"version" : "undefined"
18+
}
19+
},
20+
{
21+
"desc" : "Nokia N900 Linux mobile, on the Maemo browser",
22+
"ua" : "Mozilla/5.0 (Linux; Maemo 5.0; Nokia N900; Build/4.0.0.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0 Mobile Safari/537.36",
23+
"expect" :
24+
{
25+
"name" : "Maemo",
26+
"version" : "5.0"
27+
}
1028
}
1129
]

‎test/data/ua/os/qnx.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"expect" :
66
{
77
"name" : "QNX",
8-
"version" : "x86pc"
8+
"version" : "undefined"
99
}
1010
}
1111
]

‎test/data/ua/os/symbian.json‎

Lines changed: 48 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[
22
{
3-
"desc" : "Symbian",
3+
"desc" : "Nokia 5250",
44
"ua" : "Nokia5250/10.0.011 (SymbianOS/9.4; U; Series60/5.0 Mozilla/5.0; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/525 (KHTML, like Gecko) Safari/525 3gpp-gba",
55
"expect" :
66
{
@@ -9,12 +9,57 @@
99
}
1010
},
1111
{
12-
"desc" : "Symbian",
12+
"desc" : "Nokia N79",
13+
"ua" : "Mozilla/5.0 (SymbianOS/9.3; U; Series60/3.2 NokiaN79-1/32.001; Profile/MIDP-2.1 Configuration/CLDC-1",
14+
"expect" :
15+
{
16+
"name" : "Symbian",
17+
"version" : "9.3"
18+
}
19+
},
20+
{
21+
"desc" : "Nokia E71",
22+
"ua" : "Mozilla/5.0 (SymbianOS/9.2; U; Series60/3.1 NokiaE71-1/110.07.127; Profile/MIDP-2.0 Configuration/CLDC-1.1 ) AppleWebKit/413 (KHTML, like Gecko) Safari/413",
23+
"expect" :
24+
{
25+
"name" : "Symbian",
26+
"version" : "9.2"
27+
}
28+
},
29+
{
30+
"desc" : "Opera Mini on S60",
31+
"ua" : "Opera/9.80 (Series 60; Opera Mini/7.1.32444/191.361; U; de) Presto/2.12.423 Version/12.16",
32+
"expect" :
33+
{
34+
"name" : "Symbian",
35+
"version" : "undefined"
36+
}
37+
},
38+
{
39+
"desc" : "NokiaBrowser on Nokia C7",
1340
"ua" : "Mozilla/5.0 (Symbian/3; Series60/5.2 NokiaC7-00/024.001; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/533.4 (KHTML, like Gecko) NokiaBrowser/7.3.1.37 Mobile Safari/533.4 3gpp-gba",
1441
"expect" :
1542
{
1643
"name" : "Symbian",
17-
"version" : "5.2"
44+
"version" : "3"
45+
}
46+
},
47+
{
48+
"desc" : "Nokia 808 PureView",
49+
"ua" : "Mozilla/5.0 (Symbian/3; Series60/5.5 Nokia808PureView/113.010.1508; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/535.1 (KHTML, like Gecko) NokiaBrowser/8.3.2.21 Mobile Safari/535.1 3gpp-gba",
50+
"expect" :
51+
{
52+
"name" : "Symbian",
53+
"version" : "3"
54+
}
55+
},
56+
{
57+
"desc" : "Nokia 808 PureView",
58+
"ua" : "Mozilla/5.0 (Symbian; U; Nokia808 PureView; en-GB) AppleWebKit/534.3 (KHTML, like Gecko) Version/3.0 Mobile/1A543a Mobile Safari/534.3",
59+
"expect" :
60+
{
61+
"name" : "Symbian",
62+
"version" : "undefined"
1863
}
1964
}
2065
]

0 commit comments

Comments
 (0)