Browse Source

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

github-services/pull/2508/head
Federico Maccaroni 3 years ago committed by GitHub
parent
commit
c1673a1bbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/App/Pages/Vault/CipherSelectionPage.xaml
  2. 10
      src/App/Pages/Vault/CipherSelectionPage.xaml.cs

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

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

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

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

Loading…
Cancel
Save