Tweak names of things, store id and unity version in the model

Author: shana

src/GitHub.Api/Metrics/UsageModel.cs

@@ -6,9 +6,8 @@ namespace GitHub.Unity
 {
     class Usage
     {
+        public string Id { get; set; }
         public DateTime Date { get; set; }
-        public bool IsGitHubUser { get; set; }
-        public bool IsEnterpriseUser { get; set; }
         public string AppVersion { get; set; }
         public string UnityVersion { get; set; }
         public string Lang { get; set; }
@@ -17,7 +16,8 @@ class Usage
 
     class UsageModel
     {
-        public List<Usage> Reports { get; } = new List<Usage>();
+        public List<Usage> Reports { get; set; } = new List<Usage>();
+        public string Id { get; set; }
 
         private Usage currentUsage;
 
@@ -38,7 +38,7 @@ public Usage GetCurrentUsage()
 
             if (currentUsage == null)
             {
-                currentUsage = new Usage { Date = date };
+                currentUsage = new Usage { Date = date, Id = Id };
                 Reports.Add(currentUsage);
             }
 

src/GitHub.Api/Metrics/UsageTracker.cs

@@ -31,6 +31,7 @@ public UsageTracker(NPath storePath, string id, string unityVersion)
 
         private UsageStore LoadUsage()
         {
+            UsageStore result = null;
             string json = null;
             if (storePath.FileExists())
             {
@@ -39,38 +40,28 @@ private UsageStore LoadUsage()
                 try
                 {
                     json = storePath.ReadAllText(Encoding.UTF8);
+                    if (json != null)
+                    {
+                        result = SimpleJson.DeserializeObject<UsageStore>(json);
+                    }
                 }
                 catch (Exception ex)
                 {
-                    Logger.Error(ex, "LoadUsage Error {0}", ex.Message);
-                }
-            }
+                    Logger.Warning(ex, "Error Loading Usage: {0}; Deleting File", storePath);
 
-            UsageStore result;
-            try
-            {
-                if (json != null)
-                {
-                    result = SimpleJson.DeserializeObject<UsageStore>(json);
-                }
-                else
-                {
-                    result = new UsageStore();
+                    try
+                    {
+                        storePath.DeleteIfExists();
+                    }
+                    catch {}
                 }
             }
-            catch (Exception ex)
+
+            if (result == null)
             {
                 result = new UsageStore();
-
-                Logger.Warning(ex, "Error Loading Usage: {0}; Deleting File", storePath);
-
-                try
-                {
-                    storePath.DeleteIfExists();
-                }
-                catch{}
+                result.Model.Id = id;
             }
-
             //TODO: Figure out these values
             //result.Model.Lang = CultureInfo.InstalledUICulture.IetfLanguageTag;
             //result.Model.AppVersion = AssemblyVersionInformation.Version;
@@ -134,7 +125,7 @@ private async Task TimerTick()
 
                 if (!Enabled)
                 {
-                    Logger.Warning("Tracking Disabled");
+                    Logger.Warning("Metrics Disabled");
                     return;
                 }
             }
@@ -152,7 +143,7 @@ private async Task TimerTick()
 
             if (!Enabled)
             {
-                Logger.Warning("Tracking Disabled");
+                Logger.Warning("Metrics Disabled");
                 return;
             }
 
@@ -169,14 +160,15 @@ private async Task SendUsage(UsageStore usage)
             var currentTimeOffset = DateTimeOffset.UtcNow;
             var beforeDate = currentTimeOffset.Date;
 
+            var success = false;
             var extractReports = usage.Model.SelectReports(beforeDate);
             if (!extractReports.Any())
             {
                 Logger.Trace("No items to send");
+                success = true;
             }
             else
             {
-                var success = false;
                 try
                 {
                     await metricsService.PostUsage(extractReports);
@@ -187,14 +179,14 @@ private async Task SendUsage(UsageStore usage)
                     Logger.Warning(ex, "Error Sending Usage");
                 }
 
-                if (success)
-                {
-                    usage.Model.RemoveReports(beforeDate);
-                }
             }
 
-            usage.LastUpdated = currentTimeOffset;
-            SaveUsage(usage);
+            if (success)
+            {
+                usage.Model.RemoveReports(beforeDate);
+                usage.LastUpdated = currentTimeOffset;
+                SaveUsage(usage);
+            }
         }
 
         public void IncrementLaunchCount()
@@ -203,6 +195,7 @@ public void IncrementLaunchCount()
 
             var usage = usageStore.Model.GetCurrentUsage();
             usage.NumberOfStartups++;
+            usage.UnityVersion = unityVersion;
 
             Logger.Trace("IncrementLaunchCount Date:{0} NumberOfStartups:{1}", usage.Date, usage.NumberOfStartups);
 

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

@@ -61,9 +61,9 @@ class SettingsView : Subview
         private const string GitRepositoryRemoteLabel = "Remote";
         private const string GitRepositorySave = "Save Repository";
         private const string DebugSettingsTitle = "Debug";
-        private const string UserTrackingSettingsTitle = "User Tracking";
+        private const string PrivacyTitle = "Privacy";
         private const string EnableTraceLoggingLabel = "Enable Trace Logging";
-        private const string EnableUserTrackingLabel = "Enable User Tracking";
+        private const string MetricsOptInLabel = "Help us improve by sending anonymous usage data";
 
         private Vector2 lockScrollPos;
 
@@ -201,7 +201,7 @@ public override void OnGUI()
                 }
 
                 OnInstallPathGUI();
-                OnTrackingSettingsGui();
+                OnPrivacyGui();
                 OnLoggingSettingsGui();
             }
 
@@ -654,21 +654,21 @@ private void OnInstallPathGUI()
             GUI.enabled = true;
         }
 
-        private void OnTrackingSettingsGui()
+        private void OnPrivacyGui()
         {
-            GUILayout.Label(UserTrackingSettingsTitle, EditorStyles.boldLabel);
+            GUILayout.Label(PrivacyTitle, EditorStyles.boldLabel);
 
             GUI.enabled = !busy;
 
-            var trackingEnabled = EntryPoint.UsageTracker.Enabled;
+            var metricsEnabled = EntryPoint.UsageTracker.Enabled;
             EditorGUI.BeginChangeCheck();
             {
-                trackingEnabled = EditorGUILayout.Toggle(EnableUserTrackingLabel, trackingEnabled);
+                metricsEnabled = EditorGUILayout.Toggle(MetricsOptInLabel, metricsEnabled);
             }
             if (EditorGUI.EndChangeCheck())
             {
-                EntryPoint.UsageTracker.Enabled = trackingEnabled;
-                Manager.UserSettings.Set("UserTrackingEnabled", trackingEnabled);
+                EntryPoint.UsageTracker.Enabled = metricsEnabled;
+                Manager.UserSettings.Set("MetricsEnabled", metricsEnabled);
 
                 GUI.FocusControl(null);
             }