Making calls to UsageTracker independant of the task execution chain

StanleyGoldman · StanleyGoldman · commit 71a7e3ea0abb · 2018-05-04T13:33:09.000-04:00
diff --git a/src/GitHub.Api/Application/ApplicationManagerBase.cs b/src/GitHub.Api/Application/ApplicationManagerBase.cs
@@ -166,8 +166,11 @@ public ITask InitializeRepository()
                     Environment.InitializeRepository();
                     RestartRepository();
                 })
-                .Then(UsageTracker.IncrementNumberOfProjectsInitialized)
-                .ThenInUI(InitializeUI);
+                .ThenInUI(() =>
+                {
+                    TaskManager.Run(UsageTracker.IncrementNumberOfProjectsInitialized);
+                    InitializeUI();
+                });
             return task;
         }
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs
@@ -305,11 +305,11 @@ private void OnButtonBarGUI()
                     if (createBranch)
                     {
                         GitClient.CreateBranch(newBranchName, treeLocals.SelectedNode.Path)
-                            .Then(UsageTracker.IncrementNumberOfLocalBranchCreations)
                             .FinallyInUI((success, e) =>
                             {
                                 if (success)
                                 {
+                                    TaskManager.Run(UsageTracker.IncrementNumberOfLocalBranchCreations);
                                     Redraw();
                                 }
                                 else
@@ -475,11 +475,11 @@ private void CheckoutRemoteBranch(string branch)
                 if (confirmCheckout)
                 {
                     GitClient.CreateBranch(branchName, branch)
-                        .Then(UsageTracker.IncrementNumberOfRemoteBranchCheckouts)
                         .FinallyInUI((success, e) =>
                         {
                             if (success)
                             {
+                                TaskManager.Run(UsageTracker.IncrementNumberOfRemoteBranchCheckouts);
                                 Redraw();
                             }
                             else
@@ -498,11 +498,11 @@ private void SwitchBranch(string branch)
                 ConfirmSwitchCancel))
             {
                 GitClient.SwitchBranch(branch)
-                    .Then(UsageTracker.IncrementNumberOfLocalBranchCheckouts)
                     .FinallyInUI((success, e) =>
                     {
                         if (success)
                         {
+                            TaskManager.Run(UsageTracker.IncrementNumberOfLocalBranchCheckouts);
                             Redraw();
                         }
                         else
@@ -519,9 +519,14 @@ private void DeleteLocalBranch(string branch)
             var dialogMessage = string.Format(DeleteBranchMessageFormatString, branch);
             if (EditorUtility.DisplayDialog(DeleteBranchTitle, dialogMessage, DeleteBranchButton, CancelButtonLabel))
             {
-                GitClient
-                    .DeleteBranch(branch, true)
-                    .Then(UsageTracker.IncrementNumberOfLocalBranchDeletions)
+                GitClient.DeleteBranch(branch, true)
+                    .FinallyInUI((success, e) =>
+                    {
+                        if (success)
+                        {
+                            TaskManager.Run(UsageTracker.IncrementNumberOfLocalBranchDeletions);
+                        }
+                    })
                     .Start();
             }
         }
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs
@@ -353,9 +353,13 @@ private void Commit()
             }
 
             addTask
-                .Then(UsageTracker.IncrementNumberOfCommits)
-                .FinallyInUI((b, exception) => 
+                .FinallyInUI((success, exception) => 
                     {
+                        if (success)
+                        {
+                            TaskManager.Run(UsageTracker.IncrementNumberOfCommits);
+                        }
+
                         commitMessage = "";
                         commitBody = "";
                     }).Start();
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs
@@ -702,10 +702,11 @@ private void Pull()
                             // (either git rebase --abort or git merge --abort)
                         }
                     }, runOptions: TaskRunOptions.OnAlways)
-                    .Then(UsageTracker.IncrementNumberOfPulls)
                     .FinallyInUI((success, e) => {
                         if (success)
                         {
+                            TaskManager.Run(UsageTracker.IncrementNumberOfPulls);
+
                             EditorUtility.DisplayDialog(Localization.PullActionTitle,
                                 String.Format(Localization.PullSuccessDescription, currentRemoteName),
                             Localization.Ok);
@@ -725,10 +726,11 @@ private void Push()
         {
             Repository
                 .Push()
-                .Then(UsageTracker.IncrementNumberOfPushes)
                 .FinallyInUI((success, e) => {
                     if (success)
                     {
+                        TaskManager.Run(UsageTracker.IncrementNumberOfPushes);
+
                         EditorUtility.DisplayDialog(Localization.PushActionTitle,
                             String.Format(Localization.PushSuccessDescription, currentRemoteName),
                         Localization.Ok);
@@ -747,10 +749,11 @@ private void Fetch()
         {
             Repository
                 .Fetch()
-                .Then(UsageTracker.IncrementNumberOfFetches)
                 .FinallyInUI((success, e) => {
                     if (!success)
                     {
+                        TaskManager.Run(UsageTracker.IncrementNumberOfFetches);
+
                         EditorUtility.DisplayDialog(FetchActionTitle, FetchFailureDescription,
                             Localization.Ok);
                     }

Original file line number	Diff line number	Diff line change
`@@ -305,11 +305,11 @@ private void OnButtonBarGUI()`
`305`	`305`	`if (createBranch)`
`306`	`306`	`{`
`307`	`307`	`GitClient.CreateBranch(newBranchName, treeLocals.SelectedNode.Path)`
`308`		`- .Then(UsageTracker.IncrementNumberOfLocalBranchCreations)`
`309`	`308`	`.FinallyInUI((success, e) =>`
`310`	`309`	`{`
`311`	`310`	`if (success)`
`312`	`311`	`{`
	`312`	`+ TaskManager.Run(UsageTracker.IncrementNumberOfLocalBranchCreations);`
`313`	`313`	`Redraw();`
`314`	`314`	`}`
`315`	`315`	`else`
`@@ -475,11 +475,11 @@ private void CheckoutRemoteBranch(string branch)`
`475`	`475`	`if (confirmCheckout)`
`476`	`476`	`{`
`477`	`477`	`GitClient.CreateBranch(branchName, branch)`
`478`		`- .Then(UsageTracker.IncrementNumberOfRemoteBranchCheckouts)`
`479`	`478`	`.FinallyInUI((success, e) =>`
`480`	`479`	`{`
`481`	`480`	`if (success)`
`482`	`481`	`{`
	`482`	`+ TaskManager.Run(UsageTracker.IncrementNumberOfRemoteBranchCheckouts);`
`483`	`483`	`Redraw();`
`484`	`484`	`}`
`485`	`485`	`else`
`@@ -498,11 +498,11 @@ private void SwitchBranch(string branch)`
`498`	`498`	`ConfirmSwitchCancel))`
`499`	`499`	`{`
`500`	`500`	`GitClient.SwitchBranch(branch)`
`501`		`- .Then(UsageTracker.IncrementNumberOfLocalBranchCheckouts)`
`502`	`501`	`.FinallyInUI((success, e) =>`
`503`	`502`	`{`
`504`	`503`	`if (success)`
`505`	`504`	`{`
	`505`	`+ TaskManager.Run(UsageTracker.IncrementNumberOfLocalBranchCheckouts);`
`506`	`506`	`Redraw();`
`507`	`507`	`}`
`508`	`508`	`else`
`@@ -519,9 +519,14 @@ private void DeleteLocalBranch(string branch)`
`519`	`519`	`var dialogMessage = string.Format(DeleteBranchMessageFormatString, branch);`
`520`	`520`	`if (EditorUtility.DisplayDialog(DeleteBranchTitle, dialogMessage, DeleteBranchButton, CancelButtonLabel))`
`521`	`521`	`{`
`522`		`- GitClient`
`523`		`- .DeleteBranch(branch, true)`
`524`		`- .Then(UsageTracker.IncrementNumberOfLocalBranchDeletions)`
	`522`	`+ GitClient.DeleteBranch(branch, true)`
	`523`	`+ .FinallyInUI((success, e) =>`
	`524`	`+ {`
	`525`	`+ if (success)`
	`526`	`+ {`
	`527`	`+ TaskManager.Run(UsageTracker.IncrementNumberOfLocalBranchDeletions);`
	`528`	`+ }`
	`529`	`+ })`
`525`	`530`	`.Start();`
`526`	`531`	`}`
`527`	`532`	`}`
Original file line number	Diff line number	Diff line change
`@@ -702,10 +702,11 @@ private void Pull()`
`702`	`702`	`// (either git rebase --abort or git merge --abort)`
`703`	`703`	`}`
`704`	`704`	`}, runOptions: TaskRunOptions.OnAlways)`
`705`		`- .Then(UsageTracker.IncrementNumberOfPulls)`
`706`	`705`	`.FinallyInUI((success, e) => {`
`707`	`706`	`if (success)`
`708`	`707`	`{`
	`708`	`+ TaskManager.Run(UsageTracker.IncrementNumberOfPulls);`
	`709`	`+`
`709`	`710`	`EditorUtility.DisplayDialog(Localization.PullActionTitle,`
`710`	`711`	`String.Format(Localization.PullSuccessDescription, currentRemoteName),`
`711`	`712`	`Localization.Ok);`
`@@ -725,10 +726,11 @@ private void Push()`
`725`	`726`	`{`
`726`	`727`	`Repository`
`727`	`728`	`.Push()`
`728`		`- .Then(UsageTracker.IncrementNumberOfPushes)`
`729`	`729`	`.FinallyInUI((success, e) => {`
`730`	`730`	`if (success)`
`731`	`731`	`{`
	`732`	`+ TaskManager.Run(UsageTracker.IncrementNumberOfPushes);`
	`733`	`+`
`732`	`734`	`EditorUtility.DisplayDialog(Localization.PushActionTitle,`
`733`	`735`	`String.Format(Localization.PushSuccessDescription, currentRemoteName),`
`734`	`736`	`Localization.Ok);`
`@@ -747,10 +749,11 @@ private void Fetch()`
`747`	`749`	`{`
`748`	`750`	`Repository`
`749`	`751`	`.Fetch()`
`750`		`- .Then(UsageTracker.IncrementNumberOfFetches)`
`751`	`752`	`.FinallyInUI((success, e) => {`
`752`	`753`	`if (!success)`
`753`	`754`	`{`
	`755`	`+ TaskManager.Run(UsageTracker.IncrementNumberOfFetches);`
	`756`	`+`
`754`	`757`	`EditorUtility.DisplayDialog(FetchActionTitle, FetchFailureDescription,`
`755`	`758`	`Localization.Ok);`
`756`	`759`	`}`