From 42f49f1796de77f89c36541de46d21361620b84f Mon Sep 17 00:00:00 2001
From: Greg ORIOL <greg@gregoriol.net>
Date: Fri, 10 May 2019 14:06:15 +0200
Subject: [PATCH 01/16] Added Xiami MI MIX

---
 Tests/fixtures/smartphone-9.yml | 20 ++++++++++++++++++++
 regexes/device/mobiles.yml      |  4 +++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/Tests/fixtures/smartphone-9.yml b/Tests/fixtures/smartphone-9.yml
index 7b5b1e0d2e..10b4c1bc70 100644
--- a/Tests/fixtures/smartphone-9.yml
+++ b/Tests/fixtures/smartphone-9.yml
@@ -7966,6 +7966,26 @@
     model: Mi A1
   os_family: Android
   browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 7.0; MIX Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/74.0.3729.136 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "7.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "74.0.3729.136"
+    engine: Blink
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: XI
+    model: MI MIX
+  os_family: Android
+  browser_family: Chrome
 - 
   user_agent: Mozilla/5.0 (Linux; Android 8.0; MIX 2 Build/OPR1.170623.027; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/57.0.2987.132 MQQBrowser/6.2 TBS/043909 Mobile Safari/537.36 MicroMessenger/6.6.5.1280(0x26060536) NetType/4G Language/zh_CN
   os:
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
index 1147fd1250..3c0888915c 100644
--- a/regexes/device/mobiles.yml
+++ b/regexes/device/mobiles.yml
@@ -9400,7 +9400,7 @@ X-View:
 
 #Xiaomi
 Xiaomi:
-  regex: 'Xiaomi(?!/MiuiBrowser)|(MI [a-z0-9]+|Mi-4c|MI-One[ _]?[a-z0-9]+|MIX 2S?)[);/ ]|HM ([^/;]+) (?:Build|MIUI)|(2014501|2014011|201481[138]|201302[23]|2013061) Build|Redmi|POCOPHONE|SKR-H0'
+  regex: 'Xiaomi(?!/MiuiBrowser)|(?:MI [a-z0-9]+|Mi-4c|MI-One[ _]?[a-z0-9]+|MIX(?: 2S?)?)[);/ ]|HM (?:[^/;]+) (?:Build|MIUI)|(?:2014501|2014011|201481[138]|201302[23]|2013061) Build|Redmi|POCOPHONE|SKR-H0'
   device: 'smartphone'
   models:
     # specific smartphone models
@@ -9422,6 +9422,8 @@ Xiaomi:
       model: 'MI MIX 2S'
     - regex: 'MIX 2[);/ ]'
       model: 'MI MIX 2'
+    - regex: 'MIX[);/ ]'
+      model: 'MI MIX'
     - regex: 'POCOPHONE F1'
       model: 'Pocophone F1'
 

From 526357aeef984fbf347d161093f11b2139ec8e29 Mon Sep 17 00:00:00 2001
From: Greg ORIOL <greg@gregoriol.net>
Date: Fri, 10 May 2019 14:06:25 +0200
Subject: [PATCH 02/16] Cleaned regex

---
 regexes/device/mobiles.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
index 3c0888915c..9e12497758 100644
--- a/regexes/device/mobiles.yml
+++ b/regexes/device/mobiles.yml
@@ -9449,7 +9449,7 @@ Xiaomi:
 
 # Xion
 Xion:
-  regex: 'XI-CE(655|U[48])'
+  regex: 'XI-CE(?:655|U[48])'
   device: 'smartphone'
   models:
     - regex: 'XI-CE(655|U[48])'

From 01d88535383b544d98d397b7645d9aee5f5f8515 Mon Sep 17 00:00:00 2001
From: Greg ORIOL <greg@gregoriol.net>
Date: Fri, 10 May 2019 14:48:58 +0200
Subject: [PATCH 03/16] Added Motorola Moto G6 Plus

---
 Tests/fixtures/smartphone-5.yml | 20 ++++++++++++++++++++
 regexes/device/mobiles.yml      |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Tests/fixtures/smartphone-5.yml b/Tests/fixtures/smartphone-5.yml
index ba620772c7..b1356113fc 100644
--- a/Tests/fixtures/smartphone-5.yml
+++ b/Tests/fixtures/smartphone-5.yml
@@ -7918,6 +7918,26 @@
     model: Moto G5S Plus
   os_family: Android
   browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 9; moto g(6) plus) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "73.0.3683.90"
+    engine: Blink
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: MR
+    model: Moto g6 plus
+  os_family: Android
+  browser_family: Chrome
 - 
   user_agent: Mozilla/5.0 (Linux; Android 7.0; XT1663 Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.111 Mobile Safari/537.36
   os:
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
index 9e12497758..932296eb96 100644
--- a/regexes/device/mobiles.yml
+++ b/regexes/device/mobiles.yml
@@ -6021,7 +6021,7 @@ Motorola:
     - regex: '(?:MOT-|Motorola-)?XT1663'
       model: 'Moto M'
 
-    - regex: 'Moto ([CGEZ]) \(([a-z0-9]+)\)( Plus| Play)?'
+    - regex: 'Moto ([CGEZ]) ?\(([a-z0-9]+)\)( Plus| Play)?'
       model: 'Moto $1$2$3'
     - regex: 'Moto ?([CGEZ])([0-9]+)( Plus| Play)?'
       model: 'Moto $1$2$3'

From 65571cca10221d544da6c38a663dd71aecec2601 Mon Sep 17 00:00:00 2001
From: Greg ORIOL <greg@gregoriol.net>
Date: Fri, 10 May 2019 14:51:51 +0200
Subject: [PATCH 04/16] Added Samsung Galaxy S10

---
 Tests/fixtures/smartphone-7.yml | 20 ++++++++++++++++++++
 regexes/device/mobiles.yml      |  2 ++
 2 files changed, 22 insertions(+)

diff --git a/Tests/fixtures/smartphone-7.yml b/Tests/fixtures/smartphone-7.yml
index f5464ccc00..2568d35605 100644
--- a/Tests/fixtures/smartphone-7.yml
+++ b/Tests/fixtures/smartphone-7.yml
@@ -7476,6 +7476,26 @@
     model: GALAXY S9+
   os_family: Android
   browser_family: Unknown
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 9; SAMSUNG SM-G973F Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/9.2 Chrome/67.0.3396.87 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Samsung Browser
+    short_name: SB
+    version: "9.2"
+    engine: WebKit
+    engine_version: "537.36"
+  device:
+    type: smartphone
+    brand: SA
+    model: GALAXY S10
+  os_family: Android
+  browser_family: Unknown
 - 
   user_agent: Mozilla/5.0 (Linux; U; Android 4.1.1; en-gb; GT-I9003 Build/JRO03L) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
   os:
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
index 932296eb96..abdc3d0e7a 100644
--- a/regexes/device/mobiles.yml
+++ b/regexes/device/mobiles.yml
@@ -7439,6 +7439,8 @@ Samsung:
       model: 'GALAXY S9'
     - regex: '(?:SAMSUNG-)?SM-G965[FNUWX0]|SCV39'
       model: 'GALAXY S9+'
+    - regex: '(?:SAMSUNG-)?SM-G973'
+      model: 'GALAXY S10'
     - regex: '(?:SAMSUNG-)?SCH-I200'
       model: 'GALAXY Stellar'
     - regex: '(?:SAMSUNG-)?SCH-I829'

From be9f4f1f88c7f7dcabb5ae5f0891875d8afcbb40 Mon Sep 17 00:00:00 2001
From: Greg ORIOL <greg@gregoriol.net>
Date: Fri, 10 May 2019 14:53:20 +0200
Subject: [PATCH 05/16] Added Motorola Moto G6

---
 Tests/fixtures/smartphone-5.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/Tests/fixtures/smartphone-5.yml b/Tests/fixtures/smartphone-5.yml
index b1356113fc..c18cd66c82 100644
--- a/Tests/fixtures/smartphone-5.yml
+++ b/Tests/fixtures/smartphone-5.yml
@@ -7918,6 +7918,26 @@
     model: Moto G5S Plus
   os_family: Android
   browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 9; moto g(6)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.136 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "74.0.3729.136"
+    engine: Blink
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: MR
+    model: Moto g6
+  os_family: Android
+  browser_family: Chrome
 - 
   user_agent: Mozilla/5.0 (Linux; Android 9; moto g(6) plus) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Mobile Safari/537.36
   os:

From e97c44a4cbc2819c0821a7a68bc54ece46f0a95a Mon Sep 17 00:00:00 2001
From: Greg ORIOL <greg@gregoriol.net>
Date: Fri, 10 May 2019 14:56:02 +0200
Subject: [PATCH 06/16] Added Motorola Moto X4

---
 Tests/fixtures/smartphone-5.yml | 20 ++++++++++++++++++++
 regexes/device/mobiles.yml      |  6 +++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/Tests/fixtures/smartphone-5.yml b/Tests/fixtures/smartphone-5.yml
index c18cd66c82..e671616abd 100644
--- a/Tests/fixtures/smartphone-5.yml
+++ b/Tests/fixtures/smartphone-5.yml
@@ -8158,6 +8158,26 @@
     model: Moto X Play
   os_family: Android
   browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 9; moto x4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.136 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "74.0.3729.136"
+    engine: Blink
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: MR
+    model: Moto x4
+  os_family: Android
+  browser_family: Chrome
 - 
   user_agent: Mozilla/5.0 (Linux; U; Android 2.3.6; zh-CN; XT882 Build/SWDFS_M7_4.97.0) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 UCBrowser/9.6.2.404 U3/0.8.0 Mobile Safari/533.1
   os:
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
index abdc3d0e7a..9ccff85866 100644
--- a/regexes/device/mobiles.yml
+++ b/regexes/device/mobiles.yml
@@ -6021,11 +6021,11 @@ Motorola:
     - regex: '(?:MOT-|Motorola-)?XT1663'
       model: 'Moto M'
 
-    - regex: 'Moto ([CGEZ]) ?\(([a-z0-9]+)\)( Plus| Play)?'
+    - regex: 'Moto ([CGEXZ]) ?\(([a-z0-9]+)\)( Plus| Play)?'
       model: 'Moto $1$2$3'
-    - regex: 'Moto ?([CGEZ])([0-9]+)( Plus| Play)?'
+    - regex: 'Moto ?([CGEXZ])([0-9]+)( Plus| Play)?'
       model: 'Moto $1$2$3'
-    - regex: 'Moto ?([CGEZ])( Plus| Play)?'
+    - regex: 'Moto ?([CGEXZ])( Plus| Play)?'
       model: 'Moto $1$2'
 
     - regex: 'Motorola[ _\-]([a-z0-9]+)'

From 8c882f75b13785c9f689d4bf4fc818510fb7162a Mon Sep 17 00:00:00 2001
From: Greg ORIOL <greg@gregoriol.net>
Date: Fri, 10 May 2019 15:03:12 +0200
Subject: [PATCH 07/16] =?UTF-8?q?Enhanced=20Neffos=20regex=20and=20added?=
 =?UTF-8?q?=20a=20fixture=20that=20broke=20the=20previous=20ones=20(=C2=AB?=
 =?UTF-8?q?=C2=A0X1=C2=A0=C2=BB=20was=20detected=20as=20=C2=AB=C2=A0X1)=20?=
 =?UTF-8?q?AppleWebKit=C2=A0=C2=BB)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tests/fixtures/smartphone-5.yml | 20 ++++++++++++++++++++
 regexes/device/mobiles.yml      | 10 ++--------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Tests/fixtures/smartphone-5.yml b/Tests/fixtures/smartphone-5.yml
index e671616abd..624de8806f 100644
--- a/Tests/fixtures/smartphone-5.yml
+++ b/Tests/fixtures/smartphone-5.yml
@@ -9557,6 +9557,26 @@
     model: X1
   os_family: Android
   browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 7.0; Neffos X1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.121 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "7.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "72.0.3626.121"
+    engine: Blink
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: NF
+    model: X1
+  os_family: Android
+  browser_family: Chrome
 - 
   user_agent: Mozilla/5.0 (Linux; Android 8.1.0; Neffos_X9) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.99 Mobile Safari/537.36
   os:
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
index 9ccff85866..80b6059411 100644
--- a/regexes/device/mobiles.yml
+++ b/regexes/device/mobiles.yml
@@ -6164,14 +6164,8 @@ Neffos:
   regex: 'Neffos'
   device: 'smartphone'
   models:
-    - regex: 'Neffos ([^/;]+) Build'
-      model: '$1'
-    - regex: 'Neffos ([^/;]+)/'
-      model: '$1'
-    - regex: 'Neffos_C9A'
-      model: 'C9A'
-    - regex: 'Neffos_(C|X)9'
-      model: '$19'
+    - regex: 'Neffos[_ ]((?:C|X)[0-9][A-Z]?(?: Max)?)'
+      model: '$1$2'
 
 # Nextbit
 Nextbit:

From cd81557e93476a8a0e72332756c18b816a3cdbaa Mon Sep 17 00:00:00 2001
From: Greg ORIOL <greg@gregoriol.net>
Date: Fri, 10 May 2019 15:06:44 +0200
Subject: [PATCH 08/16] =?UTF-8?q?Enhanced=20LeEco=20regex=20to=20match=20L?=
 =?UTF-8?q?eEco=20Le=20X722=20(was=20matched=20as=20=C2=AB=C2=A0LeEco=20Le?=
 =?UTF-8?q?=20X722)=C2=A0=C2=BB)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tests/fixtures/smartphone-4.yml | 20 ++++++++++++++++++++
 regexes/device/mobiles.yml      |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Tests/fixtures/smartphone-4.yml b/Tests/fixtures/smartphone-4.yml
index 72b40892a5..1c20d0c10a 100644
--- a/Tests/fixtures/smartphone-4.yml
+++ b/Tests/fixtures/smartphone-4.yml
@@ -6764,6 +6764,26 @@
     model: Le X900
   os_family: Android
   browser_family: Unknown
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 6.0.1; LEX722) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.136 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "6.0.1"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "74.0.3729.136"
+    engine: Blink
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: L1
+    model: Le X722
+  os_family: Android
+  browser_family: Chrome
 - 
   user_agent: Mozilla/5.0 (Linux; Android 5.0; S6 Build/LRX22G) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Mobile Safari/537.36
   os:
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
index 80b6059411..464f62387f 100644
--- a/regexes/device/mobiles.yml
+++ b/regexes/device/mobiles.yml
@@ -4968,7 +4968,7 @@ LeEco:
       model: 'Le 2'
     - regex: 'Le ?X([^;/]+) Build'
       model: 'Le X$1'
-    - regex: 'Le ?X([^ ;/]+)'
+    - regex: 'Le ?X([^) ;/]+)'
       model: 'Le X$1'
     - regex: 'Le ?([12][^;/]+) Build'
       model: 'Le $1'

From 5585b6e03669df1c28064df8ea32d3aa4f6ed669 Mon Sep 17 00:00:00 2001
From: Greg ORIOL <greg@gregoriol.net>
Date: Fri, 10 May 2019 15:09:38 +0200
Subject: [PATCH 09/16] Added Samsung Galaxy Tab 10.1 variant and fixed
 existing fixtures

---
 Tests/fixtures/tablet-2.yml | 96 ++++++++++++++++++-------------------
 regexes/device/mobiles.yml  |  4 +-
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/Tests/fixtures/tablet-2.yml b/Tests/fixtures/tablet-2.yml
index 80b3f2ec91..6955e0bb83 100644
--- a/Tests/fixtures/tablet-2.yml
+++ b/Tests/fixtures/tablet-2.yml
@@ -4487,7 +4487,7 @@
   device:
     type: tablet
     brand: SA
-    model: GALAXY Tab 10.1" P7500
+    model: GALAXY Tab 10.1"
   os_family: Android
   browser_family: Android Browser
 - 
@@ -4507,7 +4507,7 @@
   device:
     type: tablet
     brand: SA
-    model: GALAXY Tab 10.1" P7500
+    model: GALAXY Tab 10.1"
   os_family: Android
   browser_family: Android Browser
 - 
@@ -4527,7 +4527,7 @@
   device:
     type: tablet
     brand: SA
-    model: GALAXY Tab 10.1" P7500
+    model: GALAXY Tab 10.1"
   os_family: Android
   browser_family: Android Browser
 - 
@@ -4547,7 +4547,7 @@
   device:
     type: tablet
     brand: SA
-    model: GALAXY Tab 10.1" P7500
+    model: GALAXY Tab 10.1"
   os_family: Android
   browser_family: Android Browser
 - 
@@ -4567,7 +4567,7 @@
   device:
     type: tablet
     brand: SA
-    model: GALAXY Tab 10.1" P7500
+    model: GALAXY Tab 10.1"
   os_family: Android
   browser_family: Android Browser
 - 
@@ -4587,7 +4587,7 @@
   device:
     type: tablet
     brand: SA
-    model: GALAXY Tab 10.1" P7500
+    model: GALAXY Tab 10.1"
   os_family: Android
   browser_family: Android Browser
 - 
@@ -4607,7 +4607,7 @@
   device:
     type: tablet
     brand: SA
-    model: GALAXY Tab 10.1" P7500
+    model: GALAXY Tab 10.1"
   os_family: Android
   browser_family: Android Browser
 - 
@@ -4627,7 +4627,47 @@
   device:
     type: tablet
     brand: SA
-    model: GALAXY Tab 10.1" P7500
+    model: GALAXY Tab 10.1"
+  os_family: Android
+  browser_family: Android Browser
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 3.1; sv-se; GT-P7510 Build/HMJ37) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13
+  os:
+    name: Android
+    short_name: AND
+    version: "3.1"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version: ""
+    engine: WebKit
+    engine_version: "534.13"
+  device:
+    type: tablet
+    brand: SA
+    model: GALAXY Tab 10.1"
+  os_family: Android
+  browser_family: Android Browser
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 3.2; cs-cz; GT-P7510 Build/HTJ85B) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13
+  os:
+    name: Android
+    short_name: AND
+    version: "3.2"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version: ""
+    engine: WebKit
+    engine_version: "534.13"
+  device:
+    type: tablet
+    brand: SA
+    model: GALAXY Tab 10.1"
   os_family: Android
   browser_family: Android Browser
 - 
@@ -6430,46 +6470,6 @@
     model: GT-P7501
   os_family: Android
   browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; U; Android 3.1; sv-se; GT-P7510 Build/HMJ37) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13
-  os:
-    name: Android
-    short_name: AND
-    version: "3.1"
-    platform: ""
-  client:
-    type: browser
-    name: Android Browser
-    short_name: AN
-    version: ""
-    engine: WebKit
-    engine_version: "534.13"
-  device:
-    type: tablet
-    brand: SA
-    model: GT-P7510
-  os_family: Android
-  browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; U; Android 3.2; cs-cz; GT-P7510 Build/HTJ85B) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13
-  os:
-    name: Android
-    short_name: AND
-    version: "3.2"
-    platform: ""
-  client:
-    type: browser
-    name: Android Browser
-    short_name: AN
-    version: ""
-    engine: WebKit
-    engine_version: "534.13"
-  device:
-    type: tablet
-    brand: SA
-    model: GT-P7510
-  os_family: Android
-  browser_family: Android Browser
 - 
   user_agent: Mozilla/5.0 (Linux; U; Android 3.2; vi-vn; GT-P7511 Build/HTJ85B) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13
   os:
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
index 464f62387f..ceee3b7e86 100644
--- a/regexes/device/mobiles.yml
+++ b/regexes/device/mobiles.yml
@@ -7085,9 +7085,9 @@ Samsung:
     - regex: '(?:SAMSUNG-)?GT-P7100'
       device: 'tablet'
       model: 'GALAXY Tab 10.1v'
-    - regex: '(?:SAMSUNG-)?GT-P7500'
+    - regex: '(?:SAMSUNG-)?GT-P75[01]0'
       device: 'tablet'
-      model: 'GALAXY Tab 10.1" P7500'
+      model: 'GALAXY Tab 10.1"'
     - regex: '(?:SAMSUNG-)?SM-P600'
       device: 'tablet'
       model: 'GALAXY Note 10.1" 2014 Edition WiFi'

From 0a956b4c46d52efb0d2c7d6d594ce9f33de6cea2 Mon Sep 17 00:00:00 2001
From: Greg ORIOL <greg@gregoriol.net>
Date: Fri, 10 May 2019 15:11:05 +0200
Subject: [PATCH 10/16] Added Motorola Moto X variant

---
 Tests/fixtures/smartphone-5.yml | 20 ++++++++++++++++++++
 regexes/device/mobiles.yml      |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Tests/fixtures/smartphone-5.yml b/Tests/fixtures/smartphone-5.yml
index 624de8806f..bf858275a6 100644
--- a/Tests/fixtures/smartphone-5.yml
+++ b/Tests/fixtures/smartphone-5.yml
@@ -8138,6 +8138,26 @@
     model: Moto X
   os_family: Android
   browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 6.0; XT1097 Build/MPES24.49-18-7; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/44.0.2403.119 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "44.0.2403.119"
+    engine: Blink
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: MR
+    model: Moto X
+  os_family: Android
+  browser_family: Chrome
 - 
   user_agent: Mozilla/5.0 (Linux; Android 6.0.1; XT1562 Build/MPDS24.107-70-1-5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.83 Mobile Safari/537.36
   os:
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
index ceee3b7e86..80458ebf4b 100644
--- a/regexes/device/mobiles.yml
+++ b/regexes/device/mobiles.yml
@@ -6008,7 +6008,7 @@ Motorola:
       model: 'Droid Turbo'
     - regex: '(?:MOT-|Motorola-)?XT10(?:28|3[1234]|68)'
       model: 'Moto G'
-    - regex: '(?:MOT-|Motorola-)?XT10(?:49|5[23568]|60|9[2345])'
+    - regex: '(?:MOT-|Motorola-)?XT10(?:49|5[23568]|60|9[23457])'
       model: 'Moto X'
     - regex: '(?:MOT-|Motorola-)?XT1562'
       model: 'Moto X Play'

From 56698639ec8d4883c4c6a6331fe9fafff624b276 Mon Sep 17 00:00:00 2001
From: Greg ORIOL <greg@gregoriol.net>
Date: Fri, 10 May 2019 15:12:30 +0200
Subject: [PATCH 11/16] Added Samsung GALAXY J5 (2017) variant

---
 Tests/fixtures/smartphone-7.yml | 20 ++++++++++++++++++++
 regexes/device/mobiles.yml      |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Tests/fixtures/smartphone-7.yml b/Tests/fixtures/smartphone-7.yml
index 2568d35605..fac33137e4 100644
--- a/Tests/fixtures/smartphone-7.yml
+++ b/Tests/fixtures/smartphone-7.yml
@@ -2996,6 +2996,26 @@
     model: GALAXY J5 (2017)
   os_family: Android
   browser_family: Unknown
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 8.1.0; SM-J530G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.136 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "8.1.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "74.0.3729.136"
+    engine: Blink
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: SA
+    model: GALAXY J5 (2017)
+  os_family: Android
+  browser_family: Chrome
 - 
   user_agent: Mozilla/5.0 (Linux; Android 6.0.1; SM-G570M Build/MMB29K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.89 Mobile Safari/537.36
   os:
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
index 80458ebf4b..b3e5ec380a 100644
--- a/regexes/device/mobiles.yml
+++ b/regexes/device/mobiles.yml
@@ -7517,7 +7517,7 @@ Samsung:
       model: 'GALAXY J5 (2015)'
     - regex: '(?:SAMSUNG-)?SM-J510(?:F|FN|MN)'
       model: 'GALAXY J5 (2016)'
-    - regex: '(?:SAMSUNG-)?SM-J530[FY]'
+    - regex: '(?:SAMSUNG-)?SM-J530'
       model: 'GALAXY J5 (2017)'
     - regex: '(?:SAMSUNG-)?SM-G570[FMY]'
       model: 'GALAXY J5 Prime'

From 6d506bb5476149f43289e65d238a989d8d85d1cd Mon Sep 17 00:00:00 2001
From: Greg ORIOL <greg@gregoriol.net>
Date: Fri, 10 May 2019 15:14:37 +0200
Subject: [PATCH 12/16] Added Samsung GALAXY J8

---
 Tests/fixtures/smartphone-7.yml | 20 ++++++++++++++++++++
 regexes/device/mobiles.yml      |  2 ++
 2 files changed, 22 insertions(+)

diff --git a/Tests/fixtures/smartphone-7.yml b/Tests/fixtures/smartphone-7.yml
index fac33137e4..258573d4d4 100644
--- a/Tests/fixtures/smartphone-7.yml
+++ b/Tests/fixtures/smartphone-7.yml
@@ -3536,6 +3536,26 @@
     model: GALAXY J7+ (C7)
   os_family: Android
   browser_family: Unknown
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 9; SM-J810M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "73.0.3683.90"
+    engine: Blink
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: SA
+    model: GALAXY J8
+  os_family: Android
+  browser_family: Chrome
 - 
   user_agent: Mozilla/5.0 (Linux; Android 6.0; SM-J8 Pro Build/LMY47I) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/39.0.0.0 Mobile Safari/537.36
   os:
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
index b3e5ec380a..5975ef67f3 100644
--- a/regexes/device/mobiles.yml
+++ b/regexes/device/mobiles.yml
@@ -7545,6 +7545,8 @@ Samsung:
       model: 'GALAXY J7 V'
     - regex: 'SM-J7\[7\]'
       model: 'GALAXY J7 7'
+    - regex: '(?:SAMSUNG-)?SM-J810'
+      model: 'GALAXY J8'
     - regex: 'SM-J8 Pro'
       model: 'GALAXY J8 Pro'
     - regex: 'SM-J9\[7\] Prime'

From 1795e7d22d69b7a21ce6e33edf41a440e33d3f15 Mon Sep 17 00:00:00 2001
From: Greg ORIOL <greg@gregoriol.net>
Date: Fri, 10 May 2019 15:16:57 +0200
Subject: [PATCH 13/16] Added LG X Power 2

---
 Tests/fixtures/smartphone-5.yml | 20 ++++++++++++++++++++
 regexes/device/mobiles.yml      |  2 ++
 2 files changed, 22 insertions(+)

diff --git a/Tests/fixtures/smartphone-5.yml b/Tests/fixtures/smartphone-5.yml
index bf858275a6..2569ce2016 100644
--- a/Tests/fixtures/smartphone-5.yml
+++ b/Tests/fixtures/smartphone-5.yml
@@ -1236,6 +1236,26 @@
     model: X Power
   os_family: Android
   browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 7.0; LG-M320 Build/NRD90U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.68 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "7.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "67.0.3396.68"
+    engine: Blink
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: LG
+    model: X Power 2
+  os_family: Android
+  browser_family: Chrome
 - 
   user_agent: UCWEB/2.0 (Java; U; MIDP-2.0; fr-FR; LG-X330T) U2/1.0.0 UCBrowser/9.3.0.326 U2/1.0.0 Mobile UNTRUSTED/1.0
   os: [ ]
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
index 5975ef67f3..64f8c123a7 100644
--- a/regexes/device/mobiles.yml
+++ b/regexes/device/mobiles.yml
@@ -5331,6 +5331,8 @@ LG:
       model: 'Q6'
     - regex: '(?:LG-?)?K220'
       model: 'X Power'
+    - regex: '(?:LG-?)?M320'
+      model: 'X Power 2'
     - regex: '(?:LG-)?K371'
       model: 'Phoenix 2'
     - regex: '(?:LG-)?M150'

From 2f2a53d8766bb19f982ab3d3c27cc24abb3626c6 Mon Sep 17 00:00:00 2001
From: Greg ORIOL <greg@gregoriol.net>
Date: Fri, 10 May 2019 15:18:13 +0200
Subject: [PATCH 14/16] Added LG G4 Stylus variant

---
 Tests/fixtures/smartphone-4.yml | 20 ++++++++++++++++++++
 regexes/device/mobiles.yml      |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Tests/fixtures/smartphone-4.yml b/Tests/fixtures/smartphone-4.yml
index 1c20d0c10a..5770773036 100644
--- a/Tests/fixtures/smartphone-4.yml
+++ b/Tests/fixtures/smartphone-4.yml
@@ -9404,6 +9404,26 @@
     model: G4 Stylus
   os_family: Android
   browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 6.0; LG-H630) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.136 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "74.0.3729.136"
+    engine: Blink
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: LG
+    model: G4 Stylus
+  os_family: Android
+  browser_family: Chrome
 - 
   user_agent: Mozilla/5.0 (Linux; Android 6.0; LG-H525n Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.76 Mobile Safari/537.36
   os:
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
index 64f8c123a7..a54d211f8c 100644
--- a/regexes/device/mobiles.yml
+++ b/regexes/device/mobiles.yml
@@ -5237,7 +5237,7 @@ LG:
       model: 'G4'
     - regex: 'LG-H525n?'
       model: 'G4c'
-    - regex: 'LG-H540'
+    - regex: 'LG-(?:H540|H630)'
       model: 'G4 Stylus'
     - regex: 'LG-H735'
       model: 'G4 Beat'

From dc2730ce353b13475a945b915100be8879b16ec1 Mon Sep 17 00:00:00 2001
From: Greg ORIOL <greg@gregoriol.net>
Date: Fri, 10 May 2019 15:20:05 +0200
Subject: [PATCH 15/16] Added Motorola Moto G variant

---
 Tests/fixtures/smartphone-5.yml | 20 ++++++++++++++++++++
 regexes/device/mobiles.yml      |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Tests/fixtures/smartphone-5.yml b/Tests/fixtures/smartphone-5.yml
index 2569ce2016..4b3ee76dc0 100644
--- a/Tests/fixtures/smartphone-5.yml
+++ b/Tests/fixtures/smartphone-5.yml
@@ -7858,6 +7858,26 @@
     model: Moto G
   os_family: Android
   browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 6.0; XT1069) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.136 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "74.0.3729.136"
+    engine: Blink
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: MR
+    model: Moto G
+  os_family: Android
+  browser_family: Chrome
 - 
   user_agent: Browse/0.6.mini (Linux 3.4.0+; RemixOS 6.0; Motorola Moto G 2014; en_us) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.119 Desktop
   os:
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
index a54d211f8c..a81795d3b9 100644
--- a/regexes/device/mobiles.yml
+++ b/regexes/device/mobiles.yml
@@ -6008,7 +6008,7 @@ Motorola:
       model: 'Droid Mini'
     - regex: '(?:MOT-|Motorola-)?XT1254'
       model: 'Droid Turbo'
-    - regex: '(?:MOT-|Motorola-)?XT10(?:28|3[1234]|68)'
+    - regex: '(?:MOT-|Motorola-)?XT10(?:28|3[1234]|68|69)'
       model: 'Moto G'
     - regex: '(?:MOT-|Motorola-)?XT10(?:49|5[23568]|60|9[23457])'
       model: 'Moto X'

From f392b3b10d418532f81b570354a59a32eee4e292 Mon Sep 17 00:00:00 2001
From: Greg ORIOL <greg@gregoriol.net>
Date: Mon, 13 May 2019 14:35:52 +0200
Subject: [PATCH 16/16] Fixed Neffos model and added Neffos X1 Lite

---
 Tests/fixtures/smartphone-5.yml | 20 ++++++++++++++++++++
 regexes/device/mobiles.yml      |  4 ++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/Tests/fixtures/smartphone-5.yml b/Tests/fixtures/smartphone-5.yml
index 4b3ee76dc0..2d1accab41 100644
--- a/Tests/fixtures/smartphone-5.yml
+++ b/Tests/fixtures/smartphone-5.yml
@@ -9617,6 +9617,26 @@
     model: X1
   os_family: Android
   browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 7.0; Neffos X1 Lite Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.84 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "7.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "62.0.3202.84"
+    engine: Blink
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: NF
+    model: X1 Lite
+  os_family: Android
+  browser_family: Chrome
 - 
   user_agent: Mozilla/5.0 (Linux; Android 7.0; Neffos X1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.121 Mobile Safari/537.36
   os:
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
index a81795d3b9..9bb866f6a2 100644
--- a/regexes/device/mobiles.yml
+++ b/regexes/device/mobiles.yml
@@ -6166,8 +6166,8 @@ Neffos:
   regex: 'Neffos'
   device: 'smartphone'
   models:
-    - regex: 'Neffos[_ ]((?:C|X)[0-9][A-Z]?(?: Max)?)'
-      model: '$1$2'
+    - regex: 'Neffos[_ ]((?:C|X)[0-9][A-Z]?(?: Max| Lite)?)'
+      model: '$1'
 
 # Nextbit
 Nextbit: