From 39e8d4af0314117c4733ad9a9397ad32a0e42732 Mon Sep 17 00:00:00 2001
From: Faisal Salman <f@faisalman.com>
Date: Tue, 15 Jun 2021 12:49:19 +0700
Subject: [PATCH] Fix #500 Sharp devices misjudged as Huawei devices

---
 src/ua-parser.js      |  8 ++++++--
 test/device-test.json | 30 +++++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/ua-parser.js b/src/ua-parser.js
index ea9e506..2a62367 100755
--- a/src/ua-parser.js
+++ b/src/ua-parser.js
@@ -385,10 +385,10 @@
             ], [MODEL, [VENDOR, APPLE], [TYPE, TABLET]], [
 
             // Huawei
-            /\b((?:ag[rs][23]?|bah2?|sht?|btv)-a?[lw]\d{2})\b/i
+            /\b((?:ag[rs][23]?|bah2?|sht?|btv)-a?[lw]\d{2})\b(?!.+d\/s)/i
             ], [MODEL, [VENDOR, HUAWEI], [TYPE, TABLET]], [
             /(?:huawei|honor)([-\w ]+)[;\)]/i,
-            /\b(nexus 6p|\w{2,4}-[atu]?[ln][01259x][012359][an]?)\b/i
+            /\b(nexus 6p|\w{2,4}-[atu]?[ln][01259x][012359][an]?)\b(?!.+d\/s)/i
             ], [MODEL, [VENDOR, HUAWEI], [TYPE, MOBILE]], [
 
             // Xiaomi
@@ -499,6 +499,10 @@
             /\bmz-([-\w]{2,})/i
             ], [MODEL, [VENDOR, 'Meizu'], [TYPE, MOBILE]], [
 
+            // Sharp
+            /\b(sh-?[altvz]?\d\d[a-ekm]?)/i
+            ], [MODEL, [VENDOR, 'Sharp'], [TYPE, MOBILE]], [
+
             // MIXED
             /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|meizu|motorola|polytron)[-_ ]?([-\w]*)/i,
                                                                                 // BlackBerry/BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Meizu/Motorola/Polytron
diff --git a/test/device-test.json b/test/device-test.json
index 885db14..794500c 100644
--- a/test/device-test.json
+++ b/test/device-test.json
@@ -1539,6 +1539,33 @@
             "type": "smarttv"
         }
     },
+    {
+        "desc": "Sharp Aquos B10",
+        "ua": "Mozilla/5.0 (Linux; Android 7.0; SH-A01) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Sharp",
+            "model": "SH-A01",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Sharp Aquos L2",
+        "ua": "Mozilla/5.0 (Linux; Android 7.0; SH-L02 Build/S4045) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Sharp",
+            "model": "SH-L02",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Sharp Aquos R2",
+        "ua": "Mozilla/5.0 (Linux; Android 8.0; SHV42) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Sharp",
+            "model": "SHV42",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Sony G8141 (Xperia XZ Premium)",
         "ua": "Mozilla/5.0 (Linux; Android 8.0.0; G8141) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.80 Mobile Safari/537.36",
@@ -2197,9 +2224,10 @@
         }
     },
     {
-        "desc": "Android Phone Unidentified Vendor (docomo SH-02M)",
+        "desc": "docomo SH-02M",
         "ua": "Mozilla/5.0 (Linux; Android 9; SH-02M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.136 Mobile Safari/537.36",
         "expect": {
+            "vendor": "Sharp",
             "model": "SH-02M",
             "type": "mobile"
         }