Use constants for settings keys

Author: shana

src/GitHub.Api/ApplicationManagerBase.cs

@@ -35,7 +35,7 @@ protected void Initialize()
             LocalSettings.Initialize();
             SystemSettings.Initialize();
 
-            Logging.TracingEnabled = UserSettings.Get("EnableTraceLogging", false);
+            Logging.TracingEnabled = UserSettings.Get(Constants.TraceLoggingKey, false);
             ProcessManager = new ProcessManager(Environment, Platform.GitEnvironment, CancellationToken);
             Platform.Initialize(ProcessManager, TaskManager);
             GitClient = new GitClient(Environment, ProcessManager, Platform.CredentialManager, TaskManager);
@@ -134,7 +134,7 @@ private async Task SetupAndRestart(ProgressReport progress)
         private async Task<NPath> LookForGitInstallationPath()
         {
             NPath cachedGitInstallPath = null;
-            var path = SystemSettings.Get("GitInstallPath");
+            var path = SystemSettings.Get(Constants.GitInstallPathKey);
             if (!String.IsNullOrEmpty(path))
                 cachedGitInstallPath = path.ToNPath();
 
@@ -150,21 +150,22 @@ protected void SetupMetrics(string unityVersion, bool firstRun)
         {
             Logger.Trace("Setup metrics");
 
-            var usagePath = Environment.UserCachePath.Combine("usage.json");
+            var usagePath = Environment.UserCachePath.Combine(Constants.UsageFile);
 
-            string id;
-            if (!UserSettings.Exists("Id"))
+            string id = null;
+            if (UserSettings.Exists(Constants.GuidKey))
             {
-                id = Guid.NewGuid().ToString();
-                UserSettings.Set("Id", id);
+                id = UserSettings.Get(Constants.GuidKey);
             }
-            else
+
+            if (String.IsNullOrEmpty(id))
             {
-                id = UserSettings.Get("Id");
+                id = Guid.NewGuid().ToString();
+                UserSettings.Set(Constants.GuidKey, id);
             }
 
             UsageTracker = new UsageTracker(usagePath, id, unityVersion);
-            UsageTracker.Enabled = UserSettings.Get("MetricsEnabled", true);
+            UsageTracker.Enabled = UserSettings.Get(Constants.MetricsKey, true);
 
             if (firstRun)
             {

src/GitHub.Api/Constants.cs

@@ -0,0 +1,11 @@
+namespace GitHub.Unity
+{
+    static class Constants
+    {
+        public const string GuidKey = "Guid";
+        public const string MetricsKey = "MetricsEnabled";
+        public const string UsageFile = "usage.json";
+        public const string GitInstallPathKey = "GitInstallPath";
+        public const string TraceLoggingKey = "EnableTraceLogging";
+    }
+}

src/GitHub.Api/GitHub.Api.csproj

@@ -102,6 +102,7 @@
     <Compile Include="Authentication\LoginManager.cs" />
     <Compile Include="Authentication\ILoginManager.cs" />
     <Compile Include="ApplicationManagerBase.cs" />
+    <Compile Include="Constants.cs" />
     <Compile Include="DefaultEnvironment.cs" />
     <Compile Include="Extensions\EnvironmentExtensions.cs" />
     <Compile Include="Extensions\FileEventExtensions.cs" />

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

@@ -668,7 +668,7 @@ private void OnPrivacyGui()
             if (EditorGUI.EndChangeCheck())
             {
                 EntryPoint.UsageTracker.Enabled = metricsEnabled;
-                Manager.UserSettings.Set("MetricsEnabled", metricsEnabled);
+                Manager.UserSettings.Set(Constants.MetricsKey, metricsEnabled);
 
                 GUI.FocusControl(null);
             }
@@ -691,7 +691,7 @@ private void OnLoggingSettingsGui()
             if (EditorGUI.EndChangeCheck())
             {
                 Logging.TracingEnabled = traceLogging;
-                Manager.UserSettings.Set("EnableTraceLogging", traceLogging);
+                Manager.UserSettings.Set(Constants.TraceLoggingKey, traceLogging);
 
                 GUI.FocusControl(null);
             }