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

[SG-659] Fixed TOTP not showing for free user with classic plans. (#2071)

Browse source 
* [SG-659] Fixed TOTP not showing for free user with classic plans.

* [SG-659] Ran code format
This commit is contained in:
André Filipe da Silva Bispo 2022-09-14 14:45:39 +01:00 committed by GitHub
parent 3f8e00985c
commit 87fb5cf2ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/App/Pages/Vault/CipherDetailsPageViewModel.cs
View file

@ -202,7 +202,7 @@ namespace Bit.App.Pages
} }
} }
public bool ShowUpgradePremiumTotpText => !CanAccessPremium && ShowTotp; public bool ShowUpgradePremiumTotpText => !CanAccessPremium && !Cipher.OrganizationUseTotp && ShowTotp;
public bool ShowUris => IsLogin && Cipher.Login.HasUris; public bool ShowUris => IsLogin && Cipher.Login.HasUris;
public bool ShowIdentityAddress => IsIdentity && ( public bool ShowIdentityAddress => IsIdentity && (
!string.IsNullOrWhiteSpace(Cipher.Identity.Address1) || !string.IsNullOrWhiteSpace(Cipher.Identity.Address1) ||
@ -216,7 +216,7 @@ namespace Bit.App.Pages
public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow; public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
public string TotpCodeFormatted public string TotpCodeFormatted
{ {
get => _canAccessPremium ? _totpCodeFormatted : string.Empty; get => ShowUpgradePremiumTotpText ? string.Empty : _totpCodeFormatted;
set => SetProperty(ref _totpCodeFormatted, value, set => SetProperty(ref _totpCodeFormatted, value,
additionalPropertyNames: new string[] additionalPropertyNames: new string[]
{ {

10
src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
View file

@ -200,7 +200,6 @@ namespace Bit.App.Pages
{ {
PageTitle = ShowVaultFilter ? AppResources.Vaults : AppResources.MyVault; PageTitle = ShowVaultFilter ? AppResources.Vaults : AppResources.MyVault;
} }
var canAccessPremium = await _stateService.CanAccessPremiumAsync();
_doingLoad = true; _doingLoad = true;
LoadedOnce = true; LoadedOnce = true;
ShowNoData = false; ShowNoData = false;
@ -231,7 +230,7 @@ namespace Bit.App.Pages
} }
if (MainPage) if (MainPage)
{ {
AddTotpGroupItem(canAccessPremium, groupedItems, uppercaseGroupNames); AddTotpGroupItem(groupedItems, uppercaseGroupNames);
groupedItems.Add(new GroupingsPageListGroup( groupedItems.Add(new GroupingsPageListGroup(
AppResources.Types, 4, uppercaseGroupNames, !hasFavorites) AppResources.Types, 4, uppercaseGroupNames, !hasFavorites)
@ -382,9 +381,9 @@ namespace Bit.App.Pages
} }
} }
private void AddTotpGroupItem(bool canAccessPremium, List<GroupingsPageListGroup> groupedItems, bool uppercaseGroupNames) private void AddTotpGroupItem(List<GroupingsPageListGroup> groupedItems, bool uppercaseGroupNames)
{ {
if (canAccessPremium && TOTPCiphers?.Any() == true) if (TOTPCiphers?.Any() == true)
{ {
groupedItems.Insert(0, new GroupingsPageListGroup( groupedItems.Insert(0, new GroupingsPageListGroup(
AppResources.Totp, 1, uppercaseGroupNames, false) AppResources.Totp, 1, uppercaseGroupNames, false)
@ -537,10 +536,11 @@ namespace Bit.App.Pages
private async Task LoadDataAsync() private async Task LoadDataAsync()
{ {
var canAccessPremium = await _stateService.CanAccessPremiumAsync();
NoDataText = AppResources.NoItems; NoDataText = AppResources.NoItems;
_allCiphers = await GetAllCiphersAsync(); _allCiphers = await GetAllCiphersAsync();
HasCiphers = _allCiphers.Any(); HasCiphers = _allCiphers.Any();
TOTPCiphers = _allCiphers.Where(c => c.IsDeleted == Deleted && c.Type == CipherType.Login && !string.IsNullOrEmpty(c.Login?.Totp)).ToList(); TOTPCiphers = _allCiphers.Where(c => c.IsDeleted == Deleted && c.Type == CipherType.Login && !string.IsNullOrEmpty(c.Login?.Totp) && (c.OrganizationUseTotp || canAccessPremium)).ToList();
FavoriteCiphers?.Clear(); FavoriteCiphers?.Clear();
NoFolderCiphers?.Clear(); NoFolderCiphers?.Clear();
_folderCounts.Clear(); _folderCounts.Clear();