Merge branch 'master' into lbarthon/mullvad-browser

regexes.yaml

@@ -217,7 +217,7 @@ user_agent_parsers:
     family_replacement: 'Twitter'
 
   # Phantom app
-  - regex: 'Mozilla.{1,200}Mobile.{1,100}(Phantom\/ios|android).(\d+)\.(\d+)\.(\d+)'
+  - regex: 'Mozilla.{1,200}Mobile.{1,100}(Phantom\/ios|Phantom\/android).(\d+)\.(\d+)\.(\d+)'
     family_replacement: 'Phantom'
 
   # aspiegel.com spider (owned by Huawei, later called PetalBot)
@@ -457,6 +457,12 @@ user_agent_parsers:
   - regex: '(Tenta/)(\d+)\.(\d+)\.(\d+)'
     family_replacement: 'Tenta Browser'
 
+  # Ecosia on iOS / Android
+  - regex: '(Ecosia) ios@(\d+)\.(\d+)\.(\d+)\.(\d+)'
+    family_replacement: 'Ecosia iOS'
+  - regex: '(Ecosia) android@(\d+)\.(\d+)\.(\d+)\.(\d+)'
+    family_replacement: 'Ecosia Android'
+
   # Chrome Mobile
   - regex: 'Version/.{1,300}(Chrome)/(\d+)\.(\d+)\.(\d+)\.(\d+)'
     family_replacement: 'Chrome Mobile WebView'

tests/test_ua.yaml

@@ -8682,8 +8682,20 @@ test_cases:
     minor: '2'
     patch: '1'
 
+  - user_agent_string: 'Mozilla/5.0 (iPhone; CPU iPhone OS 16_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 Safari/605.1.15 (Ecosia [email protected])'
+    family: 'Ecosia iOS'
+    major: '8'
+    minor: '1'
+    patch: '3'
+
+  - user_agent_string: 'Mozilla/5.0 (Linux; Android 9; Redmi 8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.41 Mobile Safari/537.36 (Ecosia [email protected])'
+    family: 'Ecosia Android'
+    major: '101'
+    minor: '0'
+    patch: '4951'
+
   - user_agent_string: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 MullvadBrowser/102.13.0'
     family: 'MullvadBrowser'
     major: '102'
     minor: '13'
-    patch: '0'
+    patch: '0'