diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/auth/account/MigrationHelperDelegate.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/auth/account/MigrationHelperDelegate.kt index a40a899e6f..23b44a9b42 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/auth/account/MigrationHelperDelegate.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/auth/account/MigrationHelperDelegate.kt @@ -20,7 +20,7 @@ import kotlinx.coroutines.flow.scan interface MigrationHelperDelegate { - suspend fun proceedWithMigration() : Flow + suspend fun proceedWithMigration(params: MigrateAccount.Params) : Flow class Impl @Inject constructor( private val migrateAccount: MigrateAccount, @@ -28,9 +28,9 @@ interface MigrationHelperDelegate { private val processProgressObserver: MigrationProgressObserver ) : MigrationHelperDelegate { - override suspend fun proceedWithMigration(): Flow { + override suspend fun proceedWithMigration(params: MigrateAccount.Params): Flow { return migrateAccount - .stream(MigrateAccount.Params.Current) + .stream(params) .flatMapLatest { result -> flow { when(result) { diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/onboarding/login/OnboardingMnemonicLoginViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/onboarding/login/OnboardingMnemonicLoginViewModel.kt index 23b7f46632..207558e9eb 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/onboarding/login/OnboardingMnemonicLoginViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/onboarding/login/OnboardingMnemonicLoginViewModel.kt @@ -15,6 +15,7 @@ import com.anytypeio.anytype.core_models.exceptions.NeedToUpdateApplicationExcep import com.anytypeio.anytype.core_utils.ext.cancel import com.anytypeio.anytype.domain.auth.interactor.ConvertWallet import com.anytypeio.anytype.domain.auth.interactor.Logout +import com.anytypeio.anytype.domain.auth.interactor.MigrateAccount import com.anytypeio.anytype.domain.auth.interactor.ObserveAccounts import com.anytypeio.anytype.domain.auth.interactor.RecoverWallet import com.anytypeio.anytype.domain.auth.interactor.SaveMnemonic @@ -310,7 +311,9 @@ class OnboardingMnemonicLoginViewModel @Inject constructor( } private suspend fun proceedWithAccountMigration(id: String) { - proceedWithMigration().collect { migrationState -> + proceedWithMigration( + params = MigrateAccount.Params.Other(acc = id) + ).collect { migrationState -> when (migrationState) { is MigrationHelperDelegate.State.Failed -> { state.value = SetupState.Migration.Failed( diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/splash/SplashViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/splash/SplashViewModel.kt index 851c39fa0f..dee363c1a4 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/splash/SplashViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/splash/SplashViewModel.kt @@ -24,6 +24,7 @@ import com.anytypeio.anytype.domain.auth.interactor.CheckAuthorizationStatus import com.anytypeio.anytype.domain.auth.interactor.GetLastOpenedObject import com.anytypeio.anytype.domain.auth.interactor.LaunchAccount import com.anytypeio.anytype.domain.auth.interactor.LaunchWallet +import com.anytypeio.anytype.domain.auth.interactor.MigrateAccount import com.anytypeio.anytype.domain.auth.model.AuthStatus import com.anytypeio.anytype.domain.base.BaseUseCase import com.anytypeio.anytype.domain.base.fold @@ -103,7 +104,7 @@ class SplashViewModel( private suspend fun proceedWithAccountMigration() { if (migrationRetryCount <= 1) { - proceedWithMigration().collect { migrationState -> + proceedWithMigration(MigrateAccount.Params.Current).collect { migrationState -> when (migrationState) { is MigrationHelperDelegate.State.Failed -> { state.value = State.Migration.Failed(migrationState)