Fix: Fixed an issue where layout setting didn't persist across updates (#16060)

yaira2 · web-flow · commit 0ed918865bf9 · 2024-08-22T22:43:42.000-04:00
diff --git a/src/Files.App/Helpers/Layout/LayoutPreferencesDatabase.cs b/src/Files.App/Helpers/Layout/LayoutPreferencesDatabase.cs
@@ -12,7 +12,7 @@ namespace Files.App.Helpers
 {
 	public sealed class LayoutPreferencesDatabase
 	{
-		private readonly static string LayoutSettingsKey = @$"Software\Files Community\{Package.Current.Id.FullName}\v1\LayoutPreferences";
+		private readonly static string LayoutSettingsKey = @$"Software\Files Community\{Package.Current.Id.Name}\v1\LayoutPreferences";
 
 		public LayoutPreferencesItem? GetPreferences(string filePath, ulong? frn)
 		{
diff --git a/src/Files.App/Utils/FileTags/FileTagsDatabase.cs b/src/Files.App/Utils/FileTags/FileTagsDatabase.cs
@@ -13,7 +13,7 @@ namespace Files.App.Utils.FileTags
 	public sealed class FileTagsDatabase
 	{
 		private static string? _FileTagsKey;
-		private string? FileTagsKey => _FileTagsKey ??= SafetyExtensions.IgnoreExceptions(() => @$"Software\Files Community\{Package.Current.Id.FullName}\v1\FileTags");
+		private string? FileTagsKey => _FileTagsKey ??= SafetyExtensions.IgnoreExceptions(() => @$"Software\Files Community\{Package.Current.Id.Name}\v1\FileTags");
 
 		public void SetTags(string filePath, ulong? frn, string[] tags)
 		{

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace Files.App.Helpers`
`12`	`12`	`{`
`13`	`13`	`public sealed class LayoutPreferencesDatabase`
`14`	`14`	`{`
`15`		`- private readonly static string LayoutSettingsKey = @$"Software\Files Community\{Package.Current.Id.FullName}\v1\LayoutPreferences";`
	`15`	`+ private readonly static string LayoutSettingsKey = @$"Software\Files Community\{Package.Current.Id.Name}\v1\LayoutPreferences";`
`16`	`16`
`17`	`17`	`public LayoutPreferencesItem? GetPreferences(string filePath, ulong? frn)`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ namespace Files.App.Utils.FileTags`
`13`	`13`	`public sealed class FileTagsDatabase`
`14`	`14`	`{`
`15`	`15`	`private static string? _FileTagsKey;`
`16`		`- private string? FileTagsKey => _FileTagsKey ??= SafetyExtensions.IgnoreExceptions(() => @$"Software\Files Community\{Package.Current.Id.FullName}\v1\FileTags");`
	`16`	`+ private string? FileTagsKey => _FileTagsKey ??= SafetyExtensions.IgnoreExceptions(() => @$"Software\Files Community\{Package.Current.Id.Name}\v1\FileTags");`
`17`	`17`
`18`	`18`	`public void SetTags(string filePath, ulong? frn, string[] tags)`
`19`	`19`	`{`