bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2025-12-10 21:33:36 +00:00
Code Issues Releases Wiki Activity

Fixed flickering on iOS while loading collections for the collection crash hotfix (#1852)

Browse Source
This commit is contained in:
Federico Maccaroni
2022-03-18 15:41:15 -03:00
committed by GitHub
parent 1d9671bc5c
commit 383eee6ec7
4 changed files with 97 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
View File

@@ -515,7 +515,9 @@ namespace Bit.App.Pages
};
// TODO: refactor this
if (Device.RuntimePlatform == Device.Android)
if (Device.RuntimePlatform == Device.Android
||
GroupedItems.Any())
{
var items = new List<ISettingsPageListItem>();
foreach (var itemGroup in settingsListGroupItems)
@@ -528,20 +530,31 @@ namespace Bit.App.Pages
}
else
{
Device.InvokeOnMainThreadAsync(async () =>
// HACK: we need this on iOS, so that it doesn't crash when adding coming from an empty list
var first = true;
var items = new List<ISettingsPageListItem>();
foreach (var itemGroup in settingsListGroupItems)
{
// HACK: This waitings are to avoid crash on iOS
GroupedItems.Clear();
await Task.Delay(60);
foreach (var itemGroup in settingsListGroupItems)
if (!first)
{
GroupedItems.Add(new SettingsPageHeaderListItem(itemGroup.Name));
await Task.Delay(60);
GroupedItems.AddRange(itemGroup);
items.Add(new SettingsPageHeaderListItem(itemGroup.Name));
}
}).FireAndForget();
else
{
first = false;
}
items.AddRange(itemGroup);
}
if (settingsListGroupItems.Any())
{
GroupedItems.ReplaceRange(new List<ISettingsPageListItem> { new SettingsPageHeaderListItem(settingsListGroupItems[0].Name) });
GroupedItems.AddRange(items);
}
else
{
GroupedItems.Clear();
}
}
}