Merge branch 'fixes/publish-view-disable-until-load' into fixes/publish-view-faster-load

# Conflicts:
#	src/UnityExtension/Assets/Editor/GitHub.Unity/UI/PUblishView.cs

Author: StanleyGoldman

src/GitHub.Api/Application/ApiClient.cs

@@ -61,7 +61,15 @@ private async Task LogoutInternal(UriString host)
         public async Task CreateRepository(NewRepository newRepository, Action<Octokit.Repository, Exception> callback, string organization = null)
         {
             Guard.ArgumentNotNull(callback, "callback");
-            await CreateRepositoryInternal(newRepository, callback, organization);
+            try
+            {
+                var repository = await CreateRepositoryInternal(newRepository, organization);
+                callback(repository, null);
+            }
+            catch (Exception e)
+            {
+                callback(null, e);
+            }
         }
 
         public async Task GetOrganizations(Action<IList<Organization>> callback)
@@ -181,16 +189,15 @@ public async Task<bool> ContinueLoginAsync(LoginResult loginResult, Func<LoginRe
             return result.Code == LoginResultCodes.Success;
         }
 
-        private async Task CreateRepositoryInternal(NewRepository newRepository, Action<Octokit.Repository, Exception> callback, string organization)
+        private async Task<Octokit.Repository> CreateRepositoryInternal(NewRepository newRepository, string organization)
         {
             try
             {
                 logger.Trace("Creating repository");
 
                 if (!await LoadKeychainInternal())
                 {
-                    callback(null, new Exception("Keychain Not Loaded"));
-                    return;
+                    return null;
                 }
 
                 Octokit.Repository repository;
@@ -208,13 +215,12 @@ private async Task CreateRepositoryInternal(NewRepository newRepository, Action<
                 }
 
                 logger.Trace("Created Repository");
-
-                callback(repository, null);
+                return repository;
             }
             catch (Exception ex)
             {
                 logger.Error(ex, "Error Creating Repository");
-                callback(null, ex);
+                throw;
             }
         }
 

src/GitHub.Api/Metrics/UsageTracker.cs

@@ -145,7 +145,7 @@ private async Task SendUsage()
                     }
                     catch (Exception ex)
                     {
-                        Logger.Warning(ex, "Error Sending Usage");
+                        Logger.Warning(@"Error Sending Usage Exception Type:""{0}"" Message:""{1}""", ex.GetType().ToString(), ex.Message);
                     }
                 }
 

src/UnityExtension/Assets/Editor/GitHub.Unity/EntryPoint.cs

@@ -37,7 +37,7 @@ private static void Initialize()
 
             if (ApplicationCache.Instance.FirstRun)
             {
-                Debug.Log("Initializing GitHub for Unity version " + ApplicationInfo.Version);
+                Debug.Log("Initialized GitHub for Unity version " + ApplicationInfo.Version);
 
                 var oldLogPath = logPath.Parent.Combine(logPath.FileNameWithoutExtension + "-old" + logPath.ExtensionWithDot);
                 try
@@ -53,7 +53,7 @@ private static void Initialize()
                     Logging.Error(ex, "Error rotating log files");
                 }
 
-                Debug.Log("Initializing GitHub for Unity log file: " + logPath);
+                Debug.Log("Initialized GitHub for Unity log file: " + logPath);
             }
             Logging.LogAdapter = new FileLogAdapter(logPath);
             Logging.Info("Initializing GitHub for Unity version " + ApplicationInfo.Version);

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

@@ -75,22 +75,25 @@ private void PopulateView()
                     Client.LoadKeychain(hasKeys => {
                         if (!hasKeys)
                         {
+                            Logger.Warning("Unable to get current user");
+                            isBusy = false;
                             return;
                         }
 
                         //TODO: ONE_USER_LOGIN This assumes only ever one user can login
                         username = keychainConnections.First().Username;
 
                         Client.GetOrganizations(organizations => {
+                            Logger.Trace("Loaded {0} organizations", organizations.Count);
 
                             var organizationLogins = organizations
                                 .OrderBy(organization => organization.Login)
                                 .Select(organization => organization.Login);
 
                             owners = new[] { username }.Union(organizationLogins).ToArray();
+
+                            isBusy = false;
                         });
-                    }).Finally(task => {
-                        isBusy = false;
                     });
                 }
                 else
@@ -217,7 +220,7 @@ public override void OnGUI()
 
                             GitClient.RemoteAdd("origin", repository.CloneUrl)
                                      .Then(GitClient.Push("origin", Repository.CurrentBranch.Value.Name))
-                                     .ThenInUI(Parent.Finish)
+                                     .ThenInUI(Finish)
                                      .Start();
                         }, organization);
                     }

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

@@ -67,7 +67,6 @@ class SettingsView : Subview
         private const string DefaultRepositoryRemoteName = "origin";
 
         [NonSerialized] private int newGitIgnoreRulesSelection = -1;
-        [NonSerialized] private ConfigRemote? activeRemote;
 
         [SerializeField] private string gitName;
         [SerializeField] private string gitEmail;
@@ -94,6 +93,8 @@ public override void OnEnable()
         {
             base.OnEnable();
             AttachHandlers(Repository);
+
+            remoteHasChanged = true;
         }
 
         public override void OnDisable()
@@ -114,8 +115,9 @@ public override void OnRepositoryChanged(IRepository oldRepository)
 
             DetachHandlers(oldRepository);
             AttachHandlers(Repository);
-            activeRemote = Repository.CurrentRemote;
+
             remoteHasChanged = true;
+
             Refresh();
         }
 
@@ -178,7 +180,7 @@ private void MaybeUpdateData()
 
             if (Repository == null)
             {
-                if (cachedUser == null || String.IsNullOrEmpty(cachedUser.Name))
+                if ((cachedUser == null || String.IsNullOrEmpty(cachedUser.Name)) && GitClient != null)
                 {
                     var user = new User();
                     GitClient.GetConfig("user.name", GitConfigSource.User)
@@ -221,6 +223,7 @@ private void MaybeUpdateData()
             if (remoteHasChanged)
             {
                 remoteHasChanged = false;
+                var activeRemote = Repository.CurrentRemote;
                 hasRemote = activeRemote.HasValue && !String.IsNullOrEmpty(activeRemote.Value.Url);
                 if (!hasRemote)
                 {
@@ -245,7 +248,6 @@ private void ResetToDefaults()
 
         private void Repository_OnActiveRemoteChanged(string remote)
         {
-            activeRemote = Repository.CurrentRemote;
             remoteHasChanged = true;
         }