devol
/
Bitwarden-app-android-iphone-ios
mirror of https://github.com/bitwarden/mobile
1
0
Fork 0
Code Issues 2 Releases Wiki Activity

android app match fixes

This commit is contained in:
Kyle Spearrin 2017-04-28 12:14:53 -04:00
parent b5311e1448
commit 2d6895aeea
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/App/Services/LoginService.cs
View File

@ -64,17 +64,10 @@ namespace Bit.App.Services
Uri uri = null;
DomainName domainName = null;
var androidApp = false;
var androidApp = UriIsAndroidApp(uriString);
if(!Uri.TryCreate(uriString, UriKind.Absolute, out uri) || !DomainName.TryParse(uri.Host, out domainName))
{
if(domainName == null)
{
androidApp = UriIsAndroidApp(uriString);
}
}
if(!androidApp && domainName == null)
if(!androidApp &&
(!Uri.TryCreate(uriString, UriKind.Absolute, out uri) || !DomainName.TryParse(uri.Host, out domainName)))
{
return null;
}
@ -91,8 +84,7 @@ namespace Bit.App.Services
{
matchingDomains.AddRange(eqDomain.Select(d => d).ToList());
}
if(androidAppWebUriString != null && Array.IndexOf(eqDomain, androidAppWebUriString) >= 0)
else if(androidAppWebUriString != null && Array.IndexOf(eqDomain, androidAppWebUriString) >= 0)
{
matchingFuzzyDomains.AddRange(eqDomain.Select(d => d).ToList());
}
@ -108,7 +100,8 @@ namespace Bit.App.Services
matchingDomains.Add(androidApp ? uriString : domainName.BaseDomain);
}
if(androidApp && androidAppWebUriString != null && !matchingFuzzyDomains.Any())
if(androidApp && androidAppWebUriString != null &&
!matchingFuzzyDomains.Any() && !matchingDomains.Contains(androidAppWebUriString))
{
matchingFuzzyDomains.Add(androidAppWebUriString);
}