From 7c34d228e689e228bf9b55915c4885052fd84e94 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 2 May 2015 19:00:19 -0400
Subject: [PATCH] add mobile app connection manager fixes

---
 dashboard-ui/nowplaying.html                |  2 +-
 dashboard-ui/scripts/site.js                | 31 +++++++++++++++------
 dashboard-ui/thirdparty/apiclient/device.js |  9 ++++--
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/dashboard-ui/nowplaying.html b/dashboard-ui/nowplaying.html
index 5fb4ea5d54..dfe1c9a887 100644
--- a/dashboard-ui/nowplaying.html
+++ b/dashboard-ui/nowplaying.html
@@ -16,7 +16,7 @@
         <div data-role="content" style="padding: 1em 0;">
 
             <div style="text-align: center;">
-                <div class="tabNowPlaying tabContent">
+                <div class="tabNowPlaying tabContent" style="display:none;">
                     <div class="itemName" style="line-height: normal;"></div>
                     <div class="nowPlayingPageImage" style="margin: 1em 0;"></div>
                     <div>
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index a3cf7344f5..43493937ae 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1377,20 +1377,34 @@ var Dashboard = {
         }
 
         var appVersion = window.dashboardVersion;
-        var appName = "Emby Mobile";
+        var appName = Dashboard.isConnectMode() ?
+            "Emby Mobile" :
+            "Emby Web Client";
+
         var deviceName;
         var deviceId;
 
         // Cordova
-        if (window.device) {
+        //if (window.device) {
 
-            deviceName = device.model;
-            deviceId = device.uuid;
+        //    deviceName = device.model;
+        //    deviceId = device.uuid;
 
-        } else {
+        //}
+        //else
+        {
 
             deviceName = generateDeviceName();
-            deviceId = MediaBrowser.generateDeviceId();
+
+            var seed = [];
+            var keyName = 'randomId';
+
+            if (Dashboard.isRunningInCordova()) {
+                seed.push('cordova');
+                keyName = 'cordovaDeviceId';
+            }
+
+            deviceId = MediaBrowser.generateDeviceId(keyName, seed.join(','));
         }
 
         return {
@@ -1445,6 +1459,7 @@ var Dashboard = {
                     initializeApiClient(ApiClient);
 
                     ConnectionManager.addApiClient(ApiClient, true).fail(Dashboard.logout);
+
                 } else {
 
                     Dashboard.logout();
@@ -1464,9 +1479,9 @@ var Dashboard = {
         }
 
         if (window.ApiClient) {
-            Dashboard.importCss(ApiClient.getUrl('Branding/Css'));
-
             ApiClient.getDefaultImageQuality = Dashboard.getDefaultImageQuality;
+
+            Dashboard.importCss(ApiClient.getUrl('Branding/Css'));
         }
     }
 
diff --git a/dashboard-ui/thirdparty/apiclient/device.js b/dashboard-ui/thirdparty/apiclient/device.js
index 5ccb626cc5..2e2afd9d3c 100644
--- a/dashboard-ui/thirdparty/apiclient/device.js
+++ b/dashboard-ui/thirdparty/apiclient/device.js
@@ -4,23 +4,26 @@
         globalScope.MediaBrowser = {};
     }
 
-    globalScope.MediaBrowser.generateDeviceId = function () {
+    globalScope.MediaBrowser.generateDeviceId = function (keyName, seed) {
 
         var keys = [];
 
         keys.push(navigator.userAgent);
         keys.push((navigator.cpuClass || ""));
 
+        if (seed) {
+            keys.push(seed);
+        }
         var randomId = '';
 
         //  Since the above is not guaranteed to be unique per device, add a little more
-        randomId = store.getItem('randomId');
+        randomId = store.getItem(keyName);
 
         if (!randomId) {
 
             randomId = new Date().getTime();
 
-            store.setItem('randomId', randomId.toString());
+            store.setItem(keyName, randomId.toString());
         }
 
         keys.push(randomId);