From 77227d7337a40863299a9b9be516f0430607a7ea Mon Sep 17 00:00:00 2001
From: Niels Basjes <niels@basjes.nl>
Date: Fri, 5 Mar 2021 11:48:14 +0100
Subject: [PATCH] Fixed Dell Streak 7

---
 CHANGELOG.md                                  |  1 +
 .../main/resources/UserAgents/Android.yaml    | 30 +++++++++++++++++++
 .../resources/UserAgents/EMailClients.yaml    |  2 ++
 3 files changed, 33 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76a52b5f94..f18d62d155 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ v5.23-SNAPSHOT
 ===
 - Analyzer
   - Updated the list of recognized Apple device ids.
+  - Fixed "Dell Streak 7"
 - Updated UDF dependencies
   - Apache Beam             2.28.0
 
diff --git a/analyzer/src/main/resources/UserAgents/Android.yaml b/analyzer/src/main/resources/UserAgents/Android.yaml
index 7bc476c14f..9ba21806f4 100644
--- a/analyzer/src/main/resources/UserAgents/Android.yaml
+++ b/analyzer/src/main/resources/UserAgents/Android.yaml
@@ -1883,3 +1883,33 @@ config:
       AgentLanguage                        : 'English (United States)'
       AgentLanguageCode                    : 'en-us'
       AgentSecurity                        : 'Strong security'
+
+- test:
+    input:
+      user_agent_string: 'Mozilla/5.0 (Linux; U; Android 3.2; es-es; Dell Streak 7 Build/HTJ85B) AppleWebKit/534.13 (KHTML like Gecko) Version/4.0 Safari/534.13'
+    expected:
+      DeviceClass                          : 'Tablet'
+      DeviceName                           : 'Dell Streak 7'
+      DeviceBrand                          : 'Dell'
+      OperatingSystemClass                 : 'Mobile'
+      OperatingSystemName                  : 'Android'
+      OperatingSystemVersion               : '3.2'
+      OperatingSystemVersionMajor          : '3'
+      OperatingSystemNameVersion           : 'Android 3.2'
+      OperatingSystemNameVersionMajor      : 'Android 3'
+      OperatingSystemVersionBuild          : 'HTJ85B'
+      LayoutEngineClass                    : 'Browser'
+      LayoutEngineName                     : 'AppleWebKit'
+      LayoutEngineVersion                  : '534.13'
+      LayoutEngineVersionMajor             : '534'
+      LayoutEngineNameVersion              : 'AppleWebKit 534.13'
+      LayoutEngineNameVersionMajor         : 'AppleWebKit 534'
+      AgentClass                           : 'Browser'
+      AgentName                            : 'Stock Android Browser'
+      AgentVersion                         : '4.0'
+      AgentVersionMajor                    : '4'
+      AgentNameVersion                     : 'Stock Android Browser 4.0'
+      AgentNameVersionMajor                : 'Stock Android Browser 4'
+      AgentLanguage                        : 'Spanish (Spain)'
+      AgentLanguageCode                    : 'es-es'
+      AgentSecurity                        : 'Strong security'
diff --git a/analyzer/src/main/resources/UserAgents/EMailClients.yaml b/analyzer/src/main/resources/UserAgents/EMailClients.yaml
index 768d662c6f..951c82dcbb 100644
--- a/analyzer/src/main/resources/UserAgents/EMailClients.yaml
+++ b/analyzer/src/main/resources/UserAgents/EMailClients.yaml
@@ -1569,6 +1569,8 @@ config:
 
 
 - matcher:
+    require:
+    - 'agent.(1-3)product.comments.entry.(1-4)product.name[1]="Desktop"'
     variable:
     - 'Dell                                :agent.(1-3)product.comments.entry.(1-4)product.name[1]="Dell"@'
     extract: