Reordering functions

Author: StanleyGoldman

src/GitHub.Api/Git/GitClient.cs

@@ -101,7 +101,7 @@ class GitClient : IGitClient
         private readonly CancellationToken cancellationToken;
 
         public event Action<CacheUpdateEvent> CurrentUserChanged;
-        private bool cacheInitialized = false;
+        private bool cacheInitialized;
 
         public GitClient(IEnvironment environment, IProcessManager processManager, ITaskManager taskManager)
         {
@@ -113,20 +113,6 @@ public GitClient(IEnvironment environment, IProcessManager processManager, ITask
             this.cancellationToken = taskManager.Token;
         }
 
-        private void GitUserCacheOnCacheUpdated(DateTimeOffset timeOffset)
-        {
-            HandleGitLogCacheUpdatedEvent(new CacheUpdateEvent
-            {
-                UpdatedTimeString = timeOffset.ToString()
-            });
-        }
-
-        private void GitUserCacheOnCacheInvalidated()
-        {
-            Logger.Trace("GitUserCache Invalidated");
-            UpdateUserAndEmail();
-        }
-
         public void CheckUserChangedEvent(CacheUpdateEvent cacheUpdateEvent)
         {
             var managedCache = environment.CacheContainer.GitUserCache;
@@ -142,11 +128,6 @@ public void CheckUserChangedEvent(CacheUpdateEvent cacheUpdateEvent)
                 HandleGitLogCacheUpdatedEvent(updateEvent);
             }
         }
-        private void HandleGitLogCacheUpdatedEvent(CacheUpdateEvent cacheUpdateEvent)
-        {
-            Logger.Trace("GitUserCache Updated {0}", cacheUpdateEvent.UpdatedTimeString);
-            CurrentUserChanged?.Invoke(cacheUpdateEvent);
-        }
 
         public User CurrentUser
         {
@@ -319,34 +300,6 @@ public ITask<string> SetConfig(string key, string value, GitConfigSource configS
                 .Configure(processManager);
         }
 
-        private void UpdateUserAndEmail()
-        {
-            Logger.Trace("UpdateUserAndEmail");
-
-            string username = null;
-            string email = null;
-
-            GetConfig(UserNameConfigKey, GitConfigSource.User)
-                .Then((success, value) => {
-                    if (success)
-                    {
-                        username = value;
-                    }
-                })
-                .Then(GetConfig(UserEmailConfigKey, GitConfigSource.User)
-                .Then((success, value) => {
-                    if (success)
-                    {
-                        email = value;
-                    }
-                })).ThenInUI(success => {
-                    environment.CacheContainer.GitUserCache.User= new User {
-                        Name = username,
-                        Email = email
-                    };
-                }).Start();
-        }
-
         public void SetConfigUserAndEmail(string username, string email)
         {
             SetConfig(UserNameConfigKey, username, GitConfigSource.User)
@@ -527,6 +480,54 @@ public ITask<string> Unlock(string file, bool force,
                 .Configure(processManager);
         }
 
+        private void GitUserCacheOnCacheUpdated(DateTimeOffset timeOffset)
+        {
+            HandleGitLogCacheUpdatedEvent(new CacheUpdateEvent
+            {
+                UpdatedTimeString = timeOffset.ToString()
+            });
+        }
+
+        private void GitUserCacheOnCacheInvalidated()
+        {
+            Logger.Trace("GitUserCache Invalidated");
+            UpdateUserAndEmail();
+        }
+        
+        private void HandleGitLogCacheUpdatedEvent(CacheUpdateEvent cacheUpdateEvent)
+        {
+            Logger.Trace("GitUserCache Updated {0}", cacheUpdateEvent.UpdatedTimeString);
+            CurrentUserChanged?.Invoke(cacheUpdateEvent);
+        }
+
+        private void UpdateUserAndEmail()
+        {
+            Logger.Trace("UpdateUserAndEmail");
+
+            string username = null;
+            string email = null;
+
+            GetConfig(UserNameConfigKey, GitConfigSource.User)
+                .Then((success, value) => {
+                    if (success)
+                    {
+                        username = value;
+                    }
+                })
+                .Then(GetConfig(UserEmailConfigKey, GitConfigSource.User)
+                .Then((success, value) => {
+                    if (success)
+                    {
+                        email = value;
+                    }
+                })).ThenInUI(success => {
+                    CurrentUser = new User {
+                        Name = username,
+                        Email = email
+                    };
+                }).Start();
+        }
+
         protected static ILogging Logger { get; } = Logging.GetLogger<GitClient>();
     }
 }