Lazy load dialog and clone service in GitHubConnectSection.

Author: grokys

src/GitHub.TeamFoundation.14/Connect/GitHubConnectSection.cs

@@ -32,8 +32,6 @@ public class GitHubConnectSection : TeamExplorerSectionBase, IGitHubConnectSecti
         readonly IPackageSettings packageSettings;
         readonly IVSServices vsServices;
         readonly int sectionIndex;
-        readonly IDialogService dialogService;
-        readonly IRepositoryCloneService cloneService;
         readonly ILocalRepositories localRepositories;
 
         bool isCloning;
@@ -100,8 +98,6 @@ public GitHubConnectSection(IGitHubServiceProvider serviceProvider,
             IConnectionManager manager,
             IPackageSettings packageSettings,
             IVSServices vsServices,
-            IRepositoryCloneService cloneService,
-            IDialogService dialogService,
             ILocalRepositories localRepositories,
             int index)
             : base(serviceProvider, apiFactory, holder, manager)
@@ -111,8 +107,6 @@ public GitHubConnectSection(IGitHubServiceProvider serviceProvider,
             Guard.ArgumentNotNull(manager, nameof(manager));
             Guard.ArgumentNotNull(packageSettings, nameof(packageSettings));
             Guard.ArgumentNotNull(vsServices, nameof(vsServices));
-            Guard.ArgumentNotNull(cloneService, nameof(cloneService));
-            Guard.ArgumentNotNull(dialogService, nameof(dialogService));
             Guard.ArgumentNotNull(localRepositories, nameof(localRepositories));
 
             Title = "GitHub";
@@ -123,8 +117,6 @@ public GitHubConnectSection(IGitHubServiceProvider serviceProvider,
 
             this.packageSettings = packageSettings;
             this.vsServices = vsServices;
-            this.cloneService = cloneService;
-            this.dialogService = dialogService;
             this.localRepositories = localRepositories;
 
             Clone = CreateAsyncCommandHack(DoClone);
@@ -136,13 +128,15 @@ public GitHubConnectSection(IGitHubServiceProvider serviceProvider,
 
         async Task DoClone()
         {
+            var dialogService = ServiceProvider.GetService<IDialogService>();
             var result = await dialogService.ShowCloneDialog(SectionConnection);
 
             if (result != null)
             {
                 try
                 {
                     ServiceProvider.GitServiceProvider = TEServiceProvider;
+                    var cloneService = ServiceProvider.GetService<IRepositoryCloneService>();
                     await cloneService.CloneRepository(
                         result.Repository.CloneUrl,
                         result.Repository.Name,
@@ -381,6 +375,7 @@ async Task RefreshRepositories()
 
         public void DoCreate()
         {
+            var dialogService = ServiceProvider.GetService<IDialogService>();
             dialogService.ShowCreateRepositoryDialog(SectionConnection);
         }
 
@@ -391,6 +386,7 @@ public void SignOut()
 
         public void Login()
         {
+            var dialogService = ServiceProvider.GetService<IDialogService>();
             dialogService.ShowLoginDialog();
         }
 

src/GitHub.TeamFoundation.14/Connect/GitHubConnectSection0.cs

@@ -20,10 +20,8 @@ public GitHubConnectSection0(IGitHubServiceProvider serviceProvider,
             IConnectionManager manager,
             IPackageSettings settings,
             IVSServices vsServices,
-            IRepositoryCloneService cloneService,
-            IDialogService dialogService,
             ILocalRepositories localRepositories)
-            : base(serviceProvider, apiFactory, holder, manager, settings, vsServices, cloneService, dialogService, localRepositories, 0)
+            : base(serviceProvider, apiFactory, holder, manager, settings, vsServices, localRepositories, 0)
         {
         }
     }

src/GitHub.TeamFoundation.14/Connect/GitHubConnectSection1.cs

@@ -20,10 +20,8 @@ public GitHubConnectSection1(IGitHubServiceProvider serviceProvider,
             IConnectionManager manager,
             IPackageSettings settings,
             IVSServices vsServices,
-            IRepositoryCloneService cloneService,
-            IDialogService dialogService,
             ILocalRepositories localRepositories)
-            : base(serviceProvider, apiFactory, holder, manager, settings, vsServices, cloneService, dialogService, localRepositories, 1)
+            : base(serviceProvider, apiFactory, holder, manager, settings, vsServices, localRepositories, 1)
         {
         }
     }