From c9313029a8c8b5234927b050e0fcdedbbb7477df Mon Sep 17 00:00:00 2001 From: Sparky93 Date: Mon, 10 Feb 2020 13:01:21 +0200 Subject: [PATCH] Fix for #5695 - Migration steps' status displayed before the migration completed The migration steps' status was already being shown as succeeded instead of showing an "unchecked" list of steps. These changes will make the steps being "checked" one by one as the migration advances. --- .../mozilla/fenix/migration/MigrationProgressActivity.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/mozilla/fenix/migration/MigrationProgressActivity.kt b/app/src/main/java/org/mozilla/fenix/migration/MigrationProgressActivity.kt index ce4924b39..90edadd54 100644 --- a/app/src/main/java/org/mozilla/fenix/migration/MigrationProgressActivity.kt +++ b/app/src/main/java/org/mozilla/fenix/migration/MigrationProgressActivity.kt @@ -102,7 +102,13 @@ internal fun MigrationResults.toItemList() = filterKeys { type, status.success ) -} +}.toMutableList() + .plus( + whiteList + .filterKeys { !this.containsKey(it) } + .keys + .map { MigrationItem(it, false) } + ).sortedBy { it.migration.javaClass.simpleName } internal data class MigrationItem(val migration: Migration, val status: Boolean)