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

(cherry picked from commit c72198d47032d4535f01a1d98fd8858f9cc9bd4c)
---
 src/ua-parser.js      |  4 ++--
 test/device-test.json | 27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/ua-parser.js b/src/ua-parser.js
index 402ed8b..fed652b 100755
--- a/src/ua-parser.js
+++ b/src/ua-parser.js
@@ -495,8 +495,8 @@
             // Nokia
             /(nokia) (t[12][01])/i
             ], [VENDOR, MODEL, [TYPE, TABLET]], [
-            /(?:maemo|nokia).*(n900|lumia \d+|rm-\d+)/i,
-            /nokia[-_ ]?(([-\w\. ]*))/i
+            /(?:maemo|nokia).*(n900|lumia \d+)/i,
+            /nokia[-_ ]?(([-\w\.]*))/i
             ], [[MODEL, /_/g, ' '], [TYPE, MOBILE], [VENDOR, 'Nokia']], [
 
             // Google
diff --git a/test/device-test.json b/test/device-test.json
index 2d9d05c..2b644aa 100644
--- a/test/device-test.json
+++ b/test/device-test.json
@@ -2402,6 +2402,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",