Updated storage var names to be consistent across solution

shweaver-MSFT · shweaver-MSFT · commit f70e3696bed1 · 2021-07-19T09:51:49.000-07:00
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer.cs b/Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.Toolkit.Helpers;
 using Microsoft.Toolkit.Parsers.Markdown;
 using Microsoft.Toolkit.Parsers.Markdown.Blocks;
 using Microsoft.Toolkit.Parsers.Markdown.Inlines;
@@ -405,19 +406,19 @@ public string DesiredLang
         {
             get
             {
-                return storage.Read<string>(DesiredLangKey);
+                return settingsStorage.Read<string>(DesiredLangKey);
             }
 
             set
             {
-                storage.Save(DesiredLangKey, value);
+                settingsStorage.Save(DesiredLangKey, value);
             }
         }
 
         /// <summary>
-        /// The Local Storage Helper.
+        /// The local app data storage helper for storing settings.
         /// </summary>
-        private ApplicationDataStorageHelper storage = ApplicationDataStorageHelper.GetCurrent(new Toolkit.Helpers.SystemSerializer());
+        private ISettingsStorageHelper settingsStorage = ApplicationDataStorageHelper.GetCurrent(new Toolkit.Helpers.SystemSerializer());
 
         /// <summary>
         /// DocFX note types and styling info, keyed by identifier.
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
@@ -20,6 +20,7 @@
 // TODO Reintroduce graph controls
 // using Microsoft.Toolkit.Graph.Converters;
 // using Microsoft.Toolkit.Graph.Providers;
+using Microsoft.Toolkit.Helpers;
 using Microsoft.Toolkit.Uwp.Helpers;
 using Microsoft.Toolkit.Uwp.Input.GazeInteraction;
 using Microsoft.Toolkit.Uwp.SampleApp.Models;
@@ -45,7 +46,7 @@ public class Sample
 
         public static async void EnsureCacheLatest()
         {
-            var settingsStorage = ApplicationDataStorageHelper.GetCurrent(new Toolkit.Helpers.SystemSerializer());
+            ISettingsStorageHelper settingsStorage = ApplicationDataStorageHelper.GetCurrent(new Toolkit.Helpers.SystemSerializer());
 
             var onlineDocsSHA = await GetDocsSHA();
             var cacheSHA = settingsStorage.Read<string>(_cacheSHAKey);
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/Samples.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/Samples.cs
@@ -9,6 +9,7 @@
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Toolkit.Helpers;
 using Microsoft.Toolkit.Uwp.Helpers;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp
@@ -21,7 +22,7 @@ public static class Samples
         private static SemaphoreSlim _semaphore = new SemaphoreSlim(1);
 
         private static LinkedList<Sample> _recentSamples;
-        private static ApplicationDataStorageHelper _appDataStorageHelper = ApplicationDataStorageHelper.GetCurrent(new Toolkit.Helpers.SystemSerializer());
+        private static ISettingsStorageHelper _settingsStorage = ApplicationDataStorageHelper.GetCurrent(new Toolkit.Helpers.SystemSerializer());
 
         public static async Task<SampleCategory> GetCategoryBySample(Sample sample)
         {
@@ -98,7 +99,7 @@ public static async Task<LinkedList<Sample>> GetRecentSamples()
             if (_recentSamples == null)
             {
                 _recentSamples = new LinkedList<Sample>();
-                var savedSamples = _appDataStorageHelper.Read<string>(_recentSamplesStorageKey);
+                var savedSamples = _settingsStorage.Read<string>(_recentSamplesStorageKey);
 
                 if (savedSamples != null)
                 {
@@ -144,7 +145,7 @@ private static void SaveRecentSamples()
             }
 
             var str = string.Join(";", _recentSamples.Take(10).Select(s => s.Name).ToArray());
-            _appDataStorageHelper.Save<string>(_recentSamplesStorageKey, str);
+            _settingsStorage.Save<string>(_recentSamplesStorageKey, str);
         }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Object Storage/ObjectStoragePage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Object Storage/ObjectStoragePage.xaml.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
 {
     public sealed partial class ObjectStoragePage
     {
-        private readonly ISettingsStorageHelper localStorageHelper = ApplicationDataStorageHelper.GetCurrent(new Toolkit.Helpers.SystemSerializer());
+        private readonly ISettingsStorageHelper _settingsStorage = ApplicationDataStorageHelper.GetCurrent(new Toolkit.Helpers.SystemSerializer());
 
         public ObjectStoragePage()
         {
@@ -25,9 +25,9 @@ private void ReadButton_Click(object sender, RoutedEventArgs e)
             }
 
             // Read from local storage
-            if (localStorageHelper.KeyExists(KeyTextBox.Text))
+            if (_settingsStorage.KeyExists(KeyTextBox.Text))
             {
-                ContentTextBox.Text = localStorageHelper.Read<string>(KeyTextBox.Text);
+                ContentTextBox.Text = _settingsStorage.Read<string>(KeyTextBox.Text);
             }
         }
 
@@ -44,7 +44,7 @@ private void SaveButton_Click(object sender, RoutedEventArgs e)
             }
 
             // Save into local storage
-            localStorageHelper.Save(KeyTextBox.Text, ContentTextBox.Text);
+            _settingsStorage.Save(KeyTextBox.Text, ContentTextBox.Text);
         }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp/Helpers/SystemInformation.cs b/Microsoft.Toolkit.Uwp/Helpers/SystemInformation.cs
@@ -6,6 +6,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Toolkit.Helpers;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
 using Windows.Security.ExchangeActiveSyncProvisioning;
@@ -25,7 +26,7 @@ public sealed class SystemInformation
         /// <summary>
         /// The <see cref="ApplicationDataStorageHelper"/> instance used to save and retrieve application settings.
         /// </summary>
-        private readonly ApplicationDataStorageHelper _localObjectStorageHelper = ApplicationDataStorageHelper.GetCurrent(new Toolkit.Helpers.SystemSerializer());
+        private readonly ISettingsStorageHelper _settingsStorage = ApplicationDataStorageHelper.GetCurrent(new Toolkit.Helpers.SystemSerializer());
 
         /// <summary>
         /// The starting time of the current application session (since app launch or last move to foreground).
@@ -216,7 +217,7 @@ public TimeSpan AppUptime
                 if (LaunchCount > 0)
                 {
                     var subSessionLength = DateTime.UtcNow.Subtract(_sessionStart).Ticks;
-                    var uptimeSoFar = _localObjectStorageHelper.Read<long>(nameof(AppUptime));
+                    var uptimeSoFar = _settingsStorage.Read<long>(nameof(AppUptime));
 
                     return new(uptimeSoFar + subSessionLength);
                 }
@@ -232,9 +233,9 @@ public TimeSpan AppUptime
         /// <param name="duration">The amount to time to add</param>
         public void AddToAppUptime(TimeSpan duration)
         {
-            var uptimeSoFar = _localObjectStorageHelper.Read<long>(nameof(AppUptime));
+            var uptimeSoFar = _settingsStorage.Read<long>(nameof(AppUptime));
 
-            _localObjectStorageHelper.Save(nameof(AppUptime), uptimeSoFar + duration.Ticks);
+            _settingsStorage.Save(nameof(AppUptime), uptimeSoFar + duration.Ticks);
         }
 
         /// <summary>
@@ -245,8 +246,8 @@ public void ResetLaunchCount()
             LastResetTime = DateTime.UtcNow;
             LaunchCount = 0;
 
-            _localObjectStorageHelper.Save(nameof(LastResetTime), LastResetTime.ToFileTimeUtc());
-            _localObjectStorageHelper.Save(nameof(LaunchCount), LaunchCount);
+            _settingsStorage.Save(nameof(LastResetTime), LastResetTime.ToFileTimeUtc());
+            _settingsStorage.Save(nameof(LaunchCount), LaunchCount);
         }
 
         /// <summary>
@@ -258,30 +259,30 @@ public void TrackAppUse(IActivatedEventArgs args, XamlRoot xamlRoot = null)
         {
             if (args.PreviousExecutionState is ApplicationExecutionState.ClosedByUser or ApplicationExecutionState.NotRunning)
             {
-                LaunchCount = _localObjectStorageHelper.Read<long>(nameof(LaunchCount)) + 1;
-                TotalLaunchCount = _localObjectStorageHelper.Read<long>(nameof(TotalLaunchCount)) + 1;
+                LaunchCount = _settingsStorage.Read<long>(nameof(LaunchCount)) + 1;
+                TotalLaunchCount = _settingsStorage.Read<long>(nameof(TotalLaunchCount)) + 1;
 
                 // In case we upgraded the properties, make TotalLaunchCount is correct
                 if (TotalLaunchCount < LaunchCount)
                 {
                     TotalLaunchCount = LaunchCount;
                 }
 
-                _localObjectStorageHelper.Save(nameof(LaunchCount), LaunchCount);
-                _localObjectStorageHelper.Save(nameof(TotalLaunchCount), TotalLaunchCount);
+                _settingsStorage.Save(nameof(LaunchCount), LaunchCount);
+                _settingsStorage.Save(nameof(TotalLaunchCount), TotalLaunchCount);
 
                 LaunchTime = DateTime.UtcNow;
 
-                var lastLaunch = _localObjectStorageHelper.Read<long>(nameof(LastLaunchTime));
+                var lastLaunch = _settingsStorage.Read<long>(nameof(LastLaunchTime));
 
                 LastLaunchTime = lastLaunch != 0
                     ? DateTime.FromFileTimeUtc(lastLaunch)
                     : LaunchTime;
 
-                _localObjectStorageHelper.Save(nameof(LastLaunchTime), LaunchTime.ToFileTimeUtc());
-                _localObjectStorageHelper.Save(nameof(AppUptime), 0L);
+                _settingsStorage.Save(nameof(LastLaunchTime), LaunchTime.ToFileTimeUtc());
+                _settingsStorage.Save(nameof(AppUptime), 0L);
 
-                var lastResetTime = _localObjectStorageHelper.Read<long>(nameof(LastResetTime));
+                var lastResetTime = _settingsStorage.Read<long>(nameof(LastResetTime));
 
                 LastResetTime = lastResetTime != 0
                     ? DateTime.FromFileTimeUtc(lastResetTime)
@@ -321,20 +322,20 @@ private void UpdateVisibility(bool visible)
             else
             {
                 var subSessionLength = DateTime.UtcNow.Subtract(_sessionStart).Ticks;
-                var uptimeSoFar = _localObjectStorageHelper.Read<long>(nameof(AppUptime));
+                var uptimeSoFar = _settingsStorage.Read<long>(nameof(AppUptime));
 
-                _localObjectStorageHelper.Save(nameof(AppUptime), uptimeSoFar + subSessionLength);
+                _settingsStorage.Save(nameof(AppUptime), uptimeSoFar + subSessionLength);
             }
         }
 
         private bool DetectIfFirstUse()
         {
-            if (_localObjectStorageHelper.KeyExists(nameof(IsFirstRun)))
+            if (_settingsStorage.KeyExists(nameof(IsFirstRun)))
             {
                 return false;
             }
 
-            _localObjectStorageHelper.Save(nameof(IsFirstRun), true);
+            _settingsStorage.Save(nameof(IsFirstRun), true);
 
             return true;
         }
@@ -347,13 +348,13 @@ private bool DetectIfFirstUse()
             // is ever called. That is, this is either the first time the app has been launched, or the first
             // time a previously existing app has run this method (or has run it after a new update of the app).
             // In this case, save the current version and report the same version as previous version installed.
-            if (!_localObjectStorageHelper.KeyExists(nameof(currentVersion)))
+            if (!_settingsStorage.KeyExists(nameof(currentVersion)))
             {
-                _localObjectStorageHelper.Save(nameof(currentVersion), currentVersion);
+                _settingsStorage.Save(nameof(currentVersion), currentVersion);
             }
             else
             {
-                var previousVersion = _localObjectStorageHelper.Read<string>(nameof(currentVersion));
+                var previousVersion = _settingsStorage.Read<string>(nameof(currentVersion));
 
                 // There are two possible cases if the "currentVersion" key exists:
                 //   1) The previous version is different than the current one. This means that the application
@@ -363,7 +364,7 @@ private bool DetectIfFirstUse()
                 //      In this case we have nothing to do and just return the previous version installed to be the same.
                 if (currentVersion != previousVersion)
                 {
-                    _localObjectStorageHelper.Save(nameof(currentVersion), currentVersion);
+                    _settingsStorage.Save(nameof(currentVersion), currentVersion);
 
                     return (true, previousVersion.ToPackageVersion());
                 }
@@ -374,28 +375,28 @@ private bool DetectIfFirstUse()
 
         private DateTime DetectFirstUseTime()
         {
-            if (_localObjectStorageHelper.KeyExists(nameof(FirstUseTime)))
+            if (_settingsStorage.KeyExists(nameof(FirstUseTime)))
             {
-                var firstUse = _localObjectStorageHelper.Read<long>(nameof(FirstUseTime));
+                var firstUse = _settingsStorage.Read<long>(nameof(FirstUseTime));
 
                 return DateTime.FromFileTimeUtc(firstUse);
             }
 
             DateTime utcNow = DateTime.UtcNow;
 
-            _localObjectStorageHelper.Save(nameof(FirstUseTime), utcNow.ToFileTimeUtc());
+            _settingsStorage.Save(nameof(FirstUseTime), utcNow.ToFileTimeUtc());
 
             return utcNow;
         }
 
         private PackageVersion DetectFirstVersionInstalled()
         {
-            if (_localObjectStorageHelper.KeyExists(nameof(FirstVersionInstalled)))
+            if (_settingsStorage.KeyExists(nameof(FirstVersionInstalled)))
             {
-                return _localObjectStorageHelper.Read<string>(nameof(FirstVersionInstalled)).ToPackageVersion();
+                return _settingsStorage.Read<string>(nameof(FirstVersionInstalled)).ToPackageVersion();
             }
 
-            _localObjectStorageHelper.Save(nameof(FirstVersionInstalled), ApplicationVersion.ToFormattedString());
+            _settingsStorage.Save(nameof(FirstVersionInstalled), ApplicationVersion.ToFormattedString());
 
             return ApplicationVersion;
         }
diff --git a/UnitTests/UnitTests.UWP/Helpers/Test_StorageHelper.cs b/UnitTests/UnitTests.UWP/Helpers/Test_StorageHelper.cs
diff --git a/UnitTests/UnitTests.UWP/Helpers/Test_SystemInformation.cs b/UnitTests/UnitTests.UWP/Helpers/Test_SystemInformation.cs

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using System;`
`6`	`6`	`using System.Collections.Generic;`
`7`	`7`	`using System.Linq;`
	`8`	`+using Microsoft.Toolkit.Helpers;`
`8`	`9`	`using Microsoft.Toolkit.Parsers.Markdown;`
`9`	`10`	`using Microsoft.Toolkit.Parsers.Markdown.Blocks;`
`10`	`11`	`using Microsoft.Toolkit.Parsers.Markdown.Inlines;`
`@@ -405,19 +406,19 @@ public string DesiredLang`
`405`	`406`	`{`
`406`	`407`	`get`
`407`	`408`	`{`
`408`		`- return storage.Read<string>(DesiredLangKey);`
	`409`	`+ return settingsStorage.Read<string>(DesiredLangKey);`
`409`	`410`	`}`
`410`	`411`
`411`	`412`	`set`
`412`	`413`	`{`
`413`		`- storage.Save(DesiredLangKey, value);`
	`414`	`+ settingsStorage.Save(DesiredLangKey, value);`
`414`	`415`	`}`
`415`	`416`	`}`
`416`	`417`
`417`	`418`	`/// <summary>`
`418`		`- /// The Local Storage Helper.`
	`419`	`+ /// The local app data storage helper for storing settings.`
`419`	`420`	`/// </summary>`
`420`		`- private ApplicationDataStorageHelper storage = ApplicationDataStorageHelper.GetCurrent(new Toolkit.Helpers.SystemSerializer());`
	`421`	`+ private ISettingsStorageHelper settingsStorage = ApplicationDataStorageHelper.GetCurrent(new Toolkit.Helpers.SystemSerializer());`
`421`	`422`
`422`	`423`	`/// <summary>`
`423`	`424`	`/// DocFX note types and styling info, keyed by identifier.`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`using System.Text.Json;`
`10`	`10`	`using System.Threading;`
`11`	`11`	`using System.Threading.Tasks;`
	`12`	`+using Microsoft.Toolkit.Helpers;`
`12`	`13`	`using Microsoft.Toolkit.Uwp.Helpers;`
`13`	`14`
`14`	`15`	`namespace Microsoft.Toolkit.Uwp.SampleApp`
`@@ -21,7 +22,7 @@ public static class Samples`
`21`	`22`	`private static SemaphoreSlim _semaphore = new SemaphoreSlim(1);`
`22`	`23`
`23`	`24`	`private static LinkedList<Sample> _recentSamples;`
`24`		`- private static ApplicationDataStorageHelper _appDataStorageHelper = ApplicationDataStorageHelper.GetCurrent(new Toolkit.Helpers.SystemSerializer());`
	`25`	`+ private static ISettingsStorageHelper _settingsStorage = ApplicationDataStorageHelper.GetCurrent(new Toolkit.Helpers.SystemSerializer());`
`25`	`26`
`26`	`27`	`public static async Task<SampleCategory> GetCategoryBySample(Sample sample)`
`27`	`28`	`{`
`@@ -98,7 +99,7 @@ public static async Task<LinkedList<Sample>> GetRecentSamples()`
`98`	`99`	`if (_recentSamples == null)`
`99`	`100`	`{`
`100`	`101`	`_recentSamples = new LinkedList<Sample>();`
`101`		`- var savedSamples = _appDataStorageHelper.Read<string>(_recentSamplesStorageKey);`
	`102`	`+ var savedSamples = _settingsStorage.Read<string>(_recentSamplesStorageKey);`
`102`	`103`
`103`	`104`	`if (savedSamples != null)`
`104`	`105`	`{`
`@@ -144,7 +145,7 @@ private static void SaveRecentSamples()`
`144`	`145`	`}`
`145`	`146`
`146`	`147`	`var str = string.Join(";", _recentSamples.Take(10).Select(s => s.Name).ToArray());`
`147`		`- _appDataStorageHelper.Save<string>(_recentSamplesStorageKey, str);`
	`148`	`+ _settingsStorage.Save<string>(_recentSamplesStorageKey, str);`
`148`	`149`	`}`
`149`	`150`	`}`
`150`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages`
`10`	`10`	`{`
`11`	`11`	`public sealed partial class ObjectStoragePage`
`12`	`12`	`{`
`13`		`- private readonly ISettingsStorageHelper localStorageHelper = ApplicationDataStorageHelper.GetCurrent(new Toolkit.Helpers.SystemSerializer());`
	`13`	`+ private readonly ISettingsStorageHelper _settingsStorage = ApplicationDataStorageHelper.GetCurrent(new Toolkit.Helpers.SystemSerializer());`
`14`	`14`
`15`	`15`	`public ObjectStoragePage()`
`16`	`16`	`{`
`@@ -25,9 +25,9 @@ private void ReadButton_Click(object sender, RoutedEventArgs e)`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`// Read from local storage`
`28`		`- if (localStorageHelper.KeyExists(KeyTextBox.Text))`
	`28`	`+ if (_settingsStorage.KeyExists(KeyTextBox.Text))`
`29`	`29`	`{`
`30`		`- ContentTextBox.Text = localStorageHelper.Read<string>(KeyTextBox.Text);`
	`30`	`+ ContentTextBox.Text = _settingsStorage.Read<string>(KeyTextBox.Text);`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`@@ -44,7 +44,7 @@ private void SaveButton_Click(object sender, RoutedEventArgs e)`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`// Save into local storage`
`47`		`- localStorageHelper.Save(KeyTextBox.Text, ContentTextBox.Text);`
	`47`	`+ _settingsStorage.Save(KeyTextBox.Text, ContentTextBox.Text);`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using System.Globalization;`
`7`	`7`	`using System.Linq;`
`8`	`8`	`using System.Threading.Tasks;`
	`9`	`+using Microsoft.Toolkit.Helpers;`
`9`	`10`	`using Windows.ApplicationModel;`
`10`	`11`	`using Windows.ApplicationModel.Activation;`
`11`	`12`	`using Windows.Security.ExchangeActiveSyncProvisioning;`
`@@ -25,7 +26,7 @@ public sealed class SystemInformation`
`25`	`26`	`/// <summary>`
`26`	`27`	`/// The <see cref="ApplicationDataStorageHelper"/> instance used to save and retrieve application settings.`
`27`	`28`	`/// </summary>`
`28`		`- private readonly ApplicationDataStorageHelper _localObjectStorageHelper = ApplicationDataStorageHelper.GetCurrent(new Toolkit.Helpers.SystemSerializer());`
	`29`	`+ private readonly ISettingsStorageHelper _settingsStorage = ApplicationDataStorageHelper.GetCurrent(new Toolkit.Helpers.SystemSerializer());`
`29`	`30`
`30`	`31`	`/// <summary>`
`31`	`32`	`/// The starting time of the current application session (since app launch or last move to foreground).`
`@@ -216,7 +217,7 @@ public TimeSpan AppUptime`
`216`	`217`	`if (LaunchCount > 0)`
`217`	`218`	`{`
`218`	`219`	`var subSessionLength = DateTime.UtcNow.Subtract(_sessionStart).Ticks;`
`219`		`- var uptimeSoFar = _localObjectStorageHelper.Read<long>(nameof(AppUptime));`
	`220`	`+ var uptimeSoFar = _settingsStorage.Read<long>(nameof(AppUptime));`
`220`	`221`
`221`	`222`	`return new(uptimeSoFar + subSessionLength);`
`222`	`223`	`}`
`@@ -232,9 +233,9 @@ public TimeSpan AppUptime`
`232`	`233`	`/// <param name="duration">The amount to time to add</param>`
`233`	`234`	`public void AddToAppUptime(TimeSpan duration)`
`234`	`235`	`{`
`235`		`- var uptimeSoFar = _localObjectStorageHelper.Read<long>(nameof(AppUptime));`
	`236`	`+ var uptimeSoFar = _settingsStorage.Read<long>(nameof(AppUptime));`
`236`	`237`
`237`		`- _localObjectStorageHelper.Save(nameof(AppUptime), uptimeSoFar + duration.Ticks);`
	`238`	`+ _settingsStorage.Save(nameof(AppUptime), uptimeSoFar + duration.Ticks);`
`238`	`239`	`}`
`239`	`240`
`240`	`241`	`/// <summary>`
`@@ -245,8 +246,8 @@ public void ResetLaunchCount()`
`245`	`246`	`LastResetTime = DateTime.UtcNow;`
`246`	`247`	`LaunchCount = 0;`
`247`	`248`
`248`		`- _localObjectStorageHelper.Save(nameof(LastResetTime), LastResetTime.ToFileTimeUtc());`
`249`		`- _localObjectStorageHelper.Save(nameof(LaunchCount), LaunchCount);`
	`249`	`+ _settingsStorage.Save(nameof(LastResetTime), LastResetTime.ToFileTimeUtc());`
	`250`	`+ _settingsStorage.Save(nameof(LaunchCount), LaunchCount);`
`250`	`251`	`}`
`251`	`252`
`252`	`253`	`/// <summary>`
`@@ -258,30 +259,30 @@ public void TrackAppUse(IActivatedEventArgs args, XamlRoot xamlRoot = null)`
`258`	`259`	`{`
`259`	`260`	`if (args.PreviousExecutionState is ApplicationExecutionState.ClosedByUser or ApplicationExecutionState.NotRunning)`
`260`	`261`	`{`
`261`		`- LaunchCount = _localObjectStorageHelper.Read<long>(nameof(LaunchCount)) + 1;`
`262`		`- TotalLaunchCount = _localObjectStorageHelper.Read<long>(nameof(TotalLaunchCount)) + 1;`
	`262`	`+ LaunchCount = _settingsStorage.Read<long>(nameof(LaunchCount)) + 1;`
	`263`	`+ TotalLaunchCount = _settingsStorage.Read<long>(nameof(TotalLaunchCount)) + 1;`
`263`	`264`
`264`	`265`	`// In case we upgraded the properties, make TotalLaunchCount is correct`
`265`	`266`	`if (TotalLaunchCount < LaunchCount)`
`266`	`267`	`{`
`267`	`268`	`TotalLaunchCount = LaunchCount;`
`268`	`269`	`}`
`269`	`270`
`270`		`- _localObjectStorageHelper.Save(nameof(LaunchCount), LaunchCount);`
`271`		`- _localObjectStorageHelper.Save(nameof(TotalLaunchCount), TotalLaunchCount);`
	`271`	`+ _settingsStorage.Save(nameof(LaunchCount), LaunchCount);`
	`272`	`+ _settingsStorage.Save(nameof(TotalLaunchCount), TotalLaunchCount);`
`272`	`273`
`273`	`274`	`LaunchTime = DateTime.UtcNow;`
`274`	`275`
`275`		`- var lastLaunch = _localObjectStorageHelper.Read<long>(nameof(LastLaunchTime));`
	`276`	`+ var lastLaunch = _settingsStorage.Read<long>(nameof(LastLaunchTime));`
`276`	`277`
`277`	`278`	`LastLaunchTime = lastLaunch != 0`
`278`	`279`	`? DateTime.FromFileTimeUtc(lastLaunch)`
`279`	`280`	`: LaunchTime;`
`280`	`281`
`281`		`- _localObjectStorageHelper.Save(nameof(LastLaunchTime), LaunchTime.ToFileTimeUtc());`
`282`		`- _localObjectStorageHelper.Save(nameof(AppUptime), 0L);`
	`282`	`+ _settingsStorage.Save(nameof(LastLaunchTime), LaunchTime.ToFileTimeUtc());`
	`283`	`+ _settingsStorage.Save(nameof(AppUptime), 0L);`
`283`	`284`
`284`		`- var lastResetTime = _localObjectStorageHelper.Read<long>(nameof(LastResetTime));`
	`285`	`+ var lastResetTime = _settingsStorage.Read<long>(nameof(LastResetTime));`
`285`	`286`
`286`	`287`	`LastResetTime = lastResetTime != 0`
`287`	`288`	`? DateTime.FromFileTimeUtc(lastResetTime)`
`@@ -321,20 +322,20 @@ private void UpdateVisibility(bool visible)`
`321`	`322`	`else`
`322`	`323`	`{`
`323`	`324`	`var subSessionLength = DateTime.UtcNow.Subtract(_sessionStart).Ticks;`
`324`		`- var uptimeSoFar = _localObjectStorageHelper.Read<long>(nameof(AppUptime));`
	`325`	`+ var uptimeSoFar = _settingsStorage.Read<long>(nameof(AppUptime));`
`325`	`326`
`326`		`- _localObjectStorageHelper.Save(nameof(AppUptime), uptimeSoFar + subSessionLength);`
	`327`	`+ _settingsStorage.Save(nameof(AppUptime), uptimeSoFar + subSessionLength);`
`327`	`328`	`}`
`328`	`329`	`}`
`329`	`330`
`330`	`331`	`private bool DetectIfFirstUse()`
`331`	`332`	`{`
`332`		`- if (_localObjectStorageHelper.KeyExists(nameof(IsFirstRun)))`
	`333`	`+ if (_settingsStorage.KeyExists(nameof(IsFirstRun)))`
`333`	`334`	`{`
`334`	`335`	`return false;`
`335`	`336`	`}`
`336`	`337`
`337`		`- _localObjectStorageHelper.Save(nameof(IsFirstRun), true);`
	`338`	`+ _settingsStorage.Save(nameof(IsFirstRun), true);`
`338`	`339`
`339`	`340`	`return true;`
`340`	`341`	`}`
`@@ -347,13 +348,13 @@ private bool DetectIfFirstUse()`
`347`	`348`	`// is ever called. That is, this is either the first time the app has been launched, or the first`
`348`	`349`	`// time a previously existing app has run this method (or has run it after a new update of the app).`
`349`	`350`	`// In this case, save the current version and report the same version as previous version installed.`
`350`		`- if (!_localObjectStorageHelper.KeyExists(nameof(currentVersion)))`
	`351`	`+ if (!_settingsStorage.KeyExists(nameof(currentVersion)))`
`351`	`352`	`{`
`352`		`- _localObjectStorageHelper.Save(nameof(currentVersion), currentVersion);`
	`353`	`+ _settingsStorage.Save(nameof(currentVersion), currentVersion);`
`353`	`354`	`}`
`354`	`355`	`else`
`355`	`356`	`{`
`356`		`- var previousVersion = _localObjectStorageHelper.Read<string>(nameof(currentVersion));`
	`357`	`+ var previousVersion = _settingsStorage.Read<string>(nameof(currentVersion));`
`357`	`358`
`358`	`359`	`// There are two possible cases if the "currentVersion" key exists:`
`359`	`360`	`// 1) The previous version is different than the current one. This means that the application`
`@@ -363,7 +364,7 @@ private bool DetectIfFirstUse()`
`363`	`364`	`// In this case we have nothing to do and just return the previous version installed to be the same.`
`364`	`365`	`if (currentVersion != previousVersion)`
`365`	`366`	`{`
`366`		`- _localObjectStorageHelper.Save(nameof(currentVersion), currentVersion);`
	`367`	`+ _settingsStorage.Save(nameof(currentVersion), currentVersion);`
`367`	`368`
`368`	`369`	`return (true, previousVersion.ToPackageVersion());`
`369`	`370`	`}`
`@@ -374,28 +375,28 @@ private bool DetectIfFirstUse()`
`374`	`375`
`375`	`376`	`private DateTime DetectFirstUseTime()`
`376`	`377`	`{`
`377`		`- if (_localObjectStorageHelper.KeyExists(nameof(FirstUseTime)))`
	`378`	`+ if (_settingsStorage.KeyExists(nameof(FirstUseTime)))`
`378`	`379`	`{`
`379`		`- var firstUse = _localObjectStorageHelper.Read<long>(nameof(FirstUseTime));`
	`380`	`+ var firstUse = _settingsStorage.Read<long>(nameof(FirstUseTime));`
`380`	`381`
`381`	`382`	`return DateTime.FromFileTimeUtc(firstUse);`
`382`	`383`	`}`
`383`	`384`
`384`	`385`	`DateTime utcNow = DateTime.UtcNow;`
`385`	`386`
`386`		`- _localObjectStorageHelper.Save(nameof(FirstUseTime), utcNow.ToFileTimeUtc());`
	`387`	`+ _settingsStorage.Save(nameof(FirstUseTime), utcNow.ToFileTimeUtc());`
`387`	`388`
`388`	`389`	`return utcNow;`
`389`	`390`	`}`
`390`	`391`
`391`	`392`	`private PackageVersion DetectFirstVersionInstalled()`
`392`	`393`	`{`
`393`		`- if (_localObjectStorageHelper.KeyExists(nameof(FirstVersionInstalled)))`
	`394`	`+ if (_settingsStorage.KeyExists(nameof(FirstVersionInstalled)))`
`394`	`395`	`{`
`395`		`- return _localObjectStorageHelper.Read<string>(nameof(FirstVersionInstalled)).ToPackageVersion();`
	`396`	`+ return _settingsStorage.Read<string>(nameof(FirstVersionInstalled)).ToPackageVersion();`
`396`	`397`	`}`
`397`	`398`
`398`		`- _localObjectStorageHelper.Save(nameof(FirstVersionInstalled), ApplicationVersion.ToFormattedString());`
	`399`	`+ _settingsStorage.Save(nameof(FirstVersionInstalled), ApplicationVersion.ToFormattedString());`
`399`	`400`
`400`	`401`	`return ApplicationVersion;`
`401`	`402`	`}`