From 608cb84b975fd9ffa912e6ef6de2cefdc6f96ab2 Mon Sep 17 00:00:00 2001
From: Tutik Alexsandr <sanchezzzhak@ya.ru>
Date: Fri, 18 Feb 2022 22:49:22 +0300
Subject: [PATCH] feat(device) detect new brand Jedi: Remix Mini, Remix Pro
 (#6999)

feat(os) improvements detection RemixOs

issue #6745

Co-authored-by: Stefan Giehl <stefan@matomo.org>
---
 Parser/Device/AbstractDeviceParser.php |  1 +
 Tests/fixtures/desktop.yml             | 18 +++++++++++++++++
 regexes/device/mobiles.yml             | 11 +++++++++++
 regexes/oss.yml                        | 27 +++++++++++++-------------
 4 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php
index db6a588182..69e9f9b00a 100644
--- a/Parser/Device/AbstractDeviceParser.php
+++ b/Parser/Device/AbstractDeviceParser.php
@@ -577,6 +577,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'I9' => 'iZotron',
         'JA' => 'JAY-Tech',
         'KJ' => 'Jiake',
+        'JD' => 'Jedi',
         'J6' => 'Jeka',
         'JF' => 'JFone',
         'JI' => 'Jiayu',
diff --git a/Tests/fixtures/desktop.yml b/Tests/fixtures/desktop.yml
index fdd1be5112..d0d1740b90 100644
--- a/Tests/fixtures/desktop.yml
+++ b/Tests/fixtures/desktop.yml
@@ -8487,3 +8487,21 @@
     model: iMac 21.5" (2010)
   os_family: Mac
   browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 5.1; Remix Mini) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.105 Safari/537.36
+  os:
+    name: Remix OS
+    version: "2"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    version: 89.0.4389.105
+    engine: Blink
+    engine_version: ""
+  device:
+    type: desktop
+    brand: Jedi
+    model: Remix Mini
+  os_family: Android
+  browser_family: Chrome
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
index 19e33f1542..c140548886 100644
--- a/regexes/device/mobiles.yml
+++ b/regexes/device/mobiles.yml
@@ -27958,6 +27958,17 @@ Massgo:
     - regex: 'Massgo[ _]([^/;)]+)(?: Build|[);])'
       model: '$1'
 
+# Jedi
+Jedi:
+  regex: 'Remix (?:Pro|Mini)'
+  device: 'desktop'
+  models:
+    - regex: 'Remix Pro'
+      device: 'tablet'
+      model: 'Remix Pro'
+    - regex: 'Remix Mini'
+      model: 'Remix Mini'
+
 # Technopc (en.technopc.com.tr)
 Technopc:
   regex: 'UP10SI[34]6LA(?:[);/ ]|$)'
diff --git a/regexes/oss.yml b/regexes/oss.yml
index 9dc58d0b0b..d44efcd7c5 100644
--- a/regexes/oss.yml
+++ b/regexes/oss.yml
@@ -150,6 +150,19 @@
   name: 'FydeOS'
   version: ''
 
+##########
+# Remix OS
+##########
+- regex: 'RemixOS|Remix (?:Pro|Mini)'
+  name: 'Remix OS'
+  versions:
+    - regex: 'RemixOS 5'
+      version: '1'
+    - regex: 'RemixOS 6|Remix Mini'
+      version: '2'
+    - regex: 'Remix Pro'
+      version: '3'
+
 ##########
 # Android
 ##########
@@ -1045,20 +1058,6 @@
   name: 'WebTV'
   version: '$1'
 
-##########
-# Remix OS
-##########
-- regex: 'RemixOS 5.1.1'
-  name: 'Remix OS'
-  version: '1'
-
-- regex: 'RemixOS 6.0'
-  name: 'Remix OS'
-  version: '2'
-
-- regex: 'RemixOS'
-  name: 'Remix OS'
-  version: ''
 
 ##########
 # Unix