Skip to content

Fix device selection not persisting across restarts #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gratis-katze wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix device selection not persisting across restarts #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions LGSTrayHID/HidppDevice.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,10 @@ private async Task InitPopulateAsync()
}
else
{
// Device does not have a serial identifier the device name as a hash identifier
Identifier = $"{DeviceName.GetHashCode():X04}";
// Device does not have a serial identifier, use a stable hash of the device name
var hashBytes = System.Security.Cryptography.SHA256.HashData(
System.Text.Encoding.UTF8.GetBytes(DeviceName));
Identifier = Convert.ToHexString(hashBytes, 0, 4);
}

#if DEBUG
Expand Down
11 changes: 8 additions & 3 deletions LGSTrayUI/LogiDeviceCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ ISubscriber<IPCMessage> subscriber
_logiDeviceViewModelFactory = logiDeviceViewModelFactory;
_subscriber = subscriber;

LoadPreviouslySelectedDevices();

_subscriber.Subscribe(x =>
{
if (x is InitMessage initMessage)
Expand All @@ -40,8 +42,6 @@ ISubscriber<IPCMessage> subscriber
OnUpdateMessage(updateMessage);
}
});

LoadPreviouslySelectedDevices();
}

private void LoadPreviouslySelectedDevices()
Expand Down Expand Up @@ -81,7 +81,12 @@ public void OnInitMessage(InitMessage initMessage)
return;
}

dev = _logiDeviceViewModelFactory.CreateViewModel((x) => x.UpdateState(initMessage));
bool wasSelected = _userSettings.SelectedDevices?.Contains(initMessage.deviceId) ?? false;
dev = _logiDeviceViewModelFactory.CreateViewModel((x) =>
{
x.UpdateState(initMessage);
x.IsChecked = wasSelected;
});

Application.Current.Dispatcher.BeginInvoke(() => Devices.Add(dev));
}
Expand Down