Checking for the keychain of the current repository in the LocksView

Author: StanleyGoldman

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

@@ -383,13 +383,14 @@ class LocksView : Subview
     {
         [NonSerialized] private bool isBusy;
 
+        [SerializeField] private bool currentRemoteHasUpdate;
         [SerializeField] private bool currentStatusEntriesHasUpdate;
         [SerializeField] private bool currentLocksHasUpdate;
-        [SerializeField] private bool currentUserHasUpdate;
+        [SerializeField] private bool keychainHasUpdate;
         [SerializeField] private LocksControl locksControl;
+        [SerializeField] private CacheUpdateEvent lastCurrentRemoteChangedEvent;
         [SerializeField] private CacheUpdateEvent lastLocksChangedEvent;
         [SerializeField] private CacheUpdateEvent lastStatusEntriesChangedEvent;
-        [SerializeField] private CacheUpdateEvent lastUserChangedEvent;
         [SerializeField] private List<GitLock> lockedFiles = new List<GitLock>();
         [SerializeField] private List<GitStatusEntry> gitStatusEntries = new List<GitStatusEntry>();
         [SerializeField] private string currentUsername;
@@ -407,6 +408,7 @@ public override void OnEnable()
 
             AttachHandlers(Repository);
             ValidateCachedData(Repository);
+            KeychainConnectionsChanged();
         }
 
         public override void OnDisable()
@@ -523,9 +525,10 @@ private void AttachHandlers(IRepository repository)
                 return;
             }
 
+            Platform.Keychain.ConnectionsChanged += KeychainConnectionsChanged;
+            repository.CurrentRemoteChanged += RepositoryOnCurrentRemoteChanged;
             repository.LocksChanged += RepositoryOnLocksChanged;
-            repository.LocksChanged += RepositoryOnStatusEntriesChanged;
-            User.Changed += UserOnChanged;
+            repository.StatusEntriesChanged += RepositoryOnStatusEntriesChanged;
         }
 
         private void DetachHandlers(IRepository repository)
@@ -535,9 +538,20 @@ private void DetachHandlers(IRepository repository)
                 return;
             }
 
+            Platform.Keychain.ConnectionsChanged -= KeychainConnectionsChanged;
+            repository.CurrentRemoteChanged -= RepositoryOnCurrentRemoteChanged;
             repository.LocksChanged -= RepositoryOnLocksChanged;
-            repository.LocksChanged -= RepositoryOnStatusEntriesChanged;
-            User.Changed -= UserOnChanged;
+            repository.StatusEntriesChanged -= RepositoryOnStatusEntriesChanged;
+        }
+
+        private void RepositoryOnCurrentRemoteChanged(CacheUpdateEvent cacheUpdateEvent)
+        {
+            if (!lastCurrentRemoteChangedEvent.Equals(cacheUpdateEvent))
+            {
+                lastCurrentRemoteChangedEvent = cacheUpdateEvent;
+                currentRemoteHasUpdate = true;
+                Redraw();
+            }
         }
 
         private void RepositoryOnLocksChanged(CacheUpdateEvent cacheUpdateEvent)
@@ -560,21 +574,17 @@ private void RepositoryOnStatusEntriesChanged(CacheUpdateEvent cacheUpdateEvent)
             }
         }
 
-        private void UserOnChanged(CacheUpdateEvent cacheUpdateEvent)
+        private void KeychainConnectionsChanged()
         {
-            if (!lastUserChangedEvent.Equals(cacheUpdateEvent))
-            {
-                lastUserChangedEvent = cacheUpdateEvent;
-                currentUserHasUpdate = true;
-                Redraw();
-            }
+            keychainHasUpdate = true;
+            Redraw();
         }
 
         private void ValidateCachedData(IRepository repository)
         {
+            repository.CheckAndRaiseEventsIfCacheNewer(CacheType.RepositoryInfo, lastCurrentRemoteChangedEvent);
             repository.CheckAndRaiseEventsIfCacheNewer(CacheType.GitLocks, lastLocksChangedEvent);
             repository.CheckAndRaiseEventsIfCacheNewer(CacheType.GitStatus, lastStatusEntriesChangedEvent);
-            User.CheckAndRaiseEventsIfCacheNewer(CacheType.GitUser, lastUserChangedEvent);
         }
 
         private void MaybeUpdateData()
@@ -584,15 +594,33 @@ private void MaybeUpdateData()
                 return;
             }
 
-            if (currentUserHasUpdate)
+            if (keychainHasUpdate || currentRemoteHasUpdate)
             {
-                //TODO: ONE_USER_LOGIN This assumes only ever one user can login
-                var keychainConnection = Platform.Keychain.Connections.FirstOrDefault();
-                if (keychainConnection != null)
-                    currentUsername = keychainConnection.Username;
+                Connection[] connections;
+                if (HasRepository && !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();
+                }
+
+                if (connections.Any())
+                {
+                    currentUsername = connections.First().Username;
+                }
                 else
+                {
                     currentUsername = "";
-                currentUserHasUpdate = false;
+                }
+
+                keychainHasUpdate = false;
+                currentRemoteHasUpdate = false;
             }
 
             if (currentLocksHasUpdate)