From 621a6d1524a4053725a54b9688364ea97958eefa Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 9 Jul 2018 09:04:47 -0400
Subject: [PATCH] adjust enum names for added browser types

---
 .../services/electronPlatformUtils.service.ts |  6 ++--
 src/enums/deviceType.ts                       | 31 +++++++++++++------
 src/misc/analytics.ts                         | 19 ++++++------
 src/services/api.service.ts                   |  9 ++++--
 4 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/src/electron/services/electronPlatformUtils.service.ts b/src/electron/services/electronPlatformUtils.service.ts
index dcd0224816d..14b1c270d65 100644
--- a/src/electron/services/electronPlatformUtils.service.ts
+++ b/src/electron/services/electronPlatformUtils.service.ts
@@ -31,14 +31,14 @@ export class ElectronPlatformUtilsService implements PlatformUtilsService {
         if (!this.deviceCache) {
             switch (process.platform) {
                 case 'win32':
-                    this.deviceCache = DeviceType.Windows;
+                    this.deviceCache = DeviceType.WindowsDesktop;
                     break;
                 case 'darwin':
-                    this.deviceCache = DeviceType.MacOs;
+                    this.deviceCache = DeviceType.MacOsDesktop;
                     break;
                 case 'linux':
                 default:
-                    this.deviceCache = DeviceType.Linux;
+                    this.deviceCache = DeviceType.LinuxDesktop;
                     break;
             }
         }
diff --git a/src/enums/deviceType.ts b/src/enums/deviceType.ts
index e3e2fecb923..6f8ddd21ac5 100644
--- a/src/enums/deviceType.ts
+++ b/src/enums/deviceType.ts
@@ -1,12 +1,23 @@
 export enum DeviceType {
-    Chrome = 2,
-    Firefox = 3,
-    Opera = 4,
-    Edge = 5,
-    Windows = 6,
-    MacOs = 7,
-    Linux = 8,
-    Vivaldi = 19,
-    Safari = 20,
-    Web = 21,
+    Android = 0,
+    iOS = 1,
+    ChromeExtension = 2,
+    FirefoxExtension = 3,
+    OperaExtension = 4,
+    EdgeExtension = 5,
+    WindowsDesktop = 6,
+    MacOsDesktop = 7,
+    LinuxDesktop = 8,
+    ChromeBrowser = 9,
+    FirefoxBrowser = 10,
+    OperaBrowser = 11,
+    EdgeBrowser = 12,
+    IEBrowser = 13,
+    UnknownBrowser = 14,
+    AndroidAmazon = 15,
+    UWP = 16,
+    SafariBrowser = 17,
+    VivaldiBrowser = 18,
+    VivaldiExtension = 19,
+    SafariExtension = 20,
 }
diff --git a/src/misc/analytics.ts b/src/misc/analytics.ts
index 7f9f565932d..37d665f72d6 100644
--- a/src/misc/analytics.ts
+++ b/src/misc/analytics.ts
@@ -9,16 +9,15 @@ import { DeviceType } from '../enums/deviceType';
 const GaObj = 'ga';
 
 export const AnalyticsIds = {
-    [DeviceType.Chrome]: 'UA-81915606-6',
-    [DeviceType.Firefox]: 'UA-81915606-7',
-    [DeviceType.Opera]: 'UA-81915606-8',
-    [DeviceType.Edge]: 'UA-81915606-9',
-    [DeviceType.Vivaldi]: 'UA-81915606-15',
-    [DeviceType.Safari]: 'UA-81915606-16',
-    [DeviceType.Windows]: 'UA-81915606-17',
-    [DeviceType.Linux]: 'UA-81915606-19',
-    [DeviceType.MacOs]: 'UA-81915606-18',
-    [DeviceType.Web]: 'UA-81915606-3',
+    [DeviceType.ChromeExtension]: 'UA-81915606-6',
+    [DeviceType.FirefoxExtension]: 'UA-81915606-7',
+    [DeviceType.OperaExtension]: 'UA-81915606-8',
+    [DeviceType.EdgeExtension]: 'UA-81915606-9',
+    [DeviceType.VivaldiExtension]: 'UA-81915606-15',
+    [DeviceType.SafariExtension]: 'UA-81915606-16',
+    [DeviceType.WindowsDesktop]: 'UA-81915606-17',
+    [DeviceType.LinuxDesktop]: 'UA-81915606-19',
+    [DeviceType.MacOsDesktop]: 'UA-81915606-18',
 };
 
 export class Analytics {
diff --git a/src/services/api.service.ts b/src/services/api.service.ts
index 162a410daec..7467cd0d07e 100644
--- a/src/services/api.service.ts
+++ b/src/services/api.service.ts
@@ -85,9 +85,12 @@ export class ApiService implements ApiServiceAbstraction {
         private logoutCallback: (expired: boolean) => Promise<void>) {
         const device = platformUtilsService.getDevice();
         this.deviceType = device.toString();
-        this.isWebClient = device === DeviceType.Web;
-        this.isDesktopClient = device === DeviceType.Windows || device === DeviceType.MacOs ||
-            device === DeviceType.Linux;
+        this.isWebClient = device === DeviceType.IEBrowser || device === DeviceType.ChromeBrowser ||
+            device === DeviceType.EdgeBrowser || device === DeviceType.FirefoxBrowser ||
+            device === DeviceType.OperaBrowser || device === DeviceType.SafariBrowser ||
+            device === DeviceType.UnknownBrowser || device === DeviceType.VivaldiBrowser;
+        this.isDesktopClient = device === DeviceType.WindowsDesktop || device === DeviceType.MacOsDesktop ||
+            device === DeviceType.LinuxDesktop;
     }
 
     setUrls(urls: EnvironmentUrls): void {