Skip to content
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

Jump to bottom

Suggested changes for PR #13749 #1

Merged
merged 1 commit into from
Nov 8, 2023
Merged

Suggested changes for PR #13749 #1

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 12 additions & 13 deletions src/Files.App/ViewModels/Properties/Items/FileProperty.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ private IValueConverter GetConverter()
/// Converts the property to a string to be displayed
/// </summary>
/// <returns></returns>
private string ConvertToString()
private string? ConvertToString()
{
// Don't attempt any convert null values
if (Value is null)
Expand All @@ -227,28 +227,27 @@ private string ConvertToString()

if (EnumeratedList is not null)
{
var value = "";
int valueKey;

try
{
valueKey = Convert.ToInt32(Value);
return EnumeratedList.TryGetValue(Convert.ToInt32(Value), out var value) ?
value.GetLocalizedResource() : null;
}
catch
{
if (!int.TryParse(Value.ToString(), out valueKey))
{
return null;
}
return null;
}

return EnumeratedList.TryGetValue(valueKey, out value) ? value.GetLocalizedResource() : null;

}

if (DisplayFunction is not null)
{
return DisplayFunction.Invoke(Value);
try
{
return DisplayFunction.Invoke(Value);
}
catch
{
return null;
}
}

if (Converter is not null)
Expand Down