diff --git a/src/main/ua-parser.js b/src/main/ua-parser.js index 0df6717..7b8ac29 100755 --- a/src/main/ua-parser.js +++ b/src/main/ua-parser.js @@ -610,7 +610,7 @@ ], [[MODEL, /_/g, ' '], [VENDOR, XIAOMI], [TYPE, MOBILE]], [ // OnePlus - /droid.+; (cph2[3-6]\d[13579]|((gm|hd)19|(ac|be|in|kb)20|(d[en]|eb|le|mt)21|ne22)[0-2]\d|p[g-k]\w[1m]10)\b/i, + /droid.+; (cph2[3-6]\d[13579]|((gm|hd)19|(ac|be|in|kb)20|(d[en]|eb|le|mt)21|ne22)[0-2]\d|p[g-l]\w[1m]10)\b/i, /(?:one)?(?:plus)? (a\d0\d\d)(?: b|\))/i ], [MODEL, [VENDOR, ONEPLUS], [TYPE, MOBILE]], [ @@ -650,7 +650,7 @@ ], [MODEL, [VENDOR, MOTOROLA], [TYPE, TABLET]], [ // LG - /((?=lg)?[vl]k\-?\d{3}) bui| 3\.[-\w; ]{10}lg?-([06cv9]{3,4})/i + /\b(?:lg)?([vl]k\-?\d{3}) bui| 3\.[-\w; ]{10}lg?-([06cv9]{3,4})/i ], [MODEL, [VENDOR, LG], [TYPE, TABLET]], [ /(lm(?:-?f100[nv]?|-[\w\.]+)(?= bui|\))|nexus [45])/i, /\blg[-e;\/ ]+(?!.*(?:browser|netcast|android tv|watch|webos))(\w+)/i, diff --git a/test/data/ua/device/lg.json b/test/data/ua/device/lg.json index 9f125d7..6a976b0 100644 --- a/test/data/ua/device/lg.json +++ b/test/data/ua/device/lg.json @@ -188,6 +188,15 @@ "type": "tablet" } }, + { + "desc": "LG G Pad F2", + "ua": "Mozilla/5.0 (Linux; Android 7.1.1; LG-LK460 Build/NMF26X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.98 Safari/537.36", + "expect": { + "vendor": "LG", + "model": "LK460", + "type": "tablet" + } + }, { "desc": "LG Watch Urbane", "ua": "Mozilla/5.0 Linux; Android 7.1.1; LG Watch Urbane Build/NWD1.180306.004 AppleWebKit/537.36 KHTML, like Gecko Chrome/19.77.34.5 Mobile Safari/537.36", diff --git a/test/data/ua/device/oneplus.json b/test/data/ua/device/oneplus.json index a02c0f3..5d4797c 100644 --- a/test/data/ua/device/oneplus.json +++ b/test/data/ua/device/oneplus.json @@ -170,6 +170,15 @@ "type": "mobile" } }, + { + "desc": "OnePlus 15", + "ua": "Mozilla/5.0 (Linux; Android 16; PLK110 Build/BP2A.250605.015; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/134.0.6998.135 Mobile Safari/537.36", + "expect": { + "vendor": "OnePlus", + "model": "PLK110", + "type": "mobile" + } + }, { "desc": "OnePlus Ace", "ua": "Mozilla/5.0 (Linux; U; Android 15; zh-cn; PGKM10 Build/AP3A.240617.008) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/115.0.5790.168 Mobile Safari/537.36 HeyTapBrowser/40.9.6.2",