Merge pull request #1097 from GoogleCloudPlatform/quoct/fix_crash

Fix crash when Visual Studio Team is opened
GoogleCloudPlatform · Oct 8, 2019 · d9f628f · d9f628f
2 parents c7936a8 + f418f92
commit d9f628f
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 8 deletions.
diff --git a/GoogleCloudExtension/GoogleCloudExtension.TeamExplorerExtension.v14/Section.cs b/GoogleCloudExtension/GoogleCloudExtension.TeamExplorerExtension.v14/Section.cs
@@ -32,7 +32,7 @@ public class Section : Model, ITeamExplorerSection
 
         private readonly ISectionViewModel _viewModel;
         private IServiceProvider _serviceProvider;
-        private TeamExplorerUtils _teamExploerServices;
+        private TeamExplorerUtils _teamExplorerServices;
         private bool _isBusy;
         private bool _isExpanded = true;
         private bool _isVisible = true;
@@ -51,7 +51,7 @@ public object SectionContent
                 // When this get_SectionContent is called, Team Explorer is trying to refresh the section content.
                 // This is the chance to update the section view with new active repo.
                 Debug.WriteLine($"CsrTeamExplorerSection.SectionContent");
-                string newActive = _teamExploerServices?.GetActiveRepository();
+                string newActive = _teamExplorerServices?.GetActiveRepository();
                 if (string.Compare(newActive, _activeRepo, StringComparison.OrdinalIgnoreCase) != 0)
                 {
                     _viewModel.UpdateActiveRepo(newActive);
@@ -140,12 +140,12 @@ void ITeamExplorerSection.Loaded(object sender, SectionLoadedEventArgs e)
             Debug.WriteLine($"CsrTeamExplorerSection.Loaded {sender.GetType().Name} {sender.ToString()}, {e}");
         }
 
-        void ITeamExplorerSection.Initialize(object sender, SectionInitializeEventArgs e)
+        async void ITeamExplorerSection.Initialize(object sender, SectionInitializeEventArgs e)
         {
             Debug.WriteLine($"CsrTeamExplorerSection.Initialize");
             _serviceProvider = e.ServiceProvider;
-            _teamExploerServices = new TeamExplorerUtils(_serviceProvider);
-            _viewModel.Initialize(_teamExploerServices);
+            _teamExplorerServices = new TeamExplorerUtils(_serviceProvider);
+            await _viewModel.InitializeAsync(_teamExplorerServices);
         }
 
         void ITeamExplorerSection.Cancel()

diff --git a/GoogleCloudExtension/GoogleCloudExtension.TeamExplorerExtension/ISectionViewModel.cs b/GoogleCloudExtension/GoogleCloudExtension.TeamExplorerExtension/ISectionViewModel.cs
@@ -13,6 +13,8 @@
 // limitations under the License.
 
 
+using System.Threading.Tasks;
+
 namespace GoogleCloudExtension.TeamExplorerExtension
 {
     /// <summary>
@@ -28,7 +30,7 @@ public interface ISectionViewModel
         /// <summary>
         /// Initializes the view model with <paramref name="teamExplorerService"/> input.
         /// </summary>
-        void Initialize(ITeamExplorerUtils teamExplorerService);
+        Task InitializeAsync(ITeamExplorerUtils teamExplorerService);
 
         /// <summary>
         /// Notifies that the current active repository changed

diff --git a/...CloudExtension/GoogleCloudExtension/CloudSourceRepositories/CsrSectionControlViewModel.cs b/...CloudExtension/GoogleCloudExtension/CloudSourceRepositories/CsrSectionControlViewModel.cs
@@ -142,8 +142,24 @@ public void Refresh()
             }
         }
 
-        void ISectionViewModel.Initialize(ITeamExplorerUtils teamExplorerService)
+        async Task ISectionViewModel.InitializeAsync(ITeamExplorerUtils teamExplorerService)
         {
+            // When the user switches to TeamExplorer immediately after opening Visual Studio,
+            // sometimes, GoogleCloudExtensionPackage is not initialized. This is a hack to
+            // retry until the instance is initialized. 
+            int retryAttempts = 3;
+            while (retryAttempts > 0 && GoogleCloudExtensionPackage.Instance == null)
+            {
+                await Task.Delay(2000);
+                retryAttempts--;
+            }
+
+            if (GoogleCloudExtensionPackage.Instance == null)
+            {
+                teamExplorerService.ShowError(Resources.FailedLoadingCsr);
+                return;
+            }
+
             EventsReporterWrapper.ReportEvent(CsrConnectSectionOpenEvent.Create());
             Debug.WriteLine("CsrSectionControlViewModel Initialize");
 

diff --git a/GoogleCloudExtension/GoogleCloudExtension/Resources.Designer.cs b/GoogleCloudExtension/GoogleCloudExtension/Resources.Designer.cs
diff --git a/GoogleCloudExtension/GoogleCloudExtension/Resources.resx b/GoogleCloudExtension/GoogleCloudExtension/Resources.resx
@@ -2523,4 +2523,7 @@ Delete corrupted file?</value>
     <value>Kubernetes Engine Code Lab</value>
     <comment>The tooltip of the info link of the kubernetes console link.</comment>
   </data>
+  <data name="FailedLoadingCsr" xml:space="preserve">
+    <value>Failed to load Cloud Source Repository.</value>
+  </data>
 </root>