AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Delete vault when not found and user confirmed

Browse Source
This commit is contained in:
Julian Raufelder 2021-04-07 17:59:19 +02:00
parent 18d7c9c218
commit 4a20fbf7ab
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
presentation/src/main/java/org/cryptomator/presentation/presenter/UnlockVaultPresenter.kt
View File

@ -10,6 +10,7 @@ import org.cryptomator.domain.di.PerView
import org.cryptomator.domain.exception.NetworkConnectionException import org.cryptomator.domain.exception.NetworkConnectionException
import org.cryptomator.domain.exception.authentication.AuthenticationException import org.cryptomator.domain.exception.authentication.AuthenticationException
import org.cryptomator.domain.usecases.vault.ChangePasswordUseCase import org.cryptomator.domain.usecases.vault.ChangePasswordUseCase
import org.cryptomator.domain.usecases.vault.DeleteVaultUseCase
import org.cryptomator.domain.usecases.vault.GetUnverifiedVaultConfigUseCase import org.cryptomator.domain.usecases.vault.GetUnverifiedVaultConfigUseCase
import org.cryptomator.domain.usecases.vault.LockVaultUseCase import org.cryptomator.domain.usecases.vault.LockVaultUseCase
import org.cryptomator.domain.usecases.vault.PrepareUnlockUseCase import org.cryptomator.domain.usecases.vault.PrepareUnlockUseCase
@ -39,6 +40,7 @@ import timber.log.Timber
@PerView @PerView
class UnlockVaultPresenter @Inject constructor( class UnlockVaultPresenter @Inject constructor(
private val changePasswordUseCase: ChangePasswordUseCase, private val changePasswordUseCase: ChangePasswordUseCase,
private val deleteVaultUseCase: DeleteVaultUseCase,
private val getUnverifiedVaultConfigUseCase: GetUnverifiedVaultConfigUseCase, private val getUnverifiedVaultConfigUseCase: GetUnverifiedVaultConfigUseCase,
private val lockVaultUseCase: LockVaultUseCase, private val lockVaultUseCase: LockVaultUseCase,
private val unlockVaultUsingMasterkeyUseCase: UnlockVaultUsingMasterkeyUseCase, private val unlockVaultUsingMasterkeyUseCase: UnlockVaultUsingMasterkeyUseCase,
@ -68,7 +70,7 @@ class UnlockVaultPresenter @Inject constructor(
} }
fun setup() { fun setup() {
if(intent.vaultAction() == UnlockVaultIntent.VaultAction.ENCRYPT_PASSWORD) { if (intent.vaultAction() == UnlockVaultIntent.VaultAction.ENCRYPT_PASSWORD) {
view?.getEncryptedPasswordWithBiometricAuthentication(intent.vaultModel()) view?.getEncryptedPasswordWithBiometricAuthentication(intent.vaultModel())
return return
} }
@ -340,6 +342,16 @@ class UnlockVaultPresenter @Inject constructor(
}) })
} }
fun onDeleteMissingVaultClicked(vault: Vault) {
deleteVaultUseCase //
.withVault(vault) //
.run(object : DefaultResultHandler<Long>() {
override fun onSuccess(vaultId: Long) {
finishWithResult(null)
}
})
}
private open class PendingUnlock(private val vault: Vault?) : Serializable { private open class PendingUnlock(private val vault: Vault?) : Serializable {
private var unlockToken: UnlockToken? = null private var unlockToken: UnlockToken? = null
@ -381,7 +393,15 @@ class UnlockVaultPresenter @Inject constructor(
} }
init { init {
unsubscribeOnDestroy(changePasswordUseCase, getUnverifiedVaultConfigUseCase, lockVaultUseCase, unlockVaultUsingMasterkeyUseCase, prepareUnlockUseCase, removeStoredVaultPasswordsUseCase, saveVaultUseCase) unsubscribeOnDestroy( //
changePasswordUseCase, //
deleteVaultUseCase, //
getUnverifiedVaultConfigUseCase, //
lockVaultUseCase, //
unlockVaultUsingMasterkeyUseCase, //
prepareUnlockUseCase, //
removeStoredVaultPasswordsUseCase, //
saveVaultUseCase)
} }
} }

2
presentation/src/main/java/org/cryptomator/presentation/ui/activity/UnlockVaultActivity.kt
View File

@ -111,7 +111,7 @@ class UnlockVaultActivity : BaseActivity(), //
} }
override fun onDeleteMissingVaultClicked(vault: Vault) { override fun onDeleteMissingVaultClicked(vault: Vault) {
TODO("Not yet implemented") presenter.onDeleteMissingVaultClicked(vault)
} }
} }