Merge pull request #198 from github-for-unity/fixes/publish-view-faster-load

Fix to load the PublishView faster

Author: StanleyGoldman

src/GitHub.Api/Application/ApiClient.cs

@@ -79,6 +79,13 @@ public async Task GetOrganizations(Action<IList<Organization>> callback)
             callback(organizations);
         }
 
+        public async Task LoadKeychain(Action<bool> callback)
+        {
+            Guard.ArgumentNotNull(callback, "callback");
+            var hasLoadedKeys = await LoadKeychainInternal();
+            callback(hasLoadedKeys);
+        }
+
         public async Task GetCurrentUser(Action<Octokit.User> callback)
         {
             Guard.ArgumentNotNull(callback, "callback");
@@ -188,7 +195,7 @@ public async Task<bool> ContinueLoginAsync(LoginResult loginResult, Func<LoginRe
             {
                 logger.Trace("Creating repository");
 
-                if (!await EnsureKeychainLoaded())
+                if (!await LoadKeychainInternal())
                 {
                     throw new InvalidOperationException("The keychain did not load");
                 }
@@ -223,9 +230,9 @@ private async Task<IList<Organization>> GetOrganizationInternal()
             {
                 logger.Trace("Getting Organizations");
 
-                if (!await EnsureKeychainLoaded())
+                if (!await LoadKeychainInternal())
                 {
-                    return null;
+                    return new List<Organization>();
                 }
 
                 var organizations = await githubClient.Organization.GetAllForCurrent();
@@ -252,7 +259,7 @@ private async Task<IList<Organization>> GetOrganizationInternal()
             {
                 logger.Trace("Getting Organizations");
 
-                if (!await EnsureKeychainLoaded())
+                if (!await LoadKeychainInternal())
                 {
                     return null;
                 }
@@ -268,27 +275,28 @@ private async Task<IList<Organization>> GetOrganizationInternal()
             return userCache;
         }
 
-        private async Task<bool> EnsureKeychainLoaded()
+        private async Task<bool> LoadKeychainInternal()
         {
-            logger.Trace("EnsureKeychainLoaded");
+            logger.Trace("LoadKeychainInternal");
 
             if (keychain.HasKeys)
             {
                 if (!keychain.NeedsLoad)
                 {
-                    logger.Trace("EnsureKeychainLoaded: Has keys does not need load");
+                    logger.Trace("LoadKeychainInternal: Has keys does not need load");
                     return true;
                 }
 
-                logger.Trace("EnsureKeychainLoaded: Loading");
+                logger.Trace("LoadKeychainInternal: Loading");
 
+                //TODO: ONE_USER_LOGIN This assumes only ever one user can login
                 var uriString = keychain.Connections.First().Host;
                 var keychainAdapter = await keychain.Load(uriString);
 
                 return keychainAdapter.OctokitCredentials != Credentials.Anonymous;
             }
 
-            logger.Trace("EnsureKeychainLoaded: No keys to load");
+            logger.Trace("LoadKeychainInternal: No keys to load");
 
             return false;
         }

src/GitHub.Api/Application/IApiClient.cs

@@ -17,5 +17,6 @@ interface IApiClient
         Task<bool> ValidateCredentials();
         Task Logout(UriString host);
         Task GetCurrentUser(Action<Octokit.User> callback);
+        Task LoadKeychain(Action<bool> callback);
     }
 }

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

@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Threading.Tasks;
 using Octokit;
 using Rackspace.Threading;
 using UnityEditor;
@@ -65,40 +66,33 @@ private void PopulateView()
             try
             {
                 var keychainConnections = Platform.Keychain.Connections;
+                //TODO: ONE_USER_LOGIN This assumes only ever one user can login
                 if (keychainConnections.Any())
                 {
                     Logger.Trace("GetCurrentUser");
 
                     isBusy = true;
 
-                    Client.GetCurrentUser(user => {
-                        if (user == null)
+                    Client.LoadKeychain(hasKeys => {
+                        if (!hasKeys)
                         {
                             Logger.Warning("Unable to get current user");
                             isBusy = false;
                             return;
                         }
 
-                        owners = owners.Union(new[] { user.Login }).ToArray();
-                        username = user.Login;
-
-                        Logger.Trace("GetOrganizations");
+                        //TODO: ONE_USER_LOGIN This assumes only ever one user can login
+                        username = keychainConnections.First().Username;
 
                         Client.GetOrganizations(organizations => {
-                            if (organizations == null)
-                            {
-                                Logger.Warning("Unable to get list of organizations");
-                                isBusy = false;
-                                return;
-                            }
-
                             Logger.Trace("Loaded {0} organizations", organizations.Count);
 
                             var organizationLogins = organizations
                                 .OrderBy(organization => organization.Login)
                                 .Select(organization => organization.Login);
 
-                            owners = owners.Union(organizationLogins).ToArray();
+                            owners = new[] { username }.Union(organizationLogins).ToArray();
+
                             isBusy = false;
                         });
                     });