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

Extracted findUniqueBankForIbanAsync()

This commit is contained in:
dankl 2020-01-11 23:16:44 +01:00 committed by dankito
parent 5bc19b9e18
commit 1857590834
2 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
BankingUiCommon/src/main/java/net/dankito/banking/ui/presenter/MainWindowPresenter.kt
View File

@ -20,6 +20,7 @@ import net.dankito.fints.banks.BankFinder
import net.dankito.fints.model.BankInfo
import net.dankito.utils.IThreadPool
import net.dankito.utils.ThreadPool
import net.dankito.utils.extensions.ofMaxLength
import net.dankito.utils.web.client.OkHttpWebClient
import java.math.BigDecimal
import java.util.*
@ -158,17 +159,39 @@ open class MainWindowPresenter(
open fun preloadBanksAsync() {
searchBanksByBankCodeAsync("1") { }
findUniqueBankForBankCodeAsync("1") { }
}
open fun searchBanksByBankCodeAsync(enteredBankCode: String, callback: (List<BankInfo>) -> Unit) {
open fun findUniqueBankForIbanAsync(iban: String, callback: (BankInfo?) -> Unit) {
threadPool.runAsync {
callback(searchBanksByBankCode(enteredBankCode))
callback(findUniqueBankForIban(iban))
}
}
open fun searchBanksByBankCode(enteredBankCode: String): List<BankInfo> {
return bankFinder.findBankByBankCode(enteredBankCode)
open fun findUniqueBankForIban(iban: String): BankInfo? {
// first two characters are country code, 3rd and 4th character are checksum, bank code has 8 digits in Germany and user
// should enter at least five characters before we start searching (before there shouldn't be a chance of a unique result)
if (iban.length >= 9) {
if (iban.startsWith("DE", true)) {
return findUniqueBankForBankCode(iban.substring(4).ofMaxLength(8))
}
}
return null
}
open fun findUniqueBankForBankCodeAsync(bankCode: String, callback: (BankInfo?) -> Unit) {
threadPool.runAsync {
callback(findUniqueBankForBankCode(bankCode))
}
}
open fun findUniqueBankForBankCode(bankCode: String): BankInfo? {
val searchResult = bankFinder.findBankByBankCode(bankCode)
val groupedByBic = searchResult.groupBy { it.bic }
return if (groupedByBic.size == 1) searchResult.first() else null
}
open fun searchBanksByNameBankCodeOrCity(query: String?): List<BankInfo> {

20
fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/TransferMoneyDialog.kt
View File

@ -192,20 +192,20 @@ open class TransferMoneyDialog : DialogFragment() {
}
protected open fun tryToGetBicFromIban(enteredText: CharSequence) {
if (enteredText.length >= 12) { // first two characters are country code, 3rd and 4th character are checksum
if (enteredText.startsWith("DE", true)) {
presenter.searchBanksByBankCodeAsync(enteredText.substring(4)) { foundBanks ->
if (foundBanks.isNotEmpty()) {
presenter.findUniqueBankForIbanAsync(enteredText.toString()) { foundBank ->
context?.asActivity()?.runOnUiThread {
edtxtRemitteeBic.setText(foundBanks.first().bic)
showValuesForFoundBankOnUiThread(foundBank)
}
}
}
private fun showValuesForFoundBankOnUiThread(foundBank: BankInfo?) {
edtxtRemitteeBank.setText(if (foundBank != null) (foundBank.name + " " + foundBank.city) else "")
edtxtRemitteeBic.setText(foundBank?.bic ?: "")
checkIfRequiredDataEnteredOnUiThread()
}
}
}
}
}
}
protected open fun checkIfRequiredDataEnteredOnUiThread() {
val requiredDataEntered =