From ad96be8fa78c7d3f947d30c5ae750176ab97d339 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 28 May 2014 10:25:53 -0400
Subject: [PATCH] add device id to reporting

---
 .../Security/UsageReporter.cs                     |  1 +
 .../EntryPoints/UsageEntryPoint.cs                | 15 +++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/MediaBrowser.Common.Implementations/Security/UsageReporter.cs b/MediaBrowser.Common.Implementations/Security/UsageReporter.cs
index c32acd25b6..0e3b0e210f 100644
--- a/MediaBrowser.Common.Implementations/Security/UsageReporter.cs
+++ b/MediaBrowser.Common.Implementations/Security/UsageReporter.cs
@@ -50,5 +50,6 @@ namespace MediaBrowser.Common.Implementations.Security
         public string AppName { get; set; }
         public string AppVersion { get; set; }
         public string DeviceVersion { get; set; }
+        public string DeviceId { get; set; }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/UsageEntryPoint.cs b/MediaBrowser.Server.Implementations/EntryPoints/UsageEntryPoint.cs
index 5f5d5d9012..98b9b2ae91 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/UsageEntryPoint.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/UsageEntryPoint.cs
@@ -45,13 +45,15 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             var session = e.SessionInfo;
 
             if (!string.IsNullOrEmpty(session.Client) &&
-                !string.IsNullOrEmpty(session.DeviceName))
+                !string.IsNullOrEmpty(session.DeviceName) &&
+                !string.IsNullOrEmpty(session.DeviceId))
             {
                 var keys = new List<string>
-            {
-                session.Client,
-                session.DeviceName
-            };
+                {
+                    session.Client,
+                    session.DeviceName,
+                    session.DeviceId
+                };
 
                 if (!string.IsNullOrEmpty(session.DeviceVersion))
                 {
@@ -88,7 +90,8 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             {
                 AppName = session.Client,
                 AppVersion = session.ApplicationVersion,
-                DeviceVersion = session.DeviceVersion
+                DeviceVersion = session.DeviceVersion,
+                DeviceId = session.DeviceId
             };
 
             if (string.IsNullOrEmpty(info.DeviceVersion))