From a2bdee74c6802947acf4b52910b01bd21576d355 Mon Sep 17 00:00:00 2001
From: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
Date: Fri, 21 Jun 2024 10:00:00 +0200
Subject: [PATCH] Adds detection for Gmail and Spicebird (#7712)

* Adds detection for Spicebird
* Improves detection for Spice brand
* Adds detection for Gmail
---
 Tests/Parser/Client/fixtures/pim.yml | 12 ++++++++++++
 Tests/fixtures/desktop.yml           | 16 ++++++++++++++++
 regexes/client/pim.yml               | 10 ++++++++++
 regexes/device/mobiles.yml           |  2 +-
 4 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/Tests/Parser/Client/fixtures/pim.yml b/Tests/Parser/Client/fixtures/pim.yml
index a5c87d5718..42eb58d900 100644
--- a/Tests/Parser/Client/fixtures/pim.yml
+++ b/Tests/Parser/Client/fixtures/pim.yml
@@ -275,3 +275,15 @@
     type: pim
     name: mailapp
     version: 6.5.0
+-
+  user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.2pre) Gecko/2009031304 Spicebird/0.7.1
+  client:
+    type: pim
+    name: Spicebird
+    version: 0.7.1
+-
+  user_agent: Android-Gmail/64562652 (sw411dp; 420dpi) (r7 TP1A.220624.014)
+  client:
+    type: pim
+    name: Gmail
+    version: ""
diff --git a/Tests/fixtures/desktop.yml b/Tests/fixtures/desktop.yml
index e110d7897b..6be80092c8 100644
--- a/Tests/fixtures/desktop.yml
+++ b/Tests/fixtures/desktop.yml
@@ -9727,3 +9727,19 @@
     model: Engage One Pro AIO
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.2pre) Gecko/2009031304 Spicebird/0.7.1
+  os:
+    name: GNU/Linux
+    version: ""
+    platform: x86
+  client:
+    type: pim
+    name: Spicebird
+    version: 0.7.1
+  device:
+    type: desktop
+    brand: ""
+    model: ""
+  os_family: GNU/Linux
+  browser_family: Unknown
diff --git a/regexes/client/pim.yml b/regexes/client/pim.yml
index 46e1347ccd..43f7c0a77a 100644
--- a/regexes/client/pim.yml
+++ b/regexes/client/pim.yml
@@ -27,6 +27,11 @@
   name: 'Thunderbird'
   version: '$1'
 
+# Spicebird (http://www.spicebird.org/)
+- regex: 'Spicebird/(\d+\.[\.\d]+)'
+  name: 'Spicebird'
+  version: '$1'
+
 - regex: 'Airmail(?: (\d+[\.\d]+))?'
   name: 'Airmail'
   version: '$1'
@@ -155,3 +160,8 @@
 - regex: 'mailapp/(\d+\.[\.\d]+)'
   name: 'mailapp'
   version: '$1'
+
+# Gmail
+- regex: 'Android-Gmail'
+  name: 'Gmail'
+  version: ''
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
index a38231467f..7210281d0d 100644
--- a/regexes/device/mobiles.yml
+++ b/regexes/device/mobiles.yml
@@ -23793,7 +23793,7 @@ Sigma:
 
 # Spice
 Spice:
-  regex: '(?<![\d];)Spice|(?:Xlife[-_ ](?:\d+Q?|Victor5|M5q\+|M5 Pro|Proton5|Electro55HD))(?:[);/ ]|$)'
+  regex: '(?<![\d];)Spice(?!bird)|(?:Xlife[-_ ](?:\d+Q?|Victor5|M5q\+|M5 Pro|Proton5|Electro55HD))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(?:Spice_)?Xlife[-_ ](\d+Q?|M5\+)(?:[);/ ]|$)'