Merge pull request #756 from github-for-unity/fixes/remove-ambiguous-variables

Remove ambiguous variables/parameters

Author: StanleyGoldman

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -57,7 +57,7 @@ public void Run()
                 GitInstallationState state = new GitInstallationState();
                 try
                 {
-                    SetupMetrics(Environment.UnityVersion, instanceId);
+                    SetupMetrics(Environment.UnityVersion);
 
                     if (Environment.IsMac)
                     {
@@ -279,7 +279,7 @@ public void RestartRepository()
             Logger.Trace($"Got a repository? {(Environment.Repository != null ? Environment.Repository.LocalPath : "null")}");
         }
 
-        protected void SetupMetrics(string unityVersion, Guid instanceId)
+        protected void SetupMetrics(string unityVersion)
         {
             string userId = null;
             if (UserSettings.Exists(Constants.GuidKey))
@@ -300,7 +300,7 @@ protected void SetupMetrics(string unityVersion, Guid instanceId)
                 Environment.NodeJsExecutablePath,
                 Environment.OctorunScriptPath);
 
-            UsageTracker = new UsageTracker(metricsService, UserSettings, Environment, userId, unityVersion, instanceId.ToString());
+            UsageTracker = new UsageTracker(metricsService, UserSettings, Environment, userId, unityVersion, InstanceId.ToString());
 
             if (firstRun)
             {

src/GitHub.Api/Managers/Downloader.cs

@@ -116,10 +116,10 @@ public Task<DownloadData> QueueDownload(UriString url, NPath targetDirectory)
                 return aggregateDownloads.Task;
             }
 
-            private ITask<NPath> DownloadFile(UriString url, NPath targetDirectory, DownloadData result, Action<ITask<NPath>, NPath, bool, Exception> verifyDownload)
+            private ITask<NPath> DownloadFile(UriString url, NPath targetDirectory, DownloadData res, Action<ITask<NPath>, NPath, bool, Exception> verifyDownload)
             {
                 var download = new DownloadTask(cancellationToken, fs, url, targetDirectory)
-                    .Catch(e => { DownloadFailed(result, e); return true; });
+                    .Catch(e => { DownloadFailed(res, e); return true; });
                 download.OnEnd += verifyDownload;
                 return download;
             }

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitPathView.cs

@@ -229,7 +229,7 @@ private void ValidateAndSetGitInstallPath()
                         }
                         return state;
                     })
-                    .FinallyInUI((success, exception, installationState) =>
+                    .FinallyInUI((success, exception, state) =>
                     {
                         if (!success)
                         {