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

Fixed flickering on iOS while loading collections for the collection crash hotfix

Browse Source
This commit is contained in:
Federico Maccaroni
2022-03-18 15:59:19 -03:00
parent 14b6ccca6d
commit ea28fd462d
4 changed files with 97 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/App/Pages/Send/SendGroupingsPage/SendGroupingsPageViewModel.cs
View File

@@ -180,7 +180,9 @@ namespace Bit.App.Pages
}
// TODO: refactor this
if (Device.RuntimePlatform == Device.Android)
if (Device.RuntimePlatform == Device.Android
||
GroupedSends.Any())
{
var items = new List<ISendGroupingsPageListItem>();
foreach (var itemGroup in groupedSends)
@@ -193,16 +195,30 @@ namespace Bit.App.Pages
}
else
{
// HACK: This waitings are to avoid crash on iOS
GroupedSends.Clear();
await Task.Delay(60);
// 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<ISendGroupingsPageListItem>();
foreach (var itemGroup in groupedSends)
{
GroupedSends.Add(new SendGroupingsPageHeaderListItem(itemGroup.Name, itemGroup.ItemCount));
await Task.Delay(60);
if (!first)
{
items.Add(new SendGroupingsPageHeaderListItem(itemGroup.Name, itemGroup.ItemCount));
}
else
{
first = false;
}
items.AddRange(itemGroup);
}
GroupedSends.AddRange(itemGroup);
if (groupedSends.Any())
{
GroupedSends.ReplaceRange(new List<ISendGroupingsPageListItem> { new SendGroupingsPageHeaderListItem(groupedSends[0].Name, groupedSends[0].ItemCount) });
GroupedSends.AddRange(items);
}
else
{
GroupedSends.Clear();
}
}
}

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

@@ -523,7 +523,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)
@@ -536,20 +538,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();
}
}
}

32
src/App/Pages/Vault/AutofillCiphersPageViewModel.cs
View File

@@ -111,7 +111,9 @@ namespace Bit.App.Pages
}
// TODO: refactor this
if (Device.RuntimePlatform == Device.Android)
if (Device.RuntimePlatform == Device.Android
||
GroupedItems.Any())
{
var items = new List<IGroupingsPageListItem>();
foreach (var itemGroup in groupedItems)
@@ -124,16 +126,30 @@ namespace Bit.App.Pages
}
else
{
// HACK: This waitings are to avoid crash on iOS
GroupedItems.Clear();
await Task.Delay(60);
// 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<IGroupingsPageListItem>();
foreach (var itemGroup in groupedItems)
{
GroupedItems.Add(new GroupingsPageHeaderListItem(itemGroup.Name, itemGroup.ItemCount));
await Task.Delay(60);
if (!first)
{
items.Add(new GroupingsPageHeaderListItem(itemGroup.Name, itemGroup.ItemCount));
}
else
{
first = false;
}
items.AddRange(itemGroup);
}
GroupedItems.AddRange(itemGroup);
if (groupedItems.Any())
{
GroupedItems.ReplaceRange(new List<IGroupingsPageListItem> { new GroupingsPageHeaderListItem(groupedItems[0].Name, groupedItems[0].ItemCount) });
GroupedItems.AddRange(items);
}
else
{
GroupedItems.Clear();
}
}
ShowList = groupedItems.Any();

32
src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
View File

@@ -279,7 +279,9 @@ namespace Bit.App.Pages
}
// TODO: refactor this
if (Device.RuntimePlatform == Device.Android)
if (Device.RuntimePlatform == Device.Android
||
GroupedItems.Any())
{
var items = new List<IGroupingsPageListItem>();
foreach (var itemGroup in groupedItems)
@@ -292,16 +294,30 @@ namespace Bit.App.Pages
}
else
{
// HACK: This waitings are to avoid crash on iOS
GroupedItems.Clear();
await Task.Delay(60);
// 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<IGroupingsPageListItem>();
foreach (var itemGroup in groupedItems)
{
GroupedItems.Add(new GroupingsPageHeaderListItem(itemGroup.Name, itemGroup.ItemCount));
await Task.Delay(60);
if (!first)
{
items.Add(new GroupingsPageHeaderListItem(itemGroup.Name, itemGroup.ItemCount));
}
else
{
first = false;
}
items.AddRange(itemGroup);
}
GroupedItems.AddRange(itemGroup);
if (groupedItems.Any())
{
GroupedItems.ReplaceRange(new List<IGroupingsPageListItem> { new GroupingsPageHeaderListItem(groupedItems[0].Name, groupedItems[0].ItemCount) });
GroupedItems.AddRange(items);
}
else
{
GroupedItems.Clear();
}
}
}