From d103dd54509e5d126d20a327379165c63be2e006 Mon Sep 17 00:00:00 2001
From: Faisal Salman <fyzlman@gmail.com>
Date: Thu, 22 Jun 2017 17:04:14 +0700
Subject: [PATCH] Fix #219 samsung mistakenly detected as sony

---
 src/ua-parser.js      |  4 ++--
 test/device-test.json | 20 +++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/ua-parser.js b/src/ua-parser.js
index 1394cfa..e8d4cea 100644
--- a/src/ua-parser.js
+++ b/src/ua-parser.js
@@ -532,8 +532,8 @@
             /(sony)\s(tablet\s[ps])\sbuild\//i,                                  // Sony
             /(sony)?(?:sgp.+)\sbuild\//i
             ], [[VENDOR, 'Sony'], [MODEL, 'Xperia Tablet'], [TYPE, TABLET]], [
-            /(?:sony)?(?:(?:(?:c|d)\d{4})|(?:so[-l].+))\sbuild\//i
-            ], [[VENDOR, 'Sony'], [MODEL, 'Xperia Phone'], [TYPE, MOBILE]], [
+            /android.+\s([cdefg]\d{4}|so[-l]\w+)\sbuild\//i
+            ], [MODEL, [VENDOR, 'Sony'], [TYPE, MOBILE]], [
 
             /\s(ouya)\s/i,                                                      // Ouya
             /(nintendo)\s([wids3u]+)/i                                          // Nintendo
diff --git a/test/device-test.json b/test/device-test.json
index 589285a..1fa15f9 100644
--- a/test/device-test.json
+++ b/test/device-test.json
@@ -219,6 +219,16 @@
             "type"    : "tablet"
         }
     },
+    {
+        "desc"    : "Samsung SM-C5000",
+        "ua"      : "Mozilla/5.0 (Linux; Android 6.0.1; SM-C5000 Build/MMB29M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/51.0.2704.81 Mobile Safari/537.36 wkbrowser 4.1.35 3065",
+        "expect"  :
+        {
+            "vendor"  : "Samsung",
+            "model"   : "SM-C5000",
+            "type"    : "mobile"
+        }
+    },
     {
         "desc"    : "Samsung SM-T231",
         "ua"      : "Mozilla/5.0 (Linux; Android 4.4.2; SM-T231 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.135 Safari/537.36",
@@ -295,7 +305,7 @@
         "expect"  :
         {
             "vendor"  : "Sony",
-            "model"   : "Xperia Phone",
+            "model"   : "C5303",
             "type"    : "mobile"
         }
     },
@@ -305,7 +315,7 @@
         "expect"    :
         {
             "vendor"  : "Sony",
-            "model"   : "Xperia Phone",
+            "model"   : "SO-02F",
             "type"    : "mobile"
         }
     },
@@ -315,7 +325,7 @@
         "expect"    :
         {
             "vendor"  : "Sony",
-            "model"   : "Xperia Phone",
+            "model"   : "D6653",
             "type"    : "mobile"
         }
     },
@@ -325,7 +335,7 @@
         "expect"    :
         {
             "vendor"  : "Sony",
-            "model"   : "Xperia Phone",
+            "model"   : "SOL25",
             "type"    : "mobile"
         }
     },
@@ -335,7 +345,7 @@
         "expect"    :
         {
             "vendor"  : "Sony",
-            "model"   : "Xperia Phone",
+            "model"   : "C5302",
             "type"    : "mobile"
         }
     },