Removing redundant cachedUser field

github-for-unity · Nov 9, 2017 · fca75da · fca75da
1 parent 223e0bb
commit fca75da
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/UserSettingsView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/UserSettingsView.cs
@@ -22,7 +22,6 @@ class UserSettingsView : Subview
         [SerializeField] private string gitEmail;
         [SerializeField] private string newGitName;
         [SerializeField] private string newGitEmail;
-        [SerializeField] private User cachedUser;
 
         public override void InitializeView(IView parent)
         {
@@ -63,15 +62,11 @@ public override void OnGUI()
                                      {
                                          if (Repository != null)
                                          {
-                                             Repository.User.Name = newGitName;
+                                             Repository.User.Name = gitName = newGitName;
                                          }
                                          else
                                          {
-                                             if (cachedUser == null)
-                                             {
-                                                 cachedUser = new User();
-                                             }
-                                             cachedUser.Name = newGitName;
+                                             gitName = newGitName;
                                          }
                                      }
                                  })
@@ -83,11 +78,11 @@ public override void OnGUI()
                                                   {
                                                       if (Repository != null)
                                                       {
-                                                          Repository.User.Email = newGitEmail;
+                                                          Repository.User.Email = gitEmail = newGitEmail;
                                                       }
                                                       else
                                                       {
-                                                          cachedUser.Email = newGitEmail;
+                                                          gitEmail = newGitEmail;
                                                       }
 
                                                       userDataHasChanged = true;
@@ -149,9 +144,8 @@ private void UpdateUserDataFromClient()
                 .ThenInUI((success, user) => {
                     if (success && !String.IsNullOrEmpty(user.Name) && !String.IsNullOrEmpty(user.Email))
                     {
-                        cachedUser = user;
-                        newGitName = gitName = cachedUser.Name;
-                        newGitEmail = gitEmail = cachedUser.Email;
+                        newGitName = gitName = user.Name;
+                        newGitEmail = gitEmail = user.Email;
                         Redraw();
                     }
                 }).Start();