Cleanup

Author: StanleyGoldman

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/LocksView.cs

@@ -596,29 +596,31 @@ private void MaybeUpdateData()
 
             if (keychainHasUpdate || currentRemoteHasUpdate)
             {
-                Connection[] connections;
-                if (HasRepository && !string.IsNullOrEmpty(Repository.CloneUrl))
+                var username = String.Empty;
+                if (Repository != null)
                 {
-                    var host = Repository.CloneUrl
-                                         .ToRepositoryUri()
-                                         .GetComponents(UriComponents.Host, UriFormat.SafeUnescaped);
+                    Connection connection;
+                    if (!string.IsNullOrEmpty(Repository.CloneUrl))
+                    {
+                        var host = Repository.CloneUrl
+                                             .ToRepositoryUri()
+                                             .GetComponents(UriComponents.Host, UriFormat.SafeUnescaped);
 
-                    connections = Platform.Keychain.Connections.OrderByDescending(x => x.Host == host).ToArray();
-                }
-                else
-                {
-                    connections = Platform.Keychain.Connections.OrderByDescending(HostAddress.IsGitHubDotCom).ToArray();
-                }
+                        connection = Platform.Keychain.Connections.FirstOrDefault(x => x.Host == host);
+                    }
+                    else
+                    {
+                        connection = Platform.Keychain.Connections.FirstOrDefault(HostAddress.IsGitHubDotCom);
+                    }
 
-                if (connections.Any())
-                {
-                    currentUsername = connections.First().Username;
-                }
-                else
-                {
-                    currentUsername = "";
+                    if (connection != null)
+                    {
+                        username = connection.Username;
+                    }
                 }
 
+                currentUsername = username;
+
                 keychainHasUpdate = false;
                 currentRemoteHasUpdate = false;
             }

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs

@@ -103,22 +103,23 @@ private static void UpdateCurrentUsername()
             var username = String.Empty;
             if (Repository != null)
             {
-                Connection[] connections;
+                Connection connection;
                 if (!string.IsNullOrEmpty(Repository.CloneUrl))
                 {
-                    var host = Repository.CloneUrl.ToRepositoryUri()
+                    var host = Repository.CloneUrl
+                                         .ToRepositoryUri()
                                          .GetComponents(UriComponents.Host, UriFormat.SafeUnescaped);
 
-                    connections = Platform.Keychain.Connections.OrderByDescending(x => x.Host == host).ToArray();
+                    connection = Platform.Keychain.Connections.FirstOrDefault(x => x.Host == host);
                 }
                 else
                 {
-                    connections = Platform.Keychain.Connections.OrderByDescending(HostAddress.IsGitHubDotCom).ToArray();
+                    connection = Platform.Keychain.Connections.FirstOrDefault(HostAddress.IsGitHubDotCom);
                 }
 
-                if (connections.Any())
+                if (connection != null)
                 {
-                    username = connections.First().Username;
+                    username = connection.Username;
                 }
             }