From c72198d47032d4535f01a1d98fd8858f9cc9bd4c Mon Sep 17 00:00:00 2001
From: Faisal Salman <f@faisalman.com>
Date: Wed, 20 Nov 2024 17:54:41 +0700
Subject: [PATCH] Improve device detection: Nokia tablets

---
 src/main/ua-parser.js      |  6 ++++--
 test/specs/device-all.json | 27 +++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/main/ua-parser.js b/src/main/ua-parser.js
index 2fb34d3..39c8d7b 100755
--- a/src/main/ua-parser.js
+++ b/src/main/ua-parser.js
@@ -593,9 +593,11 @@
             ], [MODEL, [VENDOR, LENOVO], [TYPE, TABLET]], [
 
             // Nokia
+            /(nokia) (t[12][01])/i
+            ], [VENDOR, MODEL, [TYPE, TABLET]], [
             /(?:maemo|nokia).*(n900|lumia \d+)/i,
-            /nokia[-_ ]?([-\w\.]*)/i
-            ], [[MODEL, /_/g, ' '], [VENDOR, 'Nokia'], [TYPE, MOBILE]], [
+            /nokia[-_ ]?(([-\w\.]*))/i
+            ], [[MODEL, /_/g, ' '], [TYPE, MOBILE], [VENDOR, 'Nokia']], [
 
             // Google
             /(pixel (c|tablet))\b/i                                             // Google Pixel C/Tablet
diff --git a/test/specs/device-all.json b/test/specs/device-all.json
index 9adbd09..d73fd3e 100644
--- a/test/specs/device-all.json
+++ b/test/specs/device-all.json
@@ -2186,6 +2186,33 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Nokia T20",
+        "ua": "Mozilla/5.0 (Linux; Android 12; Nokia T20) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36",
+        "expect": {
+            "vendor": "Nokia",
+            "model": "T20",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Nokia T20",
+        "ua": "Mozilla/5.0 (Linux; Android 11; Nokia T20 Build/RP1A.201005.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/93.0.4577.62 Safari/537.36",
+        "expect": {
+            "vendor": "Nokia",
+            "model": "T20",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Nokia T21",
+        "ua": "Dalvik/2.1.0 (Linux; U; Android 13; Nokia T21 Build/TP1A.220624.014)",
+        "expect": {
+            "vendor": "Nokia",
+            "model": "T21",
+            "type": "tablet"
+        }
+    },
     {
         "desc": "Nokia 2720 Flip",
         "ua": "Mozilla/5.0 (Mobile; Nokia_2720_Flip; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5.2",