Fix code issues

3 files changed, 27 insertions, 9 deletions

diff --git a/MediaBrowser.Controller/Net/IWebSocketConnection.cs b/MediaBrowser.Controller/Net/IWebSocketConnection.cs
index fb766ab57..b371a59e9 100644
--- a/MediaBrowser.Controller/Net/IWebSocketConnection.cs
+++ b/MediaBrowser.Controller/Net/IWebSocketConnection.cs
@@ -30,7 +30,7 @@ namespace MediaBrowser.Controller.Net
         /// Gets or sets the date of last Keeplive received.
         /// </summary>
         /// <value>The date of last Keeplive received.</value>
-        public DateTime LastKeepAliveDate { get; set; }
+        DateTime LastKeepAliveDate { get; set; }
 
         /// <summary>
         /// Gets or sets the URL.
diff --git a/MediaBrowser.Controller/SyncPlay/GroupInfo.cs b/MediaBrowser.Controller/SyncPlay/GroupInfo.cs
index 087748de0..bda49bd1b 100644
--- a/MediaBrowser.Controller/SyncPlay/GroupInfo.cs
+++ b/MediaBrowser.Controller/SyncPlay/GroupInfo.cs
@@ -69,7 +69,11 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="session">The session.</param>
         public void AddSession(SessionInfo session)
         {
-            if (ContainsSession(session.Id.ToString())) return;
+            if (ContainsSession(session.Id.ToString()))
+            {
+                return;
+            }
+
             var member = new GroupMember();
             member.Session = session;
             member.Ping = DefaulPing;
@@ -84,9 +88,12 @@ namespace MediaBrowser.Controller.SyncPlay
 
         public void RemoveSession(SessionInfo session)
         {
-            if (!ContainsSession(session.Id.ToString())) return;
-            GroupMember member;
-            Participants.Remove(session.Id.ToString(), out member);
+            if (!ContainsSession(session.Id.ToString()))
+            {
+                return;
+            }
+
+            Participants.Remove(session.Id.ToString(), out _);
         }
 
         /// <summary>
@@ -96,7 +103,11 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="ping">The ping.</param>
         public void UpdatePing(SessionInfo session, long ping)
         {
-            if (!ContainsSession(session.Id.ToString())) return;
+            if (!ContainsSession(session.Id.ToString()))
+            {
+                return;
+            }
+
             Participants[session.Id.ToString()].Ping = ping;
         }
 
@@ -121,7 +132,11 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="isBuffering">The state.</param>
         public void SetBuffering(SessionInfo session, bool isBuffering)
         {
-            if (!ContainsSession(session.Id.ToString())) return;
+            if (!ContainsSession(session.Id.ToString()))
+            {
+                return;
+            }
+
             Participants[session.Id.ToString()].IsBuffering = isBuffering;
         }
 
@@ -133,7 +148,10 @@ namespace MediaBrowser.Controller.SyncPlay
         {
             foreach (var session in Participants.Values)
             {
-                if (session.IsBuffering) return true;
+                if (session.IsBuffering)
+                {
+                    return true;
+                }
             }
             return false;
         }
diff --git a/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs b/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs
index 6c962ec85..006fb687b 100644
--- a/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs
+++ b/MediaBrowser.Controller/SyncPlay/ISyncPlayManager.cs
@@ -25,7 +25,7 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="groupId">The group id.</param>
         /// <param name="request">The request.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
-        void JoinGroup(SessionInfo session, string groupId, JoinGroupRequest request, CancellationToken cancellationToken);
+        void JoinGroup(SessionInfo session, Guid groupId, JoinGroupRequest request, CancellationToken cancellationToken);
 
         /// <summary>
         /// Removes the session from a group.