Merge pull request #1043 from MediaBrowser/dev

3.0.5557.0

2 files changed, 9 insertions, 2 deletions

diff --git a/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs b/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs
index 2fe5d8f742..566f4c5f40 100644
--- a/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs
+++ b/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Entities;
+using System;
 using System.IO;
 using System.Linq;
 
@@ -14,6 +15,11 @@ namespace MediaBrowser.Server.Implementations.Devices
 
         public override bool IsVisible(User user)
         {
+            if (!user.Policy.EnableAllFolders && !user.Policy.EnabledFolders.Contains(Id.ToString("N"), StringComparer.OrdinalIgnoreCase))
+            {
+                return false;
+            }
+            
             return GetChildren(user, true).Any() &&
                 base.IsVisible(user);
         }
diff --git a/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs b/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs
index 3211f88d5f..b65b7d11b3 100644
--- a/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs
+++ b/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs
@@ -44,7 +44,7 @@ namespace MediaBrowser.Server.Implementations.Devices
             _logger = logger;
         }
 
-        public async Task<DeviceInfo> RegisterDevice(string reportedId, string name, string appName, string usedByUserId)
+        public async Task<DeviceInfo> RegisterDevice(string reportedId, string name, string appName, string appVersion, string usedByUserId)
         {
             var device = GetDevice(reportedId) ?? new DeviceInfo
             {
@@ -53,6 +53,7 @@ namespace MediaBrowser.Server.Implementations.Devices
 
             device.ReportedName = name;
             device.AppName = appName;
+            device.AppVersion = appVersion;
 
             if (!string.IsNullOrWhiteSpace(usedByUserId))
             {
@@ -109,7 +110,7 @@ namespace MediaBrowser.Server.Implementations.Devices
                 devices = devices.Where(i =>
                 {
                     var caps = GetCapabilities(i.Id);
-                    var deviceVal = caps.SupportsUniqueIdentifier ?? caps.SupportsPersistentIdentifier;
+                    var deviceVal = caps.SupportsPersistentIdentifier;
                     return deviceVal == val;
                 });
             }