Attaching and detaching handlers at the right time

Author: StanleyGoldman

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

@@ -88,18 +88,10 @@ private void MaybeUpdateData()
             }
         }
 
-        public override void OnRepositoryChanged(IRepository oldRepository)
-        {
-            base.OnRepositoryChanged(oldRepository);
-            DetachHandlers(oldRepository);
-            AttachHandlers(Repository);
-        }
-
         private void AttachHandlers(IRepository repository)
         {
             if (repository == null)
                 return;
-
             repository.OnLocalBranchListChanged += RunUpdateBranchesOnMainThread;
             repository.OnCurrentBranchChanged += HandleRepositoryBranchChangeEvent;
             repository.OnCurrentRemoteChanged += HandleRepositoryBranchChangeEvent;

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

@@ -40,13 +40,25 @@ public override void OnEnable()
                 return;
 
             OnStatusUpdate(Repository.CurrentStatus);
-            Repository.OnStatusChanged += RunStatusUpdateOnMainThread;
+            AttachHandlers(Repository);
             Repository.Refresh();
         }
 
         public override void OnDisable()
         {
             base.OnDisable();
+            DetachHandlers();
+        }
+
+        private void AttachHandlers(IRepository repository)
+        {
+            if (repository == null)
+                return;
+            repository.OnStatusChanged += RunStatusUpdateOnMainThread;
+        }
+
+        private void DetachHandlers()
+        {
             if (Repository == null)
                 return;
             Repository.OnStatusChanged -= RunStatusUpdateOnMainThread;

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

@@ -87,9 +87,6 @@ public override void OnDataUpdate()
         public override void OnRepositoryChanged(IRepository oldRepository)
         {
             base.OnRepositoryChanged(oldRepository);
-
-            DetachHandlers(oldRepository);
-            AttachHandlers(Repository);
         }
 
         public override void OnSelectionChange()

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

@@ -82,13 +82,6 @@ public override void OnRepositoryChanged(IRepository oldRepository)
             base.OnRepositoryChanged(oldRepository);
             gitPathView.OnRepositoryChanged(oldRepository);
             userSettingsView.OnRepositoryChanged(oldRepository);
-
-            DetachHandlers(oldRepository);
-            AttachHandlers(Repository);
-
-            remoteHasChanged = true;
-
-            Refresh();
         }
 
         public override void Refresh()
@@ -106,7 +99,6 @@ private void AttachHandlers(IRepository repository)
         {
             if (repository == null)
                 return;
-
             repository.OnCurrentRemoteChanged += Repository_OnActiveRemoteChanged;
             repository.OnLocksChanged += RunLocksUpdateOnMainThread;
         }
@@ -115,7 +107,6 @@ private void DetachHandlers(IRepository repository)
         {
             if (repository == null)
                 return;
-
             repository.OnCurrentRemoteChanged -= Repository_OnActiveRemoteChanged;
             repository.OnLocksChanged -= RunLocksUpdateOnMainThread;
         }