Skip to content

Modified listing of website from Hostname to Host #1012

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

Merged
MattTheDev merged 2 commits into from
Jul 14, 2020
+9 −9
Merged

Modified listing of website from Hostname to Host #1012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d40ce88
Modified listing of website from Hostname to Host
Jul 14, 2020
ec0bd76
Removed last _hostname artifact.
Jul 14, 2020
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
2 changes: 1 addition & 1 deletion src/App/Pages/Vault/ViewPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@
Grid.Column="0"
IsVisible="{Binding IsWebsite, Mode=OneWay}" />
<Label
Text="{Binding HostnameOrUri, Mode=OneWay}"
Text="{Binding HostOrUri, Mode=OneWay}"
StyleClass="box-value"
Grid.Row="1"
Grid.Column="0" />
Expand Down
16 changes: 8 additions & 8 deletions src/Core/Models/View/LoginUriView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class LoginUriView : View

private string _uri;
private string _domain;
private string _hostname;
private string _host;
private bool? _canLaunch;

public LoginUriView() { }
Expand Down Expand Up @@ -63,27 +63,27 @@ public string Domain
}
}

public string Hostname
public string Host
{
get
{
if (Match == UriMatchType.RegularExpression)
{
return null;
}
if (_hostname == null && Uri != null)
if (_host == null && Uri != null)
{
_hostname = CoreHelpers.GetHostname(Uri);
if (_hostname == string.Empty)
_host = CoreHelpers.GetHost(Uri);
if (_host == string.Empty)
{
_hostname = null;
_host = null;
}
}
return _hostname;
return _host;
}
}

public string HostnameOrUri => Hostname ?? Uri;
public string HostOrUri => Host ?? Uri;

public bool IsWebsite => Uri != null && (Uri.StartsWith("http://") || Uri.StartsWith("https://") ||
(Uri.Contains("://") && Regex.IsMatch(Uri, CoreHelpers.TldEndingRegex)));
Expand Down