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

PM-1352 Fix avatar toolbar item not loading on OTP cipher selection (#2507)

Browse source
This commit is contained in:
Federico Maccaroni 2023-05-05 18:18:07 +02:00 committed by GitHub
parent 7b44395e1a
commit c1673a1bbf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/App/Pages/Vault/CipherSelectionPage.xaml
View file

@ -16,7 +16,7 @@
IconImageSource="{Binding AvatarImageSource}" IconImageSource="{Binding AvatarImageSource}"
Command="{Binding Source={x:Reference _accountListOverlay}, Path=ToggleVisibililtyCommand}" Command="{Binding Source={x:Reference _accountListOverlay}, Path=ToggleVisibililtyCommand}"
Order="Primary" Order="Primary"
Priority="-2" Priority="-1"
UseOriginalImage="True" UseOriginalImage="True"
AutomationProperties.IsInAccessibleTree="True" AutomationProperties.IsInAccessibleTree="True"
AutomationProperties.Name="{u:I18n Account}" /> AutomationProperties.Name="{u:I18n Account}" />

10
src/App/Pages/Vault/CipherSelectionPage.xaml.cs
View file

@ -69,14 +69,16 @@ namespace Bit.App.Pages
return; return;
} }
// TODO: There's currently an issue on iOS where the toolbar item is not getting updated try
// as the others somehow. Removing this so at least we get the circle with ".." instead
// of a white circle
if (Device.RuntimePlatform != Device.iOS)
{ {
// don't crash the app if the avatar can't be loaded, just log the ex
_accountAvatar?.OnAppearing(); _accountAvatar?.OnAppearing();
_vm.AvatarImageSource = await GetAvatarImageSourceAsync(); _vm.AvatarImageSource = await GetAvatarImageSourceAsync();
} }
catch (Exception ex)
{
LoggerHelper.LogEvenIfCantBeResolved(ex);
}
_broadcasterService.Subscribe(nameof(CipherSelectionPage), async (message) => _broadcasterService.Subscribe(nameof(CipherSelectionPage), async (message) =>
{ {