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

Fixed that if balance should not get fetched that we did abort instead of continuing with retrieving transactions

This commit is contained in:
dankito 2021-10-31 01:19:14 +02:00
parent fad4c48b41
commit e8e35a3fe2
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fints4k/src/commonMain/kotlin/net/dankito/banking/fints/FinTsJobExecutor.kt
View File

@ -196,7 +196,7 @@ open class FinTsJobExecutor(
else { else {
mayGetBalance(parameter, dialogContext) { balanceResponse -> mayGetBalance(parameter, dialogContext) { balanceResponse ->
if (dialogContext.didBankCloseDialog) { if (dialogContext.didBankCloseDialog) {
callback(GetTransactionsResponse(balanceResponse, RetrievedAccountData.unsuccessfulList(parameter.account))) callback(GetTransactionsResponse(balanceResponse ?: initDialogResponse, RetrievedAccountData.unsuccessfulList(parameter.account)))
} }
else { else {
getTransactionsAfterInitAndGetBalance(parameter, dialogContext, balanceResponse, callback) getTransactionsAfterInitAndGetBalance(parameter, dialogContext, balanceResponse, callback)
@ -207,8 +207,8 @@ open class FinTsJobExecutor(
} }
protected open fun getTransactionsAfterInitAndGetBalance(parameter: GetTransactionsParameter, dialogContext: DialogContext, protected open fun getTransactionsAfterInitAndGetBalance(parameter: GetTransactionsParameter, dialogContext: DialogContext,
balanceResponse: BankResponse, callback: (GetTransactionsResponse) -> Unit) { balanceResponse: BankResponse?, callback: (GetTransactionsResponse) -> Unit) {
var balance: Money? = balanceResponse.getFirstSegmentById<BalanceSegment>(InstituteSegmentId.Balance)?.let { var balance: Money? = balanceResponse?.getFirstSegmentById<BalanceSegment>(InstituteSegmentId.Balance)?.let {
Money(it.balance, it.currency) Money(it.balance, it.currency)
} }
val bookedTransactions = mutableSetOf<AccountTransaction>() val bookedTransactions = mutableSetOf<AccountTransaction>()
@ -255,7 +255,7 @@ open class FinTsJobExecutor(
} }
} }
protected open fun mayGetBalance(parameter: GetTransactionsParameter, dialogContext: DialogContext, callback: (BankResponse) -> Unit) { protected open fun mayGetBalance(parameter: GetTransactionsParameter, dialogContext: DialogContext, callback: (BankResponse?) -> Unit) {
if (parameter.alsoRetrieveBalance && parameter.account.supportsRetrievingBalance) { if (parameter.alsoRetrieveBalance && parameter.account.supportsRetrievingBalance) {
val message = messageBuilder.createGetBalanceMessage(parameter.account, dialogContext) val message = messageBuilder.createGetBalanceMessage(parameter.account, dialogContext)
@ -264,8 +264,7 @@ open class FinTsJobExecutor(
} }
} }
else { else {
callback(BankResponse(false, errorMessage = "Either not requested to get balance or account does not support retrieving balance. " + callback(null)
"Should retrieve balance = ${parameter.alsoRetrieveBalance}, account supports retrieving balance = ${parameter.account.supportsRetrievingBalance}."))
} }
} }