Merge pull request #466 from github-for-unity/fixes/cache-events-on-main-thread

StanleyGoldman · web-flow · commit 6dcf5c3a8085 · 2017-11-27T15:27:33.000-05:00
Cache events are raised on the main thread
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs
@@ -107,23 +107,19 @@ private void RepositoryOnStatusChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastStatusChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(TaskManager.Token, () => {
-                    lastStatusChangedEvent = cacheUpdateEvent;
-                    currentStatusHasUpdate = true;
-                    Redraw();
-                }) { Affinity = TaskAffinity.UI }.Start();
+                lastStatusChangedEvent = cacheUpdateEvent;
+                currentStatusHasUpdate = true;
+                Redraw();
             }
         }
 
         private void RepositoryOnCurrentBranchChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastCurrentBranchChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(TaskManager.Token, () => {
-                    lastCurrentBranchChangedEvent = cacheUpdateEvent;
-                    currentBranchHasUpdate = true;
-                    Redraw();
-                }) { Affinity = TaskAffinity.UI }.Start();
+                lastCurrentBranchChangedEvent = cacheUpdateEvent;
+                currentBranchHasUpdate = true;
+                Redraw();
             }
         }
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs
@@ -296,35 +296,29 @@ private void RepositoryOnStatusChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastStatusChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(TaskManager.Token, () => {
-                    lastStatusChangedEvent = cacheUpdateEvent;
-                    currentStatusHasUpdate = true;
-                    Redraw();
-                }) { Affinity = TaskAffinity.UI }.Start();
+                lastStatusChangedEvent = cacheUpdateEvent;
+                currentStatusHasUpdate = true;
+                Redraw();
             }
         }
 
         private void RepositoryOnLogChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastLogChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(TaskManager.Token, () => {
-                    lastLogChangedEvent = cacheUpdateEvent;
-                    currentLogHasUpdate = true;
-                    Redraw();
-                }) { Affinity = TaskAffinity.UI }.Start();
+                lastLogChangedEvent = cacheUpdateEvent;
+                currentLogHasUpdate = true;
+                Redraw();
             }
         }
 
         private void RepositoryOnCurrentRemoteChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastCurrentRemoteChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(TaskManager.Token, () => {
-                    lastCurrentRemoteChangedEvent = cacheUpdateEvent;
-                    currentRemoteHasUpdate = true;
-                    Redraw();
-                }) { Affinity = TaskAffinity.UI }.Start();
+                lastCurrentRemoteChangedEvent = cacheUpdateEvent;
+                currentRemoteHasUpdate = true;
+                Redraw();
             }
         }
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/InitProjectView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/InitProjectView.cs
@@ -95,13 +95,9 @@ private void UserOnChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastCheckUserChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(TaskManager.Token, () =>
-                    {
-                        lastCheckUserChangedEvent = cacheUpdateEvent;
-                        userHasChanges = true;
-                        Redraw();
-                    })
-                    { Affinity = TaskAffinity.UI }.Start();
+                lastCheckUserChangedEvent = cacheUpdateEvent;
+                userHasChanges = true;
+                Redraw();
             }
         }
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs
@@ -45,28 +45,20 @@ private static void RepositoryOnStatusChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastRepositoryStatusChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(CancellationToken.None, () =>
-                {
-                    lastRepositoryStatusChangedEvent = cacheUpdateEvent;
-                    entries.Clear();
-                    entries.AddRange(repository.CurrentStatus.Entries);
-                    OnStatusUpdate();
-                })
-                { Affinity = TaskAffinity.UI }.Start();
+                lastRepositoryStatusChangedEvent = cacheUpdateEvent;
+                entries.Clear();
+                entries.AddRange(repository.CurrentStatus.Entries);
+                OnStatusUpdate();
             }
         }
 
         private static void RepositoryOnLocksChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastLocksChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(CancellationToken.None, () =>
-                {
-                    lastLocksChangedEvent = cacheUpdateEvent;
-                    locks = repository.CurrentLocks;
-                    OnLocksUpdate();
-                })
-                { Affinity = TaskAffinity.UI }.Start();
+                lastLocksChangedEvent = cacheUpdateEvent;
+                locks = repository.CurrentLocks;
+                OnLocksUpdate();
             }
         }
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs
@@ -126,23 +126,19 @@ private void RepositoryOnLocksChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastLocksChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(TaskManager.Token, () => {
-                    lastLocksChangedEvent = cacheUpdateEvent;
-                    currentLocksHasUpdate = true;
-                    Redraw();
-                }) { Affinity = TaskAffinity.UI }.Start();
+                lastLocksChangedEvent = cacheUpdateEvent;
+                currentLocksHasUpdate = true;
+                Redraw();
             }
         }
 
         private void RepositoryOnCurrentRemoteChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastCurrentRemoteChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(TaskManager.Token, () => {
-                    lastCurrentRemoteChangedEvent = cacheUpdateEvent;
-                    currentRemoteHasUpdate = true;
-                    Redraw();
-                }) { Affinity = TaskAffinity.UI }.Start();
+                lastCurrentRemoteChangedEvent = cacheUpdateEvent;
+                currentRemoteHasUpdate = true;
+                Redraw();
             }
         }
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/UserSettingsView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/UserSettingsView.cs
@@ -96,13 +96,10 @@ private void UserOnChanged(CacheUpdateEvent cacheUpdateEvent)
 
             if (!lastCheckUserChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(TaskManager.Token, () => {
-                        lastCheckUserChangedEvent = cacheUpdateEvent;
-                        userHasChanges = true;
-                        isBusy = false;
-                        Redraw();
-                    })
-                    { Affinity = TaskAffinity.UI }.Start();
+                lastCheckUserChangedEvent = cacheUpdateEvent;
+                userHasChanges = true;
+                isBusy = false;
+                Redraw();
             }
         }
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs
@@ -270,13 +270,9 @@ private void RepositoryOnCurrentBranchAndRemoteChanged(CacheUpdateEvent cacheUpd
         {
             if (!lastCurrentBranchAndRemoteChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(TaskManager.Token, () =>
-                {
-                    lastCurrentBranchAndRemoteChangedEvent = cacheUpdateEvent;
-                    currentBranchAndRemoteHasUpdate = true;
-                    Redraw();
-                })
-                { Affinity = TaskAffinity.UI }.Start();
+                lastCurrentBranchAndRemoteChangedEvent = cacheUpdateEvent;
+                currentBranchAndRemoteHasUpdate = true;
+                Redraw();
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -107,23 +107,19 @@ private void RepositoryOnStatusChanged(CacheUpdateEvent cacheUpdateEvent)`
`107`	`107`	`{`
`108`	`108`	`if (!lastStatusChangedEvent.Equals(cacheUpdateEvent))`
`109`	`109`	`{`
`110`		`- new ActionTask(TaskManager.Token, () => {`
`111`		`- lastStatusChangedEvent = cacheUpdateEvent;`
`112`		`- currentStatusHasUpdate = true;`
`113`		`- Redraw();`
`114`		`- }) { Affinity = TaskAffinity.UI }.Start();`
	`110`	`+ lastStatusChangedEvent = cacheUpdateEvent;`
	`111`	`+ currentStatusHasUpdate = true;`
	`112`	`+ Redraw();`
`115`	`113`	`}`
`116`	`114`	`}`
`117`	`115`
`118`	`116`	`private void RepositoryOnCurrentBranchChanged(CacheUpdateEvent cacheUpdateEvent)`
`119`	`117`	`{`
`120`	`118`	`if (!lastCurrentBranchChangedEvent.Equals(cacheUpdateEvent))`
`121`	`119`	`{`
`122`		`- new ActionTask(TaskManager.Token, () => {`
`123`		`- lastCurrentBranchChangedEvent = cacheUpdateEvent;`
`124`		`- currentBranchHasUpdate = true;`
`125`		`- Redraw();`
`126`		`- }) { Affinity = TaskAffinity.UI }.Start();`
	`120`	`+ lastCurrentBranchChangedEvent = cacheUpdateEvent;`
	`121`	`+ currentBranchHasUpdate = true;`
	`122`	`+ Redraw();`
`127`	`123`	`}`
`128`	`124`	`}`
`129`	`125`
Original file line number	Diff line number	Diff line change
`@@ -296,35 +296,29 @@ private void RepositoryOnStatusChanged(CacheUpdateEvent cacheUpdateEvent)`
`296`	`296`	`{`
`297`	`297`	`if (!lastStatusChangedEvent.Equals(cacheUpdateEvent))`
`298`	`298`	`{`
`299`		`- new ActionTask(TaskManager.Token, () => {`
`300`		`- lastStatusChangedEvent = cacheUpdateEvent;`
`301`		`- currentStatusHasUpdate = true;`
`302`		`- Redraw();`
`303`		`- }) { Affinity = TaskAffinity.UI }.Start();`
	`299`	`+ lastStatusChangedEvent = cacheUpdateEvent;`
	`300`	`+ currentStatusHasUpdate = true;`
	`301`	`+ Redraw();`
`304`	`302`	`}`
`305`	`303`	`}`
`306`	`304`
`307`	`305`	`private void RepositoryOnLogChanged(CacheUpdateEvent cacheUpdateEvent)`
`308`	`306`	`{`
`309`	`307`	`if (!lastLogChangedEvent.Equals(cacheUpdateEvent))`
`310`	`308`	`{`
`311`		`- new ActionTask(TaskManager.Token, () => {`
`312`		`- lastLogChangedEvent = cacheUpdateEvent;`
`313`		`- currentLogHasUpdate = true;`
`314`		`- Redraw();`
`315`		`- }) { Affinity = TaskAffinity.UI }.Start();`
	`309`	`+ lastLogChangedEvent = cacheUpdateEvent;`
	`310`	`+ currentLogHasUpdate = true;`
	`311`	`+ Redraw();`
`316`	`312`	`}`
`317`	`313`	`}`
`318`	`314`
`319`	`315`	`private void RepositoryOnCurrentRemoteChanged(CacheUpdateEvent cacheUpdateEvent)`
`320`	`316`	`{`
`321`	`317`	`if (!lastCurrentRemoteChangedEvent.Equals(cacheUpdateEvent))`
`322`	`318`	`{`
`323`		`- new ActionTask(TaskManager.Token, () => {`
`324`		`- lastCurrentRemoteChangedEvent = cacheUpdateEvent;`
`325`		`- currentRemoteHasUpdate = true;`
`326`		`- Redraw();`
`327`		`- }) { Affinity = TaskAffinity.UI }.Start();`
	`319`	`+ lastCurrentRemoteChangedEvent = cacheUpdateEvent;`
	`320`	`+ currentRemoteHasUpdate = true;`
	`321`	`+ Redraw();`
`328`	`322`	`}`
`329`	`323`	`}`
`330`	`324`
Original file line number	Diff line number	Diff line change
`@@ -95,13 +95,9 @@ private void UserOnChanged(CacheUpdateEvent cacheUpdateEvent)`
`95`	`95`	`{`
`96`	`96`	`if (!lastCheckUserChangedEvent.Equals(cacheUpdateEvent))`
`97`	`97`	`{`
`98`		`- new ActionTask(TaskManager.Token, () =>`
`99`		`- {`
`100`		`- lastCheckUserChangedEvent = cacheUpdateEvent;`
`101`		`- userHasChanges = true;`
`102`		`- Redraw();`
`103`		`- })`
`104`		`- { Affinity = TaskAffinity.UI }.Start();`
	`98`	`+ lastCheckUserChangedEvent = cacheUpdateEvent;`
	`99`	`+ userHasChanges = true;`
	`100`	`+ Redraw();`
`105`	`101`	`}`
`106`	`102`	`}`
`107`	`103`
Original file line number	Diff line number	Diff line change
`@@ -45,28 +45,20 @@ private static void RepositoryOnStatusChanged(CacheUpdateEvent cacheUpdateEvent)`
`45`	`45`	`{`
`46`	`46`	`if (!lastRepositoryStatusChangedEvent.Equals(cacheUpdateEvent))`
`47`	`47`	`{`
`48`		`- new ActionTask(CancellationToken.None, () =>`
`49`		`- {`
`50`		`- lastRepositoryStatusChangedEvent = cacheUpdateEvent;`
`51`		`- entries.Clear();`
`52`		`- entries.AddRange(repository.CurrentStatus.Entries);`
`53`		`- OnStatusUpdate();`
`54`		`- })`
`55`		`- { Affinity = TaskAffinity.UI }.Start();`
	`48`	`+ lastRepositoryStatusChangedEvent = cacheUpdateEvent;`
	`49`	`+ entries.Clear();`
	`50`	`+ entries.AddRange(repository.CurrentStatus.Entries);`
	`51`	`+ OnStatusUpdate();`
`56`	`52`	`}`
`57`	`53`	`}`
`58`	`54`
`59`	`55`	`private static void RepositoryOnLocksChanged(CacheUpdateEvent cacheUpdateEvent)`
`60`	`56`	`{`
`61`	`57`	`if (!lastLocksChangedEvent.Equals(cacheUpdateEvent))`
`62`	`58`	`{`
`63`		`- new ActionTask(CancellationToken.None, () =>`
`64`		`- {`
`65`		`- lastLocksChangedEvent = cacheUpdateEvent;`
`66`		`- locks = repository.CurrentLocks;`
`67`		`- OnLocksUpdate();`
`68`		`- })`
`69`		`- { Affinity = TaskAffinity.UI }.Start();`
	`59`	`+ lastLocksChangedEvent = cacheUpdateEvent;`
	`60`	`+ locks = repository.CurrentLocks;`
	`61`	`+ OnLocksUpdate();`
`70`	`62`	`}`
`71`	`63`	`}`
`72`	`64`
Original file line number	Diff line number	Diff line change
`@@ -126,23 +126,19 @@ private void RepositoryOnLocksChanged(CacheUpdateEvent cacheUpdateEvent)`
`126`	`126`	`{`
`127`	`127`	`if (!lastLocksChangedEvent.Equals(cacheUpdateEvent))`
`128`	`128`	`{`
`129`		`- new ActionTask(TaskManager.Token, () => {`
`130`		`- lastLocksChangedEvent = cacheUpdateEvent;`
`131`		`- currentLocksHasUpdate = true;`
`132`		`- Redraw();`
`133`		`- }) { Affinity = TaskAffinity.UI }.Start();`
	`129`	`+ lastLocksChangedEvent = cacheUpdateEvent;`
	`130`	`+ currentLocksHasUpdate = true;`
	`131`	`+ Redraw();`
`134`	`132`	`}`
`135`	`133`	`}`
`136`	`134`
`137`	`135`	`private void RepositoryOnCurrentRemoteChanged(CacheUpdateEvent cacheUpdateEvent)`
`138`	`136`	`{`
`139`	`137`	`if (!lastCurrentRemoteChangedEvent.Equals(cacheUpdateEvent))`
`140`	`138`	`{`
`141`		`- new ActionTask(TaskManager.Token, () => {`
`142`		`- lastCurrentRemoteChangedEvent = cacheUpdateEvent;`
`143`		`- currentRemoteHasUpdate = true;`
`144`		`- Redraw();`
`145`		`- }) { Affinity = TaskAffinity.UI }.Start();`
	`139`	`+ lastCurrentRemoteChangedEvent = cacheUpdateEvent;`
	`140`	`+ currentRemoteHasUpdate = true;`
	`141`	`+ Redraw();`
`146`	`142`	`}`
`147`	`143`	`}`
`148`	`144`
Original file line number	Diff line number	Diff line change
`@@ -96,13 +96,10 @@ private void UserOnChanged(CacheUpdateEvent cacheUpdateEvent)`
`96`	`96`
`97`	`97`	`if (!lastCheckUserChangedEvent.Equals(cacheUpdateEvent))`
`98`	`98`	`{`
`99`		`- new ActionTask(TaskManager.Token, () => {`
`100`		`- lastCheckUserChangedEvent = cacheUpdateEvent;`
`101`		`- userHasChanges = true;`
`102`		`- isBusy = false;`
`103`		`- Redraw();`
`104`		`- })`
`105`		`- { Affinity = TaskAffinity.UI }.Start();`
	`99`	`+ lastCheckUserChangedEvent = cacheUpdateEvent;`
	`100`	`+ userHasChanges = true;`
	`101`	`+ isBusy = false;`
	`102`	`+ Redraw();`
`106`	`103`	`}`
`107`	`104`	`}`
`108`	`105`
Original file line number	Diff line number	Diff line change
`@@ -270,13 +270,9 @@ private void RepositoryOnCurrentBranchAndRemoteChanged(CacheUpdateEvent cacheUpd`
`270`	`270`	`{`
`271`	`271`	`if (!lastCurrentBranchAndRemoteChangedEvent.Equals(cacheUpdateEvent))`
`272`	`272`	`{`
`273`		`- new ActionTask(TaskManager.Token, () =>`
`274`		`- {`
`275`		`- lastCurrentBranchAndRemoteChangedEvent = cacheUpdateEvent;`
`276`		`- currentBranchAndRemoteHasUpdate = true;`
`277`		`- Redraw();`
`278`		`- })`
`279`		`- { Affinity = TaskAffinity.UI }.Start();`
	`273`	`+ lastCurrentBranchAndRemoteChangedEvent = cacheUpdateEvent;`
	`274`	`+ currentBranchAndRemoteHasUpdate = true;`
	`275`	`+ Redraw();`
`280`	`276`	`}`
`281`	`277`	`}`
`282`	`278`