codinux
/
fints4k
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed that when an account gets deleting its BankingClient data didn't get deleted

This commit is contained in:
dankito 2020-09-14 01:00:09 +02:00
parent 40bbb2b8f5
commit 6f354724be
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/IBankingClient.kt
View File

@ -26,4 +26,6 @@ interface IBankingClient {
fun dataChanged(customer: TypedCustomer)
fun deletedAccount(customer: TypedCustomer, wasLastAccountWithThisCredentials: Boolean)
}

4
ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/presenter/BankingPresenter.kt
View File

@ -246,7 +246,7 @@ open class BankingPresenter constructor(
val wasSelected = isSingleSelectedAccount(customer) or // either account or one of its bank accounts is currently selected
(customer.accounts.firstOrNull { isSingleSelectedBankAccount(it) } != null)
bankingClientsForAccounts.remove(customer)
val client = bankingClientsForAccounts.remove(customer)
val displayIndex = customer.displayIndex
@ -259,6 +259,8 @@ open class BankingPresenter constructor(
accountDisplayIndexUpdated(bank)
}
client?.deletedAccount(customer, customers.firstOrNull { it.customerId == customer.customerId && it.bankCode == customer.bankCode} == null)
callAccountsChangedListeners()
if (wasSelected || areAllAccountSelected) { // to update displayed account transactions as transactions of yet deleted accounts have to be removed

12
ui/fints4kBankingClient/src/commonMain/kotlin/net/dankito/banking/fints4kBankingClient.kt
View File

@ -137,6 +137,12 @@ open class fints4kBankingClient(
mapper.mapChangesFromUiToClientModel(customer, bank)
}
override fun deletedAccount(customer: TypedCustomer, wasLastAccountWithThisCredentials: Boolean) {
if (wasLastAccountWithThisCredentials) {
getFints4kClientDataFile(customer).delete()
}
}
protected open fun findAccountForBankAccount(bankAccount: TypedBankAccount, findAccountResult: (AccountData?, error: String?) -> Unit) {
val mappedAccount = mapper.findAccountForBankAccount(bank, bankAccount)
@ -176,7 +182,7 @@ open class fints4kBankingClient(
protected open fun restoreData(customer: TypedCustomer): BankData? {
try {
return serializer.deserializeObject(getFints4kClientDataFile(customer.bankCode, customer.customerId), BankData::class)
return serializer.deserializeObject(getFints4kClientDataFile(customer), BankData::class)
} catch (e: Exception) {
log.warn(e) { "Could not deserialize bank data of $customer (which is ok if bank is just about to be added)" }
}
@ -194,6 +200,10 @@ open class fints4kBankingClient(
}
}
protected open fun getFints4kClientDataFile(customer: TypedCustomer): File {
return getFints4kClientDataFile(customer.bankCode, customer.customerId)
}
protected open fun getFints4kClientDataFile(bankCode: String, customerId: String): File {
val folder = File(dataFolder, "fints4k-client")

4
ui/hbci4jBankingClient/src/main/kotlin/net/dankito/banking/hbci4jBankingClient.kt
View File

@ -283,6 +283,10 @@ open class hbci4jBankingClient(
credentials.password = customer.password
}
override fun deletedAccount(customer: TypedCustomer, wasLastAccountWithThisCredentials: Boolean) {
getPassportFile(credentials).delete()
}
protected open fun connect(): ConnectResult {
return connect(credentials, HBCIVersion.HBCI_300)