Fixed settings keeping their plugin value after a configuration was withdrawn (#903)
Build and Release / Determine run mode (push) Has been cancelled
Build and Release / Read metadata (push) Has been cancelled
Build and Release / Sync Flatpak repo (push) Has been cancelled
Build and Release / Collect Flatpak artifacts (push) Has been cancelled
Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-apple-darwin, osx-arm64, macos-latest, aarch64-apple-darwin, dmg,app,updater, dmg) (push) Has been cancelled
Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-pc-windows-msvc.exe, win-arm64, windows-latest, aarch64-pc-windows-msvc, nsis,updater, nsis) (push) Has been cancelled
Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-apple-darwin, osx-x64, macos-latest, x86_64-apple-darwin, dmg,app,updater, dmg) (push) Has been cancelled
Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-pc-windows-msvc.exe, win-x64, windows-latest, x86_64-pc-windows-msvc, nsis,updater, nsis) (push) Has been cancelled
Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-unknown-linux-gnu, linux-x64, ubuntu-22.04, x86_64-unknown-linux-gnu, appimage,updater, appimage) (push) Has been cancelled
Build and Release / Prepare & create release (push) Has been cancelled
Build and Release / Publish release (push) Has been cancelled
Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-unknown-linux-gnu, linux-arm64, ubuntu-22.04-arm, aarch64-unknown-linux-gnu, appimage,updater, appimage) (push) Has been cancelled

This commit is contained in:
Thorsten Sommer authored and GitHub committed 2026-08-09 20:47:30 +02:00
1 parent a3cccb7c7d
commit b9ec13edcf
10 files changed
+239 -11

No files matched your search

@@ -12,6 +12,8 @@ public abstract record ConfigMetaBase(string SettingName) : IConfig
{
protected static SettingsManager SettingsManagerAccess => Program.SERVICE_PROVIDER.GetRequiredService<SettingsManager>();
protected static ILogger Log => Program.LOGGER_FACTORY.CreateLogger(nameof(ConfigMetaBase));
/// <summary>
/// The persisted name of the configuration setting.
/// </summary>
@@ -89,14 +91,14 @@ public abstract record ConfigMetaBase(string SettingName) : IConfig
public void ResetLockedConfiguration()
{
SettingsManagerAccess.ConfigurationData.ManagedLockedConfigurations.Remove(this.SettingName);
this.IsLocked = false;
this.LockedByConfigPluginId = Guid.Empty;
if (this.ManagedMode is ManagedConfigurationMode.LOCKED)
this.ManagedMode = null;
this.Reset();
this.RestoreUserValueOrDefault();
}
/// <summary>
@@ -137,6 +139,29 @@ public abstract record ConfigMetaBase(string SettingName) : IConfig
this.EditableDefaultByConfigPluginId = Guid.Empty;
}
/// <summary>
/// Clears the editable-default state and hands the setting back to the user.
/// </summary>
/// <remarks>
/// Without a snapshot of the user's value, the current value stays as it is. That is the
/// difference to a locked setting: the user was allowed to change an editable default all
/// along, so its value is a plausible choice of theirs. Resetting it to the app's default would
/// take away something nobody asked us to remove.
/// </remarks>
/// <param name="keepCurrentValue">
/// True when the user has changed the value in the meantime. Their decision outlives the
/// configuration plugin, so the snapshot is dropped instead of applied.
/// </param>
public void ResetEditableDefaultConfiguration(bool keepCurrentValue)
{
this.ClearEditableDefaultConfiguration();
if (keepCurrentValue)
this.ClearUserValueSnapshot();
else
this.TryRestoreUserValueSnapshot();
}
/// <summary>
/// Removes the contribution of one configuration plugin without changing the current value.
/// </summary>
@@ -144,6 +169,96 @@ public abstract record ConfigMetaBase(string SettingName) : IConfig
/// <returns>True when that plugin had a contribution, otherwise false.</returns>
public abstract bool RemovePluginContribution(Guid configPluginId);
/// <summary>
/// Indicates whether the value the user had chosen before a configuration plugin took over
/// this setting is still available.
/// </summary>
public bool HasUserValueSnapshot => SettingsManagerAccess.ConfigurationData.ManagedUserValueSnapshots.ContainsKey(this.SettingName);
/// <summary>
/// Remembers the current value as the user's value, so that it can be restored once no
/// configuration plugin manages this setting anymore.
/// </summary>
/// <remarks>
/// Only an unmanaged setting holds a value which belongs to the user. When one configuration
/// plugin takes a setting over from another, the current value belongs to the previous plugin,
/// so the snapshot of the user's value must survive that handover untouched.<br/><br/>
/// The persisted editable default counts as managed as well: unlike a locked setting, it is not
/// restored into the in-memory state when the settings are loaded, so right after a start it is
/// the only evidence that a configuration plugin is already in charge.
/// </remarks>
public void CaptureUserValueSnapshot()
{
if (this.ManagedMode is not null || SettingsManagerAccess.ConfigurationData.ManagedEditableDefaults.ContainsKey(this.SettingName))
return;
var snapshots = SettingsManagerAccess.ConfigurationData.ManagedUserValueSnapshots;
if (snapshots.ContainsKey(this.SettingName))
return;
snapshots[this.SettingName] = this.SerializeCurrentValueAsJson();
}
/// <summary>
/// Restores the value the user had chosen before a configuration plugin took over this setting.
/// </summary>
/// <remarks>
/// The snapshot is consumed either way: when it cannot be applied, keeping it would mean trying
/// the same broken value again on every start.
/// </remarks>
/// <returns>True when a snapshot was available and could be applied, otherwise false.</returns>
private bool TryRestoreUserValueSnapshot()
{
var snapshots = SettingsManagerAccess.ConfigurationData.ManagedUserValueSnapshots;
if (!snapshots.Remove(this.SettingName, out var snapshot))
return false;
return this.TrySetValueFromJson(snapshot);
}
/// <summary>
/// Drops the snapshot of the user's value without changing the current value.
/// </summary>
/// <returns>True when a snapshot was dropped, otherwise false.</returns>
public bool ClearUserValueSnapshot() => SettingsManagerAccess.ConfigurationData.ManagedUserValueSnapshots.Remove(this.SettingName);
/// <summary>
/// Serializes the current value the same way the managed states record it.
/// </summary>
/// <remarks>
/// This is meant for comparisons, e.g. to tell whether the user has changed an editable default
/// in the meantime. It is not meant for restoring a value: the representation is lossy.
/// </remarks>
public abstract string SerializeCurrentValue();
/// <summary>
/// Restores the user's value, or falls back to the default value when no snapshot is available.
/// </summary>
/// <remarks>
/// Settings which a configuration plugin managed before this app version has no snapshot, and
/// neither has a setting whose value the user never changed. The default value is the best
/// answer in both cases.
/// </remarks>
private void RestoreUserValueOrDefault()
{
if (this.TryRestoreUserValueSnapshot())
return;
this.Reset();
}
/// <summary>
/// Serializes the current value as JSON, so that it can be restored without losing information.
/// </summary>
protected abstract string SerializeCurrentValueAsJson();
/// <summary>
/// Applies a value which was serialized by SerializeCurrentValueAsJson.
/// </summary>
/// <param name="json">The serialized value.</param>
/// <returns>True when the value could be applied, otherwise false.</returns>
protected abstract bool TrySetValueFromJson(string json);
/// <summary>
/// Resets the configuration property to its default value.
/// </summary>