Implemented remembering with which accounts wrong credentials have been entered and ignoring these in automatic updates

persistence/database/RoomBankingPersistence/src/main/java/net/dankito/banking/persistence/model/Bank.kt

@@ -39,6 +39,8 @@ open class Bank(
 
     override var technicalId: String = id.toString(),
 
+    override var wrongCredentialsEntered: Boolean = false,
+
     override var savePassword: Boolean = true,
 
     override var userSetDisplayName: String? = null,

persistence/json/BankingPersistenceJson/src/main/kotlin/net/dankito/banking/persistence/model/BankDataEntity.kt

@@ -24,6 +24,7 @@ open class BankDataEntity(
     override var selectedTanMethod: TanMethod? = null,
     override var tanMedia: List<TanMedium> = listOf(),
     override var technicalId: String = UUID.randomUUID().toString(),
+    override var wrongCredentialsEntered: Boolean = false,
     override var savePassword: Boolean = true,
     override var userSetDisplayName: String? = null,
     override var displayIndex: Int = 0

ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/BankData.kt

@@ -37,6 +37,8 @@ open class BankData(
     override var tanMedia: List<TanMedium> = listOf()
 
 
+    override var wrongCredentialsEntered: Boolean = false
+
     override var savePassword: Boolean = true
 
 

ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/IBankData.kt

@@ -31,6 +31,8 @@ interface IBankData<TAccount: IBankAccount<TAccountTransaction>, TAccountTransac
     var selectedTanMethod: TanMethod?
     var tanMedia: List<TanMedium>
 
+    var wrongCredentialsEntered: Boolean
+
     var savePassword: Boolean
 
     var userSetDisplayName: String?

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

@@ -349,13 +349,13 @@ open class BankingPresenter(
     }
 
     open fun updateAllAccountsTransactionsAsync(callback: ((GetTransactionsResponse) -> Unit)? = null) {
-        val accountsToUpdate = allAccounts.filter { it.hideAccount == false && it.updateAccountAutomatically }
+        val accountsToUpdate = allAccounts.filter { considerAccountInAutomaticUpdates(it) }
 
         updateAccountsTransactionsAsync(accountsToUpdate, true, callback)
     }
 
     open fun updateSelectedAccountsTransactionsAsync(callback: ((GetTransactionsResponse) -> Unit)? = null) {
-        var accountsToUpdate = selectedAccounts.filter { it.updateAccountAutomatically }
+        var accountsToUpdate = selectedAccounts.filter { considerAccountInAutomaticUpdates(it) }
         if (accountsToUpdate.isEmpty() && (selectedAccountType == SelectedAccountType.SingleAccount
                     || (selectedAccountType == SelectedAccountType.SingleBank && selectedAccounts.size == 1))) {
             accountsToUpdate = selectedAccounts
@@ -364,6 +364,12 @@ open class BankingPresenter(
         updateAccountsTransactionsAsync(accountsToUpdate, false, callback)
     }
 
+    protected open fun considerAccountInAutomaticUpdates(account: TypedBankAccount): Boolean {
+        return account.updateAccountAutomatically
+                && account.hideAccount == false
+                && account.bank.wrongCredentialsEntered == false
+    }
+
 
     protected open fun updateAccountsTransactionsAsync(accounts: List<TypedBankAccount>, abortIfTanIsRequired: Boolean = false, callback: ((GetTransactionsResponse) -> Unit)? = null) {
         accounts.forEach { account ->
@@ -394,6 +400,15 @@ open class BankingPresenter(
 
                 updateAccountTransactionsAndBalances(retrievedData)
             }
+
+            response.retrievedData.map { it.account.bank }.toSet().forEach { bank ->
+                handleSuccessfulResponse(bank, response)
+            }
+        }
+        else {
+            response.retrievedData.map { it.account.bank }.toSet().forEach { bank ->
+                handleUnsuccessfulResponse(bank, response)
+            }
         }
 
         callRetrievedAccountTransactionsResponseListener(response)
@@ -489,13 +504,30 @@ open class BankingPresenter(
         callBanksChangedListeners()
     }
 
-    open fun bankUpdated(bank: TypedBankData) {
+    open fun bankUpdated(bank: TypedBankData, enteredUsername: String, enteredPassword: String, selectedTanMethod: TanMethod?) {
+        val didCredentialsChange = bank.userName != enteredUsername || bank.password != enteredPassword
+        val didSelectedTanMethodChange = bank.selectedTanMethod != selectedTanMethod
+
+        if (didCredentialsChange) {
+            bank.userName = enteredUsername
+            bank.password = enteredPassword
+
+            if (bank.wrongCredentialsEntered) {
+                bank.wrongCredentialsEntered = false // so that on next call its accounts are considered and so it gets checked if credentials are now correct
+            }
+        }
+        if (didSelectedTanMethodChange) {
+            bank.selectedTanMethod = selectedTanMethod
+        }
+
         persistBankAsync(bank)
 
         callBanksChangedListeners()
 
+        if (didCredentialsChange || didSelectedTanMethodChange) {
             getBankingClientForBank(bank)?.dataChanged(bank)
         }
+    }
 
     open fun accountUpdated(account: TypedBankAccount) {
         persistBankAsync(account.bank)
@@ -541,6 +573,10 @@ open class BankingPresenter(
             client.transferMoneyAsync(data) { response ->
                 if (response.successful) {
                     updateAccountTransactionsAsync(account, true)
+                    handleSuccessfulResponse(account.bank, response)
+                }
+                else {
+                    handleUnsuccessfulResponse(account.bank, response)
                 }
 
                 callback(response)
@@ -579,6 +615,21 @@ open class BankingPresenter(
     }
 
 
+    protected open fun handleSuccessfulResponse(bank: IBankData<*, *>, response: BankingClientResponse) {
+        if (response.wrongCredentialsEntered == false && bank.wrongCredentialsEntered) {
+            bank.wrongCredentialsEntered = false
+            persistBankAsync(bank)
+        }
+    }
+
+    protected open fun handleUnsuccessfulResponse(bank: IBankData<*, *>, response: BankingClientResponse) {
+        if (response.wrongCredentialsEntered && bank.wrongCredentialsEntered == false) {
+            bank.wrongCredentialsEntered = true
+            persistBankAsync(bank)
+        }
+    }
+
+
     open fun findUniqueBankForIbanAsync(iban: String, callback: (BankInfo?) -> Unit) {
         asyncRunner.runAsync {
             callback(findUniqueBankForIban(iban))

ui/BankingiOSApp/BankingiOSApp/BankingiOSApp.xcdatamodeld/BankingiOSApp.xcdatamodel/contents

@@ -84,6 +84,7 @@
         <attribute name="userId" attributeType="String"/>
         <attribute name="userName" attributeType="String"/>
         <attribute name="userSetDisplayName" optional="YES" attributeType="String"/>
+        <attribute name="wrongCredentialsEntered" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
         <relationship name="accounts" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="PersistedBankAccount" inverseName="bank" inverseEntity="PersistedBankAccount"/>
         <relationship name="supportedTanMethods" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="PersistedTanMethod"/>
         <relationship name="tanMedia" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="PersistedTanMedium"/>
@@ -109,7 +110,7 @@
         <element name="PersistedAccountTransaction" positionX="-36" positionY="45" width="128" height="553"/>
         <element name="PersistedAppSettings" positionX="-45" positionY="144" width="128" height="118"/>
         <element name="PersistedBankAccount" positionX="-54" positionY="63" width="128" height="418"/>
-        <element name="PersistedBankData" positionX="-63" positionY="-18" width="128" height="283"/>
+        <element name="PersistedBankData" positionX="-63" positionY="-18" width="128" height="298"/>
         <element name="PersistedTanMedium" positionX="-45" positionY="144" width="128" height="28"/>
         <element name="PersistedTanMethod" positionX="-54" positionY="135" width="128" height="118"/>
         <element name="PersistedTanMethodSettings" positionX="-54" positionY="135" width="128" height="103"/>

ui/BankingiOSApp/BankingiOSApp/persistence/Mapper.swift

@@ -8,6 +8,7 @@ class Mapper {
     func map(_ bank: PersistedBankData) -> IBankData {
         let mapped = BankData(bankCode: map(bank.bankCode), userName: map(bank.userName), password: map(bank.password), finTsServerAddress: map(bank.finTsServerAddress), bankName: map(bank.bankName), bic: map(bank.bic), customerName: map(bank.customerName), userId: map(bank.userId), iconUrl: bank.iconUrl, accounts: [])
 
+        mapped.wrongCredentialsEntered = bank.wrongCredentialsEntered
         mapped.savePassword = bank.savePassword
         mapped.userSetDisplayName = bank.userSetDisplayName
         mapped.displayIndex = bank.displayIndex
@@ -37,6 +38,7 @@ class Mapper {
         mapped.userId = bank.userId
         mapped.iconUrl = bank.iconUrl
 
+        mapped.wrongCredentialsEntered = bank.wrongCredentialsEntered
         mapped.savePassword = bank.savePassword
         mapped.userSetDisplayName = bank.userSetDisplayName
         mapped.displayIndex = bank.displayIndex

ui/BankingiOSApp/BankingiOSApp/ui/dialogs/BankSettingsDialog.swift

@@ -130,12 +130,7 @@ struct BankSettingsDialog: View {
         if hasUnsavedData {
             bank.userSetDisplayName = displayName
             
-            bank.userName = userName
+            presenter.bankUpdated(bank: bank, enteredUsername: userName, enteredPassword: password, selectedTanMethod: selectedTanMethod)
-            bank.password = password
-            
-            bank.selectedTanMethod = selectedTanMethod
-            
-            presenter.bankUpdated(bank: bank)
         }
         
         closeDialog()