mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-25 10:28:28 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix ip address matching on getdomain

Browse source
This commit is contained in:
Kyle Spearrin 2019-05-31 08:30:18 -04:00
parent 46e631388d
commit ac6f3a6bb6
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/App/Pages/Vault/AutofillCiphersPageViewModel.cs
View file

@ -63,8 +63,11 @@ namespace Bit.App.Pages
{ {
name = Uri.Substring(Constants.AndroidAppProtocol.Length); name = Uri.Substring(Constants.AndroidAppProtocol.Length);
} }
else if(!System.Uri.TryCreate(Uri, UriKind.Absolute, out Uri uri) || else
!DomainName.TryParseBaseDomain(uri.Host, out name)) {
name = CoreHelpers.GetDomain(Uri);
}
if(string.IsNullOrWhiteSpace(name))
{ {
name = "--"; name = "--";
} }

2
src/Core/Utilities/CoreHelpers.cs
View file

@ -63,7 +63,7 @@ namespace Bit.Core.Utilities
return null; return null;
} }
if(uri.Host == "localhost" || Regex.IsMatch(uriString, IpRegex)) if(uri.Host == "localhost" || Regex.IsMatch(uri.Host, IpRegex))
{ {
return uri.Host; return uri.Host;
} }