Merge pull request #992 from github/merge-2.2.0.11

Merge 2.2.0.11 into master

Author: shana

src/GitHub.App/Models/RepositoryHost.cs

@@ -122,7 +122,7 @@ public IObservable<AuthenticationResult> LogIn(string usernameOrEmail, string pa
                 // Try to get an authorization token, save it, then get the user to log in:
                 .SelectMany(fingerprint => ApiClient.GetOrCreateApplicationAuthenticationCode(interceptingTwoFactorChallengeHandler))
                 .SelectMany(saveAuthorizationToken)
-                .SelectMany(_ => GetUserFromApi())
+                .SelectMany(_ => GetUserFromApiWithDelay())
                 .Catch<UserAndScopes, ApiException>(firstTryEx =>
                 {
                     var exception = firstTryEx as AuthorizationException;
@@ -163,7 +163,7 @@ public IObservable<AuthenticationResult> LogIn(string usernameOrEmail, string pa
                             })
                             // Then save the authorization token (if there is one) and get the user:
                             .SelectMany(saveAuthorizationToken)
-                            .SelectMany(_ => GetUserFromApi());
+                            .SelectMany(_ => GetUserFromApiWithDelay());
                     }
 
                     return Observable.Throw<UserAndScopes>(firstTryEx);
@@ -178,7 +178,7 @@ public IObservable<AuthenticationResult> LogIn(string usernameOrEmail, string pa
                     // instead of 404 to signal that it's not allowed. In the name of backwards compatibility we 
                     // test for both 404 (NotFoundException) and 403 (ForbiddenException) here.
                     if (isEnterprise && (retryEx is NotFoundException || retryEx is ForbiddenException || retryEx.StatusCode == (HttpStatusCode)422))
-                        return GetUserFromApi();
+                        return GetUserFromApiWithDelay();
 
                     // Other errors are "real" so we pass them along:
                     return Observable.Throw<UserAndScopes>(retryEx);
@@ -268,6 +268,15 @@ IObservable<AuthenticationResult> LoginWithApiUser(UserAndScopes userAndScopes)
                 });
         }
 
+        IObservable<UserAndScopes> GetUserFromApiWithDelay()
+        {
+            // It seems that attempting to use a token immediately sometimes fails, add a delay
+            // of 1s to allow the token to propagate.
+            return Observable.Defer(() => 
+                Observable.Timer(TimeSpan.FromMilliseconds(1000))
+                          .SelectMany(_ => ApiClient.GetUser()));
+        }
+
         IObservable<UserAndScopes> GetUserFromApi()
         {
             return Observable.Defer(() => ApiClient.GetUser());

src/GitHub.TeamFoundation.14/Home/GitHubHomeSection.cs

@@ -26,6 +26,7 @@ public class GitHubHomeSection : TeamExplorerSectionBase, IGitHubHomeSection
     {
         public const string GitHubHomeSectionId = "72008232-2104-4FA0-A189-61B0C6F91198";
         const string TrainingUrl = "https://services.github.com/on-demand/windows/visual-studio";
+        readonly static Guid welcomeMessageGuid = new Guid(Guids.TeamExplorerWelcomeMessage);
 
         readonly IVisualStudioBrowser visualStudioBrowser;
         readonly ITeamExplorerServices teamExplorerServices;
@@ -53,25 +54,6 @@ public GitHubHomeSection(IGitHubServiceProvider serviceProvider,
             var openOnGitHub = ReactiveCommand.Create();
             openOnGitHub.Subscribe(_ => DoOpenOnGitHub());
             OpenOnGitHub = openOnGitHub;
-
-            // We want to display a welcome message but only if Team Explorer isn't
-            // already displaying the "Install 3rd Party Tools" message. To do this
-            // we need to set a timer and check in the tick as at this point the message
-            // won't be initialized.
-            if (!settings.HideTeamExplorerWelcomeMessage)
-            {
-                var timer = new DispatcherTimer();
-                timer.Interval = new TimeSpan(10);
-                timer.Tick += (s, e) =>
-                {
-                    timer.Stop();
-                    if (!IsGitToolsMessageVisible())
-                    {
-                        ShowWelcomeMessage();
-                    }
-                };
-                timer.Start();
-            }
         }
 
         bool IsGitToolsMessageVisible()
@@ -93,12 +75,24 @@ protected async override void RepoChanged(bool changed)
                 RepoName = ActiveRepoName;
                 RepoUrl = ActiveRepoUri.ToString();
                 Icon = GetIcon(false, true, false);
+
+                // We want to display a welcome message but only if Team Explorer isn't
+                // already displaying the "Install 3rd Party Tools" message and the current repo is hosted on GitHub. 
+                if (!settings.HideTeamExplorerWelcomeMessage && !IsGitToolsMessageVisible())
+                {
+                    ShowWelcomeMessage();
+                }
+
                 Debug.Assert(SimpleApiClient != null,
                     "If we're in this block, simpleApiClient cannot be null. It was created by UpdateStatus");
                 var repo = await SimpleApiClient.GetRepository();
                 Icon = GetIcon(repo.Private, true, repo.Fork);
                 IsLoggedIn = IsUserAuthenticated();
             }
+            else
+            {
+                teamExplorerServices.HideNotification(welcomeMessageGuid);
+            }
         }
 
         public override async void Refresh()
@@ -108,6 +102,7 @@ public override async void Refresh()
             {
                 IsLoggedIn = IsUserAuthenticated();
             }
+
             base.Refresh();
         }
 
@@ -149,7 +144,6 @@ void DoOpenOnGitHub()
 
         void ShowWelcomeMessage()
         {
-            var welcomeMessageGuid = new Guid(Guids.TeamExplorerWelcomeMessage);
             teamExplorerServices.ShowMessage(
                 Resources.TeamExplorerWelcomeMessage,
                 new RelayCommand(o =>

src/GitHub.VisualStudio/GitHub.VisualStudio.csproj

@@ -734,4 +734,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

src/GitHub.VisualStudio/Services/UsageTracker.cs

@@ -11,21 +11,21 @@
 using GitHub.Extensions;
 using System.Threading.Tasks;
 using GitHub.Helpers;
+using System.Threading;
 
 namespace GitHub.Services
 {
-    public class UsageTracker : IUsageTracker
+    public sealed class UsageTracker : IUsageTracker, IDisposable
     {
         const string StoreFileName = "ghfvs.usage";
         static readonly Calendar cal = CultureInfo.InvariantCulture.Calendar;
 
         readonly IGitHubServiceProvider gitHubServiceProvider;
-        readonly DispatcherTimer timer;
-
         IMetricsService client;
         IConnectionManager connectionManager;
         IPackageSettings userSettings;
         IVSServices vsservices;
+        Timer timer;
         string storePath;
         bool firstRun = true;
 
@@ -61,13 +61,16 @@ public UsageTracker(IGitHubServiceProvider gitHubServiceProvider)
             };
             dirCreate = (path) => System.IO.Directory.CreateDirectory(path);
 
-            this.timer = new DispatcherTimer(
-                TimeSpan.FromMinutes(3),
-                DispatcherPriority.Background,
+            this.timer = new Timer(
                 TimerTick,
-                ThreadingHelper.MainThreadDispatcher);
+                null,
+                TimeSpan.FromMinutes(3),
+                TimeSpan.FromHours(8));
+        }
 
-            RunTimer();
+        public void Dispose()
+        {
+            timer?.Dispose();
         }
 
         public async Task IncrementLaunchCount()
@@ -244,14 +247,7 @@ void SaveUsage(UsageStore store)
             writeAllText(storePath, json, Encoding.UTF8);
         }
 
-        void RunTimer()
-        {
-            // The timer first ticks after 3 minutes to allow things to settle down after startup.
-            // This will be changed to 8 hours after the first tick by the TimerTick method.
-            timer.Start();
-        }
-
-        void TimerTick(object sender, EventArgs e)
+        void TimerTick(object state)
         {
             TimerTick()
                 .Catch(ex =>
@@ -268,13 +264,13 @@ async Task TimerTick()
             if (firstRun)
             {
                 await IncrementLaunchCount();
-                timer.Interval = TimeSpan.FromHours(8);
                 firstRun = false;
             }
 
             if (client == null || !userSettings.CollectMetrics)
             {
-                timer.Stop();
+                timer.Dispose();
+                timer = null;
                 return;
             }