Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Merge pull request #3535 from element-hq/feature/bma/alwaysMigrateApp

Browse source 
Perform the migration, even if the current version is not known.
This commit is contained in:
ganfra 2024-09-25 15:01:21 +02:00 • committed by GitHub
commit c161c8f3b6
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/MigrationPresenter.kt
View file

@ -45,10 +45,7 @@ class MigrationPresenter @Inject constructor(
LaunchedEffect(migrationStoreVersion) { LaunchedEffect(migrationStoreVersion) {
val migrationValue = migrationStoreVersion ?: return@LaunchedEffect val migrationValue = migrationStoreVersion ?: return@LaunchedEffect
if (migrationValue == -1) { if (migrationValue == -1) {
// Fresh install, no migration needed Timber.d("Fresh install, or previous installed application did not have the migration mechanism.")
Timber.d("Fresh install, no migration needed.")
migrationStore.setApplicationMigrationVersion(lastMigration)
return@LaunchedEffect
} }
if (migrationValue == lastMigration) { if (migrationValue == lastMigration) {
Timber.d("Current app migration version: $migrationValue. No migration needed.") Timber.d("Current app migration version: $migrationValue. No migration needed.")

12
features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/MigrationPresenterTest.kt
View file

@ -27,12 +27,9 @@ class MigrationPresenterTest {
val warmUpRule = WarmUpRule() val warmUpRule = WarmUpRule()
@Test @Test
fun `present - no migration should occurs on fresh installation, and last version should be stored`() = runTest { fun `present - run all migrations on fresh installation, and last version should be stored`() = runTest {
val migrations = (1..10).map { order -> val migrations = (1..10).map { order ->
FakeAppMigration( FakeAppMigration(order = order)
order = order,
migrateLambda = LambdaNoParamRecorder(ensureNeverCalled = true) { },
)
} }
val store = InMemoryMigrationStore(initialApplicationMigrationVersion = -1) val store = InMemoryMigrationStore(initialApplicationMigrationVersion = -1)
val presenter = createPresenter( val presenter = createPresenter(
@ -44,12 +41,15 @@ class MigrationPresenterTest {
}.test { }.test {
val initialState = awaitItem() val initialState = awaitItem()
assertThat(initialState.migrationAction).isEqualTo(AsyncData.Uninitialized) assertThat(initialState.migrationAction).isEqualTo(AsyncData.Uninitialized)
skipItems(1) skipItems(migrations.size)
awaitItem().also { state -> awaitItem().also { state ->
assertThat(state.migrationAction).isEqualTo(AsyncData.Success(Unit)) assertThat(state.migrationAction).isEqualTo(AsyncData.Success(Unit))
} }
assertThat(store.applicationMigrationVersion().first()).isEqualTo(migrations.maxOf { it.order }) assertThat(store.applicationMigrationVersion().first()).isEqualTo(migrations.maxOf { it.order })
} }
for (migration in migrations) {
migration.migrateLambda.assertions().isCalledOnce()
}
} }
@Test @Test