diff options
3 files changed, 6 insertions, 24 deletions
diff --git a/MediaBrowser.Common.Implementations/Security/UsageReporter.cs b/MediaBrowser.Common.Implementations/Security/UsageReporter.cs index 0e3b0e210..46303b3cb 100644 --- a/MediaBrowser.Common.Implementations/Security/UsageReporter.cs +++ b/MediaBrowser.Common.Implementations/Security/UsageReporter.cs @@ -49,7 +49,7 @@ namespace MediaBrowser.Common.Implementations.Security { public string AppName { get; set; } public string AppVersion { get; set; } - public string DeviceVersion { get; set; } + public string DeviceName { get; set; } public string DeviceId { get; set; } } } diff --git a/MediaBrowser.Controller/Session/SessionInfo.cs b/MediaBrowser.Controller/Session/SessionInfo.cs index d8052b9bf..bc0f8a5d1 100644 --- a/MediaBrowser.Controller/Session/SessionInfo.cs +++ b/MediaBrowser.Controller/Session/SessionInfo.cs @@ -87,12 +87,6 @@ namespace MediaBrowser.Controller.Session public string DeviceName { get; set; } /// <summary> - /// Gets or sets the device version. - /// </summary> - /// <value>The device version.</value> - public string DeviceVersion { get; set; } - - /// <summary> /// Gets or sets the name of the now viewing item. /// </summary> /// <value>The name of the now viewing item.</value> diff --git a/MediaBrowser.Server.Implementations/EntryPoints/UsageEntryPoint.cs b/MediaBrowser.Server.Implementations/EntryPoints/UsageEntryPoint.cs index 98b9b2ae9..af3fde34b 100644 --- a/MediaBrowser.Server.Implementations/EntryPoints/UsageEntryPoint.cs +++ b/MediaBrowser.Server.Implementations/EntryPoints/UsageEntryPoint.cs @@ -46,24 +46,17 @@ namespace MediaBrowser.Server.Implementations.EntryPoints if (!string.IsNullOrEmpty(session.Client) && !string.IsNullOrEmpty(session.DeviceName) && - !string.IsNullOrEmpty(session.DeviceId)) + !string.IsNullOrEmpty(session.DeviceId) && + !string.IsNullOrEmpty(session.ApplicationVersion)) { var keys = new List<string> { session.Client, session.DeviceName, - session.DeviceId + session.DeviceId, + session.ApplicationVersion }; - if (!string.IsNullOrEmpty(session.DeviceVersion)) - { - keys.Add(session.DeviceVersion); - } - else - { - keys.Add(DefaultDeviceVersion); - } - var key = string.Join("_", keys.ToArray()).GetMD5(); _apps.GetOrAdd(key, guid => GetNewClientInfo(session)); @@ -90,15 +83,10 @@ namespace MediaBrowser.Server.Implementations.EntryPoints { AppName = session.Client, AppVersion = session.ApplicationVersion, - DeviceVersion = session.DeviceVersion, + DeviceName = session.DeviceName, DeviceId = session.DeviceId }; - if (string.IsNullOrEmpty(info.DeviceVersion)) - { - info.DeviceVersion = DefaultDeviceVersion; - } - // Report usage to remote server, except for web client, since we already have data on that if (!string.Equals(info.AppName, "Dashboard", StringComparison.OrdinalIgnoreCase)) { |