Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ protected virtual string GetContractFromNavigationContext(NavigationContext navi

var candidateTargetContract = UriParsingHelper.EnsureAbsolute(navigationContext.Uri).AbsolutePath;
candidateTargetContract = candidateTargetContract.TrimStart('/');
return candidateTargetContract;
return Uri.UnescapeDataString(candidateTargetContract);
}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ protected virtual string GetContractFromNavigationContext(NavigationContext navi

var candidateTargetContract = UriParsingHelper.GetAbsolutePath(navigationContext.Uri);
candidateTargetContract = candidateTargetContract.TrimStart('/');
return candidateTargetContract;
return Uri.UnescapeDataString(candidateTargetContract);
}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,4 +232,27 @@ public void ParseForDeepLinkRelativeUri()
Assert.Equal(_deepLinkRelativeUri, uri.OriginalString);
Assert.False(uri.IsAbsoluteUri);
}

[Theory]
[InlineData("TestäöüView")]
[InlineData("MøbëlList")]
[InlineData("Ñoño")]
public void GetAbsolutePathUnescapesDiacritics(string viewName)
{
var uri = UriParsingHelper.Parse(viewName);
var absolutePath = UriParsingHelper.GetAbsolutePath(uri);
var result = Uri.UnescapeDataString(absolutePath.TrimStart('/'));
Assert.Equal(viewName, result);
}

[Theory]
[InlineData("TestäöüView")]
[InlineData("MøbëlList")]
public void GetUriSegmentsUnescapesDiacritics(string viewName)
{
var uri = new Uri(viewName, UriKind.Relative);
var segments = UriParsingHelper.GetUriSegments(uri);
var segmentName = UriParsingHelper.GetSegmentName(segments.Dequeue());
Assert.Equal(viewName, segmentName);
}
}
Loading