WIP: Removing RepositoryHost(s)

github · grokys · Nov 8, 2017 · Oct 20, 2017 · Oct 23, 2017 · Oct 23, 2017
commit f854b79087a99cc631f8f245acb0f08330d79b7a
diff --git a/src/GitHub.App/Controllers/UIController.cs b/src/GitHub.App/Controllers/UIController.cs
@@ -98,7 +98,6 @@ internal enum Trigger
 
         readonly IUIFactory factory;
         readonly IGitHubServiceProvider gitHubServiceProvider;
-        readonly IRepositoryHosts hosts;
         readonly IConnectionManager connectionManager;
 
         readonly CompositeDisposable disposables = new CompositeDisposable();
@@ -140,25 +139,22 @@ internal enum Trigger
 
         public UIController(IGitHubServiceProvider serviceProvider)
             : this(serviceProvider,
-                   serviceProvider.TryGetService<IRepositoryHosts>(),
                    serviceProvider.TryGetService<IUIFactory>(),
                    serviceProvider.TryGetService<IConnectionManager>())
         {
             Guard.ArgumentNotNull(serviceProvider, nameof(serviceProvider));
         }
 
         public UIController(IGitHubServiceProvider gitHubServiceProvider,
-            IRepositoryHosts hosts, IUIFactory factory,
+            IUIFactory factory,
             IConnectionManager connectionManager)
         {
             Guard.ArgumentNotNull(gitHubServiceProvider, nameof(gitHubServiceProvider));
-            Guard.ArgumentNotNull(hosts, nameof(hosts));
             Guard.ArgumentNotNull(factory, nameof(factory));
             Guard.ArgumentNotNull(connectionManager, nameof(connectionManager));
 
             this.factory = factory;
             this.gitHubServiceProvider = gitHubServiceProvider;
-            this.hosts = hosts;
             this.connectionManager = connectionManager;
 
 #if DEBUG
@@ -220,7 +216,7 @@ public void Start()
                 else // sanity check: it makes zero sense to pass a connection in when calling the auth flow
                     Debug.Assert(false, "Calling the auth flow with a connection makes no sense!");
 
-                hosts.EnsureInitialized().ToObservable()
+                connectionManager.GetLoadedConnections().ToObservable()
                     .ObserveOn(RxApp.MainThreadScheduler)
                     .Subscribe(_ => { }, () =>
                     {
@@ -231,7 +227,7 @@ public void Start()
             else
                {
                 connectionManager
-                    .GetLoggedInConnections(hosts)
+                    .GetLoggedInConnections()
                     .FirstOrDefaultAsync()
                     .Select(c =>
                     {

diff --git a/src/GitHub.App/Factories/RepositoryHostFactory.cs b/src/GitHub.App/Factories/RepositoryHostFactory.cs
diff --git a/src/GitHub.App/GitHub.App.csproj b/src/GitHub.App/GitHub.App.csproj
@@ -183,9 +183,6 @@
     <Compile Include="Info\GitHubUrls.cs" />
     <Compile Include="Infrastructure\ExportWrappers.cs" />
     <Compile Include="Models\Account.cs" />
-    <Compile Include="Models\DisconnectedRepositoryHosts.cs" />
-    <Compile Include="Models\RepositoryHost.cs" />
-    <Compile Include="Models\RepositoryHosts.cs" />
     <Compile Include="Models\RemoteRepositoryModel.cs" />
     <Compile Include="SampleData\SampleViewModels.cs" />
     <Compile Include="Api\ApiClient.cs" />
@@ -209,7 +206,6 @@
     <Compile Include="UserErrors\PrivateRepositoryQuotaExceededUserError.cs" />
     <Compile Include="ViewModels\PanePageViewModelBase.cs" />
     <Compile Include="ViewModels\DialogViewModelBase.cs" />
-    <Compile Include="Models\ConnectionRepositoryHostMap.cs" />
     <Compile Include="ViewModels\GistCreationViewModel.cs" />
     <Compile Include="ViewModels\NotAGitRepositoryViewModel.cs" />
     <Compile Include="ViewModels\NotAGitHubRepositoryViewModel.cs" />

diff --git a/src/GitHub.App/Models/ConnectionRepositoryHostMap.cs b/src/GitHub.App/Models/ConnectionRepositoryHostMap.cs
diff --git a/src/GitHub.App/Models/DisconnectedRepositoryHosts.cs b/src/GitHub.App/Models/DisconnectedRepositoryHosts.cs
diff --git a/src/GitHub.App/Models/RepositoryHost.cs b/src/GitHub.App/Models/RepositoryHost.cs