device_detector 1.1.0 → 1.1.1

data/lib/device_detector/device.rb

@@ -22,6 +22,7 @@ class DeviceDetector
 
     DEVICE_BRANDS = {
       '5E' => '2E',
+      '5IV' => '5IVE',
       '2F' => 'F2 Mobile',
       '3Q' => '3Q',
       'J7' => '7 Mobile',
@@ -31,22 +32,27 @@ class DeviceDetector
       '04' => '4ife',
       '36' => '360',
       '88' => '8848',
+      '10M' => '10moons',
       '41' => 'A1',
       '00' => 'Accent',
+      'ACC' => 'Accesstyle',
       'AE' => 'Ace',
       'AC' => 'Acer',
       '3K' => 'Acteck',
       'ACT' => 'actiMirror',
       'A9' => 'Advan',
       'AD' => 'Advance',
+      'ADV' => 'Advantage Air',
       '76' => 'Adronix',
       'AF' => 'AfriOne',
       'FY' => 'AFFIX',
       'A3' => 'AGM',
+      'AEE' => 'AEEZO',
       'J0' => 'AG Mobile',
       'AZ' => 'Ainol',
       'AIR' => 'Airis',
       'AI' => 'Airness',
+      'ARP' => 'Airpha',
       'AT' => 'Airties',
       '7U' => 'Airtel',
       'U0' => 'AIRON',
@@ -60,6 +66,7 @@ class DeviceDetector
       'AL' => 'Alcatel',
       '20' => 'Alcor',
       'XY' => 'Alps',
+      'XYA' => 'XY Auto',
       '7L' => 'ALDI NORD',
       '6L' => 'ALDI SÜD',
       '3L' => 'Alfawise',
@@ -67,17 +74,20 @@ class DeviceDetector
       'AA' => 'AllCall',
       '3A' => 'AllDocube',
       'A2' => 'Allview',
+      'ALI' => 'ALLINmobile',
       'A7' => 'Allwinner',
       'A1' => 'Altech UEC',
       '66' => 'Altice',
       'A5' => 'altron',
       'KN' => 'Amazon',
+      'AMA' => 'AMA',
       'AG' => 'AMGOO',
       '9A' => 'Amigoo',
       'AO' => 'Amoi',
       '3J' => 'Amino',
       '54' => 'AMCV',
       '60' => 'Andowl',
+      'ANX' => 'ANXONIT',
       '6J' => 'Angelcare',
       '7A' => 'Anry',
       'A0' => 'ANS',
@@ -105,6 +115,7 @@ class DeviceDetector
       '1U' => 'Astro',
       'A4' => 'Ask',
       'A8' => 'Assistant',
+      'ASS' => 'ASSE',
       'AU' => 'Asus',
       '6A' => 'AT&T',
       'ATH' => 'Athesi',
@@ -113,6 +124,7 @@ class DeviceDetector
       '2A' => 'Atom',
       'ATO' => 'ATOL',
       'Z2' => 'Atvio',
+      'ATI' => 'Attila',
       'AX' => 'Audiovox',
       'AJ' => 'AURIS',
       'YZ' => 'Autan',
@@ -128,13 +140,16 @@ class DeviceDetector
       'WW' => 'Awow',
       'XU' => 'AUX',
       'BAC' => 'Backcell',
+      'BFF' => 'BAFF',
       'BO' => 'BangOlufsen',
       'BN' => 'Barnes & Noble',
+      'BAR' => 'BARTEC',
       'BB' => 'BBK',
       '0B' => 'BB Mobile',
       'B6' => 'BDF',
       'QD' => 'BDQ',
       '8Z' => 'BDsharing',
+      'BEF' => 'Beafon',
       'BE' => 'Becker',
       'B5' => 'Beeline',
       'B0' => 'Beelink',
@@ -144,6 +159,7 @@ class DeviceDetector
       'BS' => 'BenQ-Siemens',
       '4Y' => 'Benzo',
       'XJ' => 'Benesse',
+      'BEN' => 'BenWee',
       'YB' => 'Beista',
       'BY' => 'BS Mobile',
       'BZ' => 'Bezkam',
@@ -163,10 +179,12 @@ class DeviceDetector
       'BK' => 'Bkav',
       '5B' => 'Black Bear',
       'BF' => 'Black Fox',
+      'BPC' => 'Blackpcs',
       'B2' => 'Blackview',
       '2Y' => 'b2m',
       'BP' => 'Blaupunkt',
       'BU' => 'Blu',
+      'BUS' => 'BluSlate',
       'BUZ' => 'BuzzTV',
       'B3' => 'Bluboo',
       '2B' => 'Bluedot',
@@ -180,14 +198,19 @@ class DeviceDetector
       'BLI' => 'BLISS',
       'BM' => 'Bmobile',
       'Y5' => 'BMAX',
+      'BMX' => 'BMXC',
       'B9' => 'Bobarry',
       'B4' => 'bogo',
+      'BOL' => 'Bolva',
       'BW' => 'Boway',
       'BOO' => 'Boost',
+      'BOK' => 'Bookeen',
       'BX' => 'bq',
       '8B' => 'Brandt',
       'BRA' => 'BrandCode',
       'BV' => 'Bravis',
+      'BRV' => 'BRAVE',
+      'BRG' => 'Brigmton',
       'BR' => 'Brondi',
       'XF' => 'BROR',
       'BJ' => 'BrightSign',
@@ -207,6 +230,7 @@ class DeviceDetector
       'BC' => 'Camfone',
       'CJ' => 'Cavion',
       '4D' => 'Canal Digital',
+      'CNG' => 'Canguro',
       'CEI' => 'Ceibal',
       '02' => 'Cell-C',
       'CEL' => 'Cellacom',
@@ -223,6 +247,7 @@ class DeviceDetector
       'U9' => 'China Telecom',
       'CI' => 'Chico Mobile',
       'CIP' => 'CipherLab',
+      'CIT' => 'Citycall',
       '1C' => 'Chuwi',
       'L8' => 'Clarmin',
       '25' => 'Claresta',
@@ -246,6 +271,7 @@ class DeviceDetector
       '3C' => 'Contixo',
       '8C' => 'Connex',
       '53' => 'Connectce',
+      'CON' => 'Conceptum',
       '9C' => 'Colors',
       'CO' => 'Coolpad',
       'COO' => 'Coopers',
@@ -263,13 +289,16 @@ class DeviceDetector
       '0C' => 'Crony',
       'C1' => 'Crosscall',
       '4W' => 'Crown',
+      'CTR' => 'Ctroniq',
       'CU' => 'Cube',
       'CB' => 'CUBOT',
       'CV' => 'CVTE',
+      'CWO' => 'Cwowdefu',
       'C4' => 'Cyrus',
       'D5' => 'Daewoo',
       'DA' => 'Danew',
       'DAN' => 'Dany',
+      'DA1' => 'DangcapHD',
       'DT' => 'Datang',
       'D7' => 'Datawind',
       '7D' => 'Datamini',
@@ -284,9 +313,12 @@ class DeviceDetector
       'DL0' => 'DL',
       'DE' => 'Denver',
       'DS' => 'Desay',
+      'DSI' => 'DSIC',
       'DW' => 'DeWalt',
       'DX' => 'DEXP',
+      'DEY' => 'DEYI',
       'DEN' => 'Denali',
+      'DEA' => 'DEALDIG',
       '8D' => 'DF',
       'DGT' => 'DGTEC',
       'DG' => 'Dialog',
@@ -296,16 +328,19 @@ class DeviceDetector
       'DDG' => 'Digidragon',
       'DH' => 'Digihome',
       'DD' => 'Digiland',
+      'DIJ' => 'DIJITSU',
       'DIG' => 'Digit4G',
       'DIC' => 'DIGICOM',
       'Q0' => 'DIGIFORS',
       'DQ' => 'DISH',
+      'DIS' => 'Disney',
       '9D' => 'Ditecma',
       'D2' => 'Digma',
       '1D' => 'Diva',
       'DIV' => 'DiverMax',
       'D6' => 'Divisat',
       'X6' => 'DIXON',
+      'DIM' => 'DIMO',
       '5D' => 'DING DING',
       'DIN' => 'Dinax',
       'DM' => 'DMM',
@@ -318,21 +353,26 @@ class DeviceDetector
       'DV' => 'Doov',
       'DOM' => 'Dom.ru',
       'DP' => 'Dopod',
+      'DPA' => 'DPA',
       'JQ' => 'Doppio',
       'DR' => 'Doro',
       'ZD' => 'DORLAND',
       'D8' => 'Droxio',
       'DJ' => 'Dragon Touch',
+      'DRA' => 'DRAGON',
       'DY' => 'Dreamgate',
       'DRE' => 'DreamTab',
       'DR1' => 'DreamStar',
       'DTA' => 'Dtac',
       'DU' => 'Dune HD',
       'UD' => 'DUNNS Mobile',
+      'DUU' => 'Duubee',
+      'DUR' => 'Durabook',
       'DTE' => 'D-Tech',
       'DLI' => 'D-Link',
       'ENO' => 'eNOVA',
       'IN2' => 'iNOVA',
+      'INH' => 'Inhon',
       'EB' => 'E-Boda',
       'EJ' => 'Engel',
       'ENA' => 'ENACOM',
@@ -358,6 +398,7 @@ class DeviceDetector
       'UE' => 'Ematic',
       'EMR' => 'Emporia',
       '4K' => 'EKT',
+      'EKI' => 'EKINOX',
       '7E' => 'ELARI',
       '03' => 'Electroneum',
       'Z8' => 'ELECTRONIA',
@@ -372,9 +413,12 @@ class DeviceDetector
       'ED' => 'Energizer',
       'E1' => 'Energy Sistem',
       '3E' => 'Enot',
+      'ENT' => 'Entity',
       'ENV' => 'Envizen',
       '8E' => 'Epik One',
+      'EPK' => 'Epic',
       'XP' => 'Epson',
+      'EPH' => 'Ephone',
       'E7' => 'Ergo',
       'EC' => 'Ericsson',
       '05' => 'Erisson',
@@ -389,6 +433,8 @@ class DeviceDetector
       '4J' => 'Eurocase',
       'E9' => 'Evercoss',
       'EV' => 'Evertek',
+      'EVE' => 'Everest',
+      'EV1' => 'Everex',
       'E3' => 'Evolio',
       'EO' => 'Evolveo',
       '0Q' => 'Evoo',
@@ -404,7 +450,9 @@ class DeviceDetector
       'EI' => 'Ezio',
       'EZ' => 'Ezze',
       'UF' => 'EYU',
+      'UE1' => 'UE',
       '5F' => 'F150',
+      'FPS' => 'F+',
       'F6' => 'Facebook',
       'FAC' => 'Facetel',
       'FA1' => 'Facime',
@@ -413,12 +461,14 @@ class DeviceDetector
       'FAM' => 'Famous',
       '17' => 'FarEasTone',
       '9R' => 'FaRao Pro',
+      'FAR' => 'Farassoo',
       'FB' => 'Fantec',
       'FE' => 'Fengxiang',
       'F7' => 'Fero',
       '67' => 'FEONAL',
       'FI' => 'FiGO',
       'J9' => 'FiGi',
+      'FIG' => 'Figgers',
       'F9' => 'FiiO',
       'F1' => 'FinePower',
       'FX' => 'Finlux',
@@ -427,6 +477,7 @@ class DeviceDetector
       'FIL' => 'FILIX',
       'FL' => 'Fly',
       'QC' => 'FLYCAT',
+      'FLU' => 'Fluo',
       'FN' => 'FNB',
       'FD' => 'Fondi',
       '0F' => 'Fourel',
@@ -437,8 +488,11 @@ class DeviceDetector
       'FR' => 'Forstar',
       'RF' => 'Fortis',
       'FO' => 'Foxconn',
+      'FOD' => 'FoxxD',
       'FJ' => 'FOODO',
+      'FOS' => 'FOSSiBOT',
       'FT' => 'Freetel',
+      'FRU' => 'Frunsi',
       'F4' => 'F&U',
       '1F' => 'FMT',
       'FPT' => 'FPT',
@@ -447,15 +501,22 @@ class DeviceDetector
       '4F' => 'Funai',
       '5J' => 'Fusion5',
       'FF' => 'Future Mobile Technology',
+      'FFF' => 'FFF SmartLife',
       'FW' => 'FNF',
+      'FXT' => 'Fxtec',
       'GT' => 'G-TiDE',
       'G9' => 'G-Touch',
+      'GFO' => 'Gfone',
+      'GTM' => 'GTMEDIA',
       '0G' => 'GFive',
       'GM' => 'Garmin-Asus',
       'GA' => 'Gateway',
       '99' => 'Galaxy Innovations',
+      'GA1' => 'Galactic',
+      'GAM' => 'Gamma',
       'GAZ' => 'Gazer',
       'GEA' => 'Geanee',
+      'GEN' => 'Geant',
       'GD' => 'Gemini',
       'GN' => 'General Mobile',
       '2G' => 'Genesis',
@@ -472,6 +533,7 @@ class DeviceDetector
       'GZ' => 'Ginzzu',
       '1G' => 'Gini',
       'GI' => 'Gionee',
+      'GIR' => 'GIRASOLE',
       'G4' => 'Globex',
       '38' => 'GLONYX',
       'U6' => 'Glofiish',
@@ -487,40 +549,51 @@ class DeviceDetector
       'GO' => 'Google',
       'G0' => 'Goophone',
       '6G' => 'Gooweel',
+      'GOO' => 'GOODTEL',
       '8G' => 'Gplus',
       'GR' => 'Gradiente',
       'GP' => 'Grape',
       'G6' => 'Gree',
+      'GRA' => 'Great Asia',
       '3G' => 'Greentel',
+      'GRO' => 'Green Orange',
+      'GR1' => 'GroBerwert',
       'GF' => 'Gretel',
       '82' => 'Gresso',
       'GU' => 'Grundig',
       'GV' => 'Gtel',
+      'CUO' => 'Guophone',
       'H13' => 'H133',
       '9Z' => 'H96',
       'HF' => 'Hafury',
       '9F' => 'HAOVM',
+      'HAQ' => 'HAOQIN',
       'HA' => 'Haier',
       'XH' => 'Haipai',
       'HAN' => 'Handheld',
       'HE' => 'HannSpree',
       'HK' => 'Hardkernel',
       'HAR' => 'Harper',
+      'HA1' => 'Hartens',
       'HS' => 'Hasee',
       '8H' => 'Hamlet',
       'HAM' => 'Hammer',
+      'HAT' => 'Hathway',
       'H6' => 'Helio',
       'HQ' => 'HERO',
       'ZH' => 'Hezire',
       'HEX' => 'HexaByte',
+      'HEW' => 'HeadWolf',
       'HL' => 'Hi-Level',
       '3H' => 'Hi',
+      'HIB' => 'Hiberg',
       'HIH' => 'HiHi',
       'HIK' => 'HiKing',
       'H2' => 'Highscreen',
       'Q1' => 'High Q',
       '1H' => 'Hipstreet',
       'HI' => 'Hisense',
+      'HIP' => 'HIPER',
       'HC' => 'Hitachi',
       'H8' => 'Hitech',
       'W3' => 'HiMax',
@@ -555,6 +628,7 @@ class DeviceDetector
       'HN' => 'Hyundai',
       '7H' => 'Hyve',
       'HYT' => 'Hytera',
+      'HYK' => 'Hykker',
       '3I' => 'i-Cherry',
       'IJ' => 'i-Joy',
       'IM' => 'i-mate',
@@ -564,12 +638,15 @@ class DeviceDetector
       'IB' => 'iBall',
       'IY' => 'iBerry',
       '7I' => 'iBrit',
+      'IBO' => 'ibowin',
       'I2' => 'IconBIT',
       'IC' => 'iDroid',
+      'IDI' => 'iDino',
       '6Z' => 'iData',
       'IG' => 'iGet',
       'IH' => 'iHunt',
       'IA' => 'Ikea',
+      'IYO' => 'iYou',
       '8I' => 'IKU Mobile',
       '2K' => 'IKI Mobile',
       'IK' => 'iKoMo',
@@ -579,6 +656,7 @@ class DeviceDetector
       '1I' => 'iMars',
       'IMI' => 'iMI',
       'U4' => 'iMan',
+      'ILE' => 'iLepo',
       'IL' => 'IMO Mobile',
       'IM1' => 'Imose',
       'I3' => 'Impression',
@@ -619,6 +697,7 @@ class DeviceDetector
       'IRE' => 'iReplace',
       'IR' => 'iRola',
       'IU' => 'iRulu',
+      'IRO' => 'iRobot',
       '9I' => 'iSWAG',
       '9J' => 'iSafe Mobile',
       'IST' => 'iStar',
@@ -645,6 +724,7 @@ class DeviceDetector
       'JR1' => 'JREN',
       'JO' => 'Jolla',
       'JP' => 'Joy',
+      'JOY' => 'JoySurf',
       'UJ' => 'Juniper Systems',
       'J5' => 'Just5',
       '7J' => 'Jumper',
@@ -653,29 +733,35 @@ class DeviceDetector
       'JXD' => 'JXD',
       'JS' => 'Jesy',
       'KT' => 'K-Touch',
+      'KLT' => 'K-Lite',
       'K4' => 'Kaan',
       'K7' => 'Kaiomy',
       'KL' => 'Kalley',
       'K6' => 'Kanji',
       'KA' => 'Karbonn',
       'K5' => 'KATV1',
+      'KAP' => 'Kapsys',
       'K0' => 'Kata',
       'KZ' => 'Kazam',
       '9K' => 'Kazuna',
       'KD' => 'KDDI',
+      'KHA' => 'Khadas',
       'KS' => 'Kempler & Strauss',
       'K3' => 'Keneksi',
       'KX' => 'Kenxinda',
       'KEN' => 'Kenbo',
+      'KZG' => 'KZG',
       'K1' => 'Kiano',
       '5W' => 'Kingbox',
       'KI' => 'Kingsun',
+      'KIS' => 'Kinstone',
       'KF' => 'KINGZONE',
       'KIN' => 'Kingstar',
       '46' => 'Kiowa',
       'KV' => 'Kivi',
       '64' => 'Kvant',
       '0K' => 'Klipad',
+      'KNM' => 'KN Mobile',
       'KC' => 'Kocaso',
       'KK' => 'Kodak',
       'KG' => 'Kogan',
@@ -692,8 +778,10 @@ class DeviceDetector
       'KE' => 'Krüger&Matz',
       '5K' => 'KREZ',
       'WK' => 'KRIP',
+      'KRA' => 'Kraft',
       'KH' => 'KT-Tech',
       'Z6' => 'KUBO',
+      'KUG' => 'KuGou',
       'K8' => 'Kuliao',
       '8K' => 'Kult',
       'KU' => 'Kumai',
@@ -708,10 +796,12 @@ class DeviceDetector
       'LA1' => 'Lanin',
       'LK' => 'Lark',
       'Z3' => 'Laurus',
+      'LEC' => 'Lectrus',
       'LV' => 'Lava',
       'LC' => 'LCT',
       'L5' => 'Leagoo',
       'U3' => 'Leben',
+      'LEB' => 'LeBest',
       'LD' => 'Ledstar',
       'LEE' => 'Leelbox',
       'L1' => 'LeEco',
@@ -731,8 +821,10 @@ class DeviceDetector
       'LG' => 'LG',
       '39' => 'Liberton',
       '5L' => 'Linsar',
+      'LIN' => 'Linsay',
       'LF' => 'Lifemaxx',
       'LI' => 'Lingwin',
+      'LIM' => 'Lime',
       'LJ' => 'L-Max',
       'LW' => 'Linnex',
       'JJ' => 'Listo',
@@ -744,6 +836,7 @@ class DeviceDetector
       'LH' => 'Logic Instrument',
       'LM' => 'Logicom',
       'GY' => 'LOKMAT',
+      'LPX' => 'LPX-G',
       '0L' => 'Lumigon',
       'LU' => 'Lumus',
       'LUM' => 'Lumitel',
@@ -768,10 +861,13 @@ class DeviceDetector
       'J4' => 'Mara',
       'MAR' => 'Marshal',
       '8Y' => 'Massgo',
+      'MA1' => 'Mascom',
       '2M' => 'Masstel',
       '3X' => 'Mastertech',
+      'MAS' => 'Master-G',
       '50' => 'Matrix',
       '7M' => 'Maxcom',
+      '7M1' => 'Maxfone',
       'ZM' => 'Maximus',
       '6X' => 'Maxtron',
       '0D' => 'MAXVI',
@@ -805,6 +901,7 @@ class DeviceDetector
       '6Q' => 'Microtech',
       '1X' => 'Minix',
       'OM' => 'Mintt',
+      'MIN' => 'Mint',
       'MO' => 'Mio',
       'X7' => 'Mione',
       'M7' => 'Miray',
@@ -814,20 +911,29 @@ class DeviceDetector
       'M5' => 'MIXC',
       '2D' => 'MIVO',
       '1Z' => 'MiXzo',
+      'MIW' => 'MIWANG',
       'ML' => 'MLLED',
       'LS' => 'MLS',
+      'MLA' => 'MLAB',
       '5H' => 'MMI',
       '4M' => 'Mobicel',
       'M6' => 'Mobiistar',
+      'MOK' => 'Mobile Kingdom',
       'MH' => 'Mobiola',
       'MB' => 'Mobistel',
       'ID' => 'MobiIoT',
       '6W' => 'MobiWire',
       '9M' => 'Mobo',
+      'MOB' => 'Mobell',
       'M4' => 'Modecom',
       'MF' => 'Mofut',
       'MR' => 'Motorola',
+      'MIV' => 'Motiv',
       'MV' => 'Movic',
+      'MOV' => 'Movitel',
+      'MO1' => 'MOVISUN',
+      'MOS' => 'Mosimosi',
+      'MOX' => 'Moxee',
       'MM' => 'Mpman',
       'MZ' => 'MSI',
       '3R' => 'MStar',
@@ -836,6 +942,7 @@ class DeviceDetector
       '72' => 'M-Tech',
       '9H' => 'M-Horse',
       '1R' => 'Multilaser',
+      'MPS' => 'MultiPOS',
       '1M' => 'MYFON',
       'MY' => 'MyPhone',
       '51' => 'Myros',
@@ -846,6 +953,8 @@ class DeviceDetector
       'J3' => 'Mymaga',
       'MYM' => 'MyMobile',
       '07' => 'MyGica',
+      'MYG' => 'MygPad',
+      'MWA' => 'MwalimuPlus',
       'NEO' => 'neoCore',
       '08' => 'Nabi',
       'N7' => 'National',
@@ -856,15 +965,20 @@ class DeviceDetector
       '7R' => 'NavRoad',
       'NAS' => 'NASCO',
       'NP' => 'Naomi Phone',
+      'NAN' => 'Nanho',
       'NE' => 'NEC',
+      'NDP' => 'Nedaphone',
       '8N' => 'Necnot',
       'NF' => 'Neffos',
       '9X' => 'Neo',
+      'NEK' => 'NEKO',
       '1N' => 'Neomi',
       '7Q' => 'Neon IQ',
       '8F' => 'Neolix',
       'NA' => 'Netgear',
+      'NEM' => 'Netmak',
       'NU' => 'NeuImage',
+      'NEU' => 'NeuTab',
       'NW' => 'Newgen',
       'N9' => 'Newland',
       '0N' => 'Newman',
@@ -884,6 +998,7 @@ class DeviceDetector
       'NJO' => 'nJoy',
       'NG' => 'NGM',
       'NZ' => 'NG Optics',
+      'NZP' => 'NGpon',
       'NN' => 'Nikon',
       'NI' => 'Nintendo',
       'NIN' => 'NINETEC',
@@ -891,6 +1006,7 @@ class DeviceDetector
       'N1' => 'Noain',
       'N6' => 'Nobby',
       'NOV' => 'Novey',
+      'NO1' => 'NOVO',
       '57' => 'Nubia',
       'JN' => 'NOBUX',
       'NB' => 'Noblex',
@@ -905,9 +1021,11 @@ class DeviceDetector
       '5N' => 'Nos',
       'NO' => 'Nous',
       'NQ' => 'Novex',
+      'NOD' => 'noDROPOUT',
       'NJ' => 'NuAns',
       'NL' => 'NUU Mobile',
       'N0' => 'Nuvo',
+      'NUV' => 'NuVision',
       'NV' => 'Nvidia',
       'NY' => 'NYX Mobile',
       'O3' => 'O+',
@@ -915,15 +1033,23 @@ class DeviceDetector
       'O7' => 'Oale',
       'OC' => 'OASYS',
       'OB' => 'Obi',
+      'OBR' => 'Ober',
       'OQ' => 'Meta',
       'O1' => 'Odys',
       'ODP' => 'Odotpad',
       'O9' => 'Ok',
       'OA' => 'Okapia',
+      'OKI' => 'Oking',
+      'OLA' => 'Olax',
+      'OLK' => 'Olkya',
+      'OLY' => 'Olympia',
+      'OLT' => 'OLTO',
       'OJ' => 'Ookee',
       'OD' => 'Onda',
       'ON' => 'OnePlus',
       'ONC' => 'OneClick',
+      'ONL' => 'OneLern',
+      'OAN' => 'Oangcc',
       'OX' => 'Onix',
       '3O' => 'ONYX BOOX',
       'O4' => 'ONN',
@@ -934,6 +1060,7 @@ class DeviceDetector
       'OP' => 'OPPO',
       'OO' => 'Opsson',
       'OPT' => 'Optoma',
+      'OPH' => 'Ophone',
       'OR' => 'Orange',
       'O5' => 'Orbic',
       'Y6' => 'Orbita',
@@ -952,6 +1079,7 @@ class DeviceDetector
       'OV' => 'Overmax',
       '30' => 'Ovvi',
       'O2' => 'Owwo',
+      'OSC' => 'OSCAL',
       'OY' => 'Oysters',
       'QF' => 'OYSIN',
       'O6' => 'Oyyu',
@@ -963,11 +1091,15 @@ class DeviceDetector
       'PN' => 'Panacom',
       'PA' => 'Panasonic',
       'PT' => 'Pantech',
+      'PAN' => 'Pano',
+      'PA1' => 'Panoramic',
+      'PLT' => 'Platoon',
       '94' => 'Packard Bell',
       'H9' => 'Parrot Mobile',
       'PAR' => 'Partner Mobile',
       'PAP' => 'PAPYRE',
       'PB' => 'PCBOX',
+      'PCS' => 'PC Smart',
       'PC' => 'PCD',
       'PD' => 'PCD Argentina',
       'PE' => 'PEAQ',
@@ -1011,8 +1143,10 @@ class DeviceDetector
       '3F' => 'Porsche',
       'P3' => 'PPTV',
       'FP' => 'Premio',
+      'PR1' => 'Premier',
       'PR' => 'Prestigio',
       'P9' => 'Primepad',
+      'PRM' => 'PRIME',
       '6P' => 'Primux',
       '2P' => 'Prixton',
       'PRI' => 'Pritom',
@@ -1025,6 +1159,7 @@ class DeviceDetector
       '7O' => 'Polestar',
       'PU' => 'PULID',
       'UP' => 'Purism',
+      'PUN' => 'Punos',
       'QFX' => 'QFX',
       'Q7' => 'Q-Box',
       'QH' => 'Q-Touch',
@@ -1035,6 +1170,7 @@ class DeviceDetector
       'Q9' => 'QTECH',
       'QA' => 'Quantum',
       'QUE' => 'Quest',
+      'QUA' => 'Quatro',
       'QU' => 'Quechua',
       'QUI' => 'Quipus',
       'QO' => 'Qumo',
@@ -1051,16 +1187,19 @@ class DeviceDetector
       'RAY' => 'Raylandz',
       'RC' => 'RCA Tablets',
       '2R' => 'Reach',
+      'REL' => 'RelNAT',
       'RB' => 'Readboy',
       'RE' => 'Realme',
       'RE1' => 'Redbean',
       'R8' => 'RED',
       'REW' => 'Redway',
       '6F' => 'Redfox',
+      'RE2' => 'RedLine',
       'RD' => 'Reeder',
       'Z9' => 'REGAL',
       'RH' => 'Remdun',
       'RP' => 'Revo',
+      'REV' => 'Revomovil',
       '8R' => 'Retroid Pocket',
       'RIC' => 'Ricoh',
       'RI' => 'Rikomagic',
@@ -1073,7 +1212,9 @@ class DeviceDetector
       'RIZ' => 'Rizzen',
       'RR' => 'Roadrover',
       'QR' => 'ROADMAX',
+      'ROC' => 'Roam Cat',
       'R1' => 'Rokit',
+      'ROI' => 'ROiK',
       'RK' => 'Roku',
       'R3' => 'Rombica',
       'R5' => 'Ross&Moor',
@@ -1083,23 +1224,32 @@ class DeviceDetector
       'RJ' => 'Royole',
       'RT' => 'RT Project',
       'RG' => 'RugGear',
+      'RUG' => 'Ruggex',
+      'RUT' => 'RuggeTech',
       'RU' => 'Runbo',
+      'RUP' => 'Rupa',
       'RL' => 'Ruio',
       'RY' => 'Ryte',
       'X5' => 'Saba',
       '8L' => 'S-TELL',
       '4O' => 'S2Tel',
       '89' => 'Seatel',
+      'SEW' => 'Sewoo',
+      'SE1' => 'SEEWO',
       'Y7' => 'Saiet',
       'X1' => 'Safaricom',
       'SG' => 'Sagem',
       '4L' => 'Salora',
       'SA' => 'Samsung',
+      'SAT' => 'Samtech',
+      'SAM' => 'Samtron',
       'SNA' => 'SNAMI',
       'S0' => 'Sanei',
       '12' => 'Sansui',
+      'SAK' => 'Sankey',
       'SQ' => 'Santin',
       'SY' => 'Sanyo',
+      'SAN' => 'SANY',
       'S9' => 'Savio',
       'Y4' => 'SCBC',
       'CZ' => 'Schneider',
@@ -1118,8 +1268,10 @@ class DeviceDetector
       'S6' => 'Senseit',
       'EW' => 'Senwa',
       '24' => 'Seeken',
+      'SEB' => 'SEBBE',
       '61' => 'Seuic',
       'SX' => 'SFR',
+      'SGI' => 'SGIN',
       'SH' => 'Sharp',
       'JU' => 'Shanling',
       '7S' => 'Shift Phones',
@@ -1140,6 +1292,9 @@ class DeviceDetector
       'GK' => 'SKG',
       'SW' => 'Sky',
       'SK' => 'Skyworth',
+      'SKY' => 'Skyline',
+      'SK1' => 'SkyStream',
+      'SKK' => 'SKK Mobile',
       '14' => 'Smadl',
       '19' => 'Smailo',
       'SR' => 'Smart Electronic',
@@ -1148,15 +1303,18 @@ class DeviceDetector
       '47' => 'SmartBook',
       '3B' => 'Smartab',
       '80' => 'SMARTEC',
+      'SM1' => 'Smartex',
       'SC' => 'Smartfren',
       'S7' => 'Smartisan',
       'JR' => 'Sylvania',
+      'SYH' => 'SYH',
       '3Y' => 'Smarty',
       'HH' => 'Smooth Mobile',
       '1Q' => 'Smotreshka',
       'SF' => 'Softbank',
       '9L' => 'SOLE',
       'JL' => 'SOLO',
+      'SOS' => 'SOSH',
       'SOD' => 'Soda',
       '16' => 'Solone',
       'OI' => 'Sonim',
@@ -1166,6 +1324,7 @@ class DeviceDetector
       '8S' => 'Soyes',
       '77' => 'SONOS',
       '68' => 'Soho Style',
+      'SOB' => 'SobieTech',
       'PK' => 'Spark',
       'FS' => 'SPC',
       '6S' => 'Spectrum',
@@ -1188,6 +1347,7 @@ class DeviceDetector
       '96' => 'STRONG',
       '69' => 'Stylo',
       '9S' => 'Sugar',
+      'SUR' => 'Surge',
       '06' => 'Subor',
       'SZ' => 'Sumvision',
       '0H' => 'Sunstech',
@@ -1195,15 +1355,21 @@ class DeviceDetector
       '5S' => 'Sunvell',
       '5Y' => 'Sunny',
       'W8' => 'SUNWIND',
+      'SBX' => 'SuperBOX',
       'SU' => 'SuperSonic',
       '79' => 'SuperTab',
       'S5' => 'Supra',
+      'SUP' => 'Supraim',
       'ZS' => 'Suzuki',
       '2J' => 'Sunmi',
+      'SUN' => 'Sunmax',
       '0W' => 'Swipe',
+      'SWI' => 'Switel',
       'SS' => 'SWISSMOBILITY',
       '1W' => 'Swisstone',
       'W7' => 'SWTV',
+      'SSK' => 'SSKY',
+      'SYC' => 'Syco',
       'SM' => 'Symphony',
       '4S' => 'Syrox',
       'TM' => 'T-Mobile',
@@ -1221,13 +1387,16 @@ class DeviceDetector
       'H4' => 'Technicolor',
       'TEA' => 'TeachTouch',
       'Z5' => 'Technika',
+      'TE1' => 'TechSmart',
       'TX' => 'TechniSat',
       'TT' => 'TechnoTrend',
       'TP' => 'TechPad',
+      'TPS' => 'TPS',
       '9E' => 'Techwood',
       '7F' => 'Technopc',
       'T7' => 'Teclast',
       'TB' => 'Tecno Mobile',
+      'TEC' => 'TecToy',
       '91' => 'TEENO',
       '2L' => 'Tele2',
       'TL' => 'Telefunken',
@@ -1237,10 +1406,12 @@ class DeviceDetector
       '65' => 'Telia',
       'TEL' => 'Telma',
       'PW' => 'Telpo',
+      'TLS' => 'TeloSystems',
       'TER' => 'Teracube',
       'TD' => 'Tesco',
       'TA' => 'Tesla',
       '9T' => 'Tetratab',
+      'TET' => 'TETC',
       'TZ' => 'teXet',
       '29' => 'Teknosa',
       'JZ' => 'TJC',
@@ -1263,11 +1434,14 @@ class DeviceDetector
       'T1' => 'Tolino',
       '0T' => 'Tone',
       'TY' => 'Tooky',
+      'TOO' => 'TOOGO',
       'T9' => 'Top House',
       'DK' => 'Topelotek',
       '42' => 'Topway',
       'TO' => 'Toplux',
       'TOD' => 'TOPDON',
+      'TOP' => 'TopDevice',
+      'TO2' => 'TOPSHOWS',
       '7T' => 'Torex',
       'TOR' => 'Torque',
       '6O' => 'TOSCIDO',
@@ -1306,17 +1480,21 @@ class DeviceDetector
       'UL' => 'Ulefone',
       'UA' => 'Umax',
       'UM' => 'UMIDIGI',
+      'UNT' => 'Unitech',
       'UZ' => 'Unihertz',
       '3Z' => 'UZ Mobile',
       'UX' => 'Unimax',
+      'UNQ' => 'Uniqcell',
       'US' => 'Uniscope',
       'UNI' => 'Unistrong',
       'U2' => 'UNIWA',
+      'UND' => 'Uniden',
       'UO' => 'Unnecto',
       'UNN' => 'Unnion Technologies',
       'UU' => 'Unonu',
       'UN' => 'Unowhy',
       'UY' => 'UNNO',
+      'UOO' => 'UOOGOU',
       'UNB' => 'Unblock Tech',
       'UK' => 'UTOK',
       '3U' => 'IUNI',
@@ -1330,6 +1508,7 @@ class DeviceDetector
       'VP' => 'Vargo',
       'VC' => 'Vankyo',
       'VAL' => 'VALEM',
+      'VAT' => 'VALTECH',
       'VB' => 'VC',
       'VN' => 'Venso',
       'VEN' => 'Venstar',
@@ -1341,9 +1520,12 @@ class DeviceDetector
       'VR' => 'Vernee',
       'VX' => 'Vertex',
       'VE' => 'Vertu',
+      'VET' => 'VETAS',
       'VL' => 'Verykool',
       'QV' => 'Verssed',
+      'VER' => 'Versus',
       'V8' => 'Vesta',
+      'VEK' => 'Vekta',
       'VT' => 'Vestel',
       '48' => 'Vexia',
       'V6' => 'VGO TEL',
@@ -1358,17 +1540,26 @@ class DeviceDetector
       'FV' => 'Vios',
       '0V' => 'Vipro',
       'ZV' => 'Virzo',
+      'VIP' => 'Viper',
       'VI' => 'Vitelcom',
+      'VIB' => 'ViBox',
       '8V' => 'Viumee',
       'V5' => 'Vivax',
+      'VIV' => 'VIVIMAGE',
       'VV' => 'Vivo',
       '6V' => 'VIWA',
+      'VII' => 'VIIPOO',
       'VID' => 'VIDA',
       'VZ' => 'Vizio',
+      'VIZ' => 'Vizmo',
+      'VIT' => 'Vityaz',
       '9V' => 'Vision Touch',
+      'VIL' => 'Visual Land',
       'VK' => 'VK Mobile',
       'JM' => 'v-mobile',
       'VHO' => 'V-HOPE',
+      'VHM' => 'V-HOME',
+      'VGE' => 'V-Gen',
       'V0' => 'VKworld',
       'VM' => 'Vodacom',
       'VF' => 'Vodafone',
@@ -1379,11 +1570,13 @@ class DeviceDetector
       '2V' => 'Vorke',
       '8U' => 'Vorcom',
       'JW' => 'Vortex',
+      'VOR' => 'Vormor',
       'V1' => 'Voto',
       'Z7' => 'VOX',
       'VO' => 'Voxtel',
       'VY' => 'Voyo',
       'VOL' => 'Völfen',
+      'VO1' => 'Volt',
       'VH' => 'Vsmart',
       'V9' => 'Vsun',
       'VU' => 'Vulcan',
@@ -1391,14 +1584,19 @@ class DeviceDetector
       'ZC' => 'VUCATIMES',
       'VUE' => 'Vue Micro',
       'WA' => 'Walton',
+      'WAF' => 'WAF',
+      'WAL' => 'Waltter',
+      'WHI' => 'White Mobile',
       'WM' => 'Weimei',
       'WE' => 'WellcoM',
       'W6' => 'WELLINGTON',
       'WD' => 'Western Digital',
       'WT' => 'Westpoint',
       'WAN' => 'Wanmukang',
+      'WA1' => 'WANSA',
       'WY' => 'Wexler',
       '3W' => 'WE',
+      'WEC' => 'Wecool',
       'WEE' => 'Weelikeit',
       'WP' => 'Wieppo',
       'W2' => 'Wigor',
@@ -1409,6 +1607,7 @@ class DeviceDetector
       '9W' => 'Winmax',
       'W5' => 'Winnovo',
       'WU' => 'Wintouch',
+      'WIS' => 'Winstar',
       'W0' => 'Wiseasy',
       '2W' => 'Wizz',
       'W4' => 'WIWA',
@@ -1421,13 +1620,16 @@ class DeviceDetector
       'WR' => 'Wortmann',
       'WX' => 'Woxter',
       'XQ' => 'X-AGE',
+      'XEL' => 'XElectron',
       'X3' => 'X-BO',
+      'XMO' => 'X-Mobile',
       'XT' => 'X-TIGI',
       'XV' => 'X-View',
       'X4' => 'X.Vision',
       'X88' => 'X88',
       'X96' => 'X96',
       '96Q' => 'X96Q',
+      'A95' => 'A95X',
       'XG' => 'Xgody',
       'QX' => 'XGIMI',
       'XL' => 'Xiaolajiao',
@@ -1439,13 +1641,21 @@ class DeviceDetector
       'XS' => 'Xshitou',
       '4X' => 'Xtouch',
       'X8' => 'Xtratech',
+      'XCR' => 'Xcruiser',
+      'XCO' => 'XCOM',
+      'XCL' => 'Xcell',
+      'XWA' => 'Xwave',
       'YD' => 'Yandex',
       'YA' => 'Yarvik',
       'Y2' => 'Yes',
+      'YES' => 'Yestel',
       'YE' => 'Yezz',
       'YG' => 'YEPEN',
+      'YEL' => 'YELLYOUTH',
       'YK' => 'Yoka TV',
       'YO' => 'Yota',
+      'YOU' => 'Youin',
+      'YO1' => 'Youwei',
       'YOO' => 'Yooz',
       'YT' => 'Ytone',
       'Y9' => 'YOTOPT',
@@ -1454,6 +1664,7 @@ class DeviceDetector
       'Y0' => 'YUHO',
       'YN' => 'Yuno',
       'YUN' => 'YUNDOO',
+      'YUS' => 'YunSong',
       'YUM' => 'YUMKEM',
       'YU' => 'Yuandao',
       'YS' => 'Yusun',
@@ -1461,8 +1672,10 @@ class DeviceDetector
       'YX' => 'Yxtel',
       '0Z' => 'Zatec',
       '2Z' => 'Zaith',
+      'ZAM' => 'Zamolxe',
       'ZEA' => 'Zealot',
       'PZ' => 'Zebra',
+      'ZE1' => 'Zeblaze',
       'ZE' => 'Zeemi',
       'WZ' => 'Zeeker',
       'ZN' => 'Zen',
@@ -1473,10 +1686,13 @@ class DeviceDetector
       'FZ' => 'ZIFRO',
       'ZX' => 'Ziox',
       'ZIK' => 'ZIK',
+      'ZIG' => 'Zigo',
       'ZIN' => 'Zinox',
       'ZO' => 'Zonda',
       'ZW' => 'Zonko',
       'ZP' => 'Zopo',
+      'ZOO' => 'ZoomSmart',
+      'ZO1' => 'Zoom',
       'ZT' => 'ZTE',
       'ZU' => 'Zuum',
       'ZY' => 'Zync',
@@ -1484,6 +1700,7 @@ class DeviceDetector
       'ZQ' => 'ZYQ',
       'Z4' => 'ZH&K',
       'OW' => 'öwn',
+      'WBF' => 'Webfleet',
 
       # legacy brands, might be removed in future versions
       'WB' => 'Web TV',
@@ -1507,11 +1724,24 @@ class DeviceDetector
     end
 
     def brand
-      regex_meta[:brand]
+      return regex_meta[:brand] if regex_meta[:brand] == 'Sony Ericsson'
+
+      brand = regex_meta[:regex_name] || regex_meta[:brand] || vendor_fragment.name || fix_for_x_music
+      return if brand == 'Unknown'
+
+      brand
     end
 
     private
 
+    def fix_for_x_music
+      user_agent&.include?('X-music Ⅲ') ? 'OneClick' : nil
+    end
+
+    def vendor_fragment
+      ::DeviceDetector::VendorFragment.new(user_agent)
+    end
+
     # The order of files needs to be the same as the order of device
     # parser classes used in the piwik project.
     def filenames