From 302dc6f8edccaba187e4008e53c5423d7727f9d0 Mon Sep 17 00:00:00 2001 From: dankito Date: Wed, 13 May 2020 14:22:20 +0200 Subject: [PATCH] Renamed userDidNotEnterTan() to userDidNotEnterAtc() --- .../kotlin/net/dankito/fints/callback/FinTsClientCallback.kt | 2 +- .../net/dankito/fints/callback/NoOpFinTsClientCallback.kt | 2 +- .../net/dankito/fints/callback/SimpleFinTsClientCallback.kt | 2 +- .../net/dankito/fints/model/EnterTanGeneratorAtcResult.kt | 2 +- fints4k/src/test/kotlin/net/dankito/fints/FinTsClientTest.kt | 2 +- .../banking/fints4java/android/ui/dialogs/EnterAtcDialog.kt | 2 +- .../main/kotlin/net/dankito/banking/ui/javafx/RouterJavaFx.kt | 2 +- .../dankito/banking/ui/model/tan/EnterTanGeneratorAtcResult.kt | 2 +- .../kotlin/net/dankito/banking/mapper/fints4javaModelMapper.kt | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fints4k/src/main/kotlin/net/dankito/fints/callback/FinTsClientCallback.kt b/fints4k/src/main/kotlin/net/dankito/fints/callback/FinTsClientCallback.kt index 922b00a1..171be228 100644 --- a/fints4k/src/main/kotlin/net/dankito/fints/callback/FinTsClientCallback.kt +++ b/fints4k/src/main/kotlin/net/dankito/fints/callback/FinTsClientCallback.kt @@ -23,7 +23,7 @@ interface FinTsClientCallback { /** * This method gets called for chipTan TAN generators when the bank asks the customer to synchronize her/his TAN generator. * - * If you do not support entering TAN generator ATC, return [EnterTanGeneratorAtcResult.userDidNotEnterTan] + * If you do not support entering TAN generator ATC, return [EnterTanGeneratorAtcResult.userDidNotEnterAtc] */ fun enterTanGeneratorAtc(customer: CustomerData, tanMedium: TanGeneratorTanMedium): EnterTanGeneratorAtcResult diff --git a/fints4k/src/main/kotlin/net/dankito/fints/callback/NoOpFinTsClientCallback.kt b/fints4k/src/main/kotlin/net/dankito/fints/callback/NoOpFinTsClientCallback.kt index af7f2fbe..07a8fcd9 100644 --- a/fints4k/src/main/kotlin/net/dankito/fints/callback/NoOpFinTsClientCallback.kt +++ b/fints4k/src/main/kotlin/net/dankito/fints/callback/NoOpFinTsClientCallback.kt @@ -17,7 +17,7 @@ open class NoOpFinTsClientCallback : FinTsClientCallback { } override fun enterTanGeneratorAtc(customer: CustomerData, tanMedium: TanGeneratorTanMedium): EnterTanGeneratorAtcResult { - return EnterTanGeneratorAtcResult.userDidNotEnterTan() + return EnterTanGeneratorAtcResult.userDidNotEnterAtc() } } \ No newline at end of file diff --git a/fints4k/src/main/kotlin/net/dankito/fints/callback/SimpleFinTsClientCallback.kt b/fints4k/src/main/kotlin/net/dankito/fints/callback/SimpleFinTsClientCallback.kt index cb08f5e9..cb595989 100644 --- a/fints4k/src/main/kotlin/net/dankito/fints/callback/SimpleFinTsClientCallback.kt +++ b/fints4k/src/main/kotlin/net/dankito/fints/callback/SimpleFinTsClientCallback.kt @@ -21,7 +21,7 @@ open class SimpleFinTsClientCallback( } override fun enterTanGeneratorAtc(customer: CustomerData, tanMedium: TanGeneratorTanMedium): EnterTanGeneratorAtcResult { - return enterTanGeneratorAtc?.invoke(customer, tanMedium) ?: EnterTanGeneratorAtcResult.userDidNotEnterTan() + return enterTanGeneratorAtc?.invoke(customer, tanMedium) ?: EnterTanGeneratorAtcResult.userDidNotEnterAtc() } } \ No newline at end of file diff --git a/fints4k/src/main/kotlin/net/dankito/fints/model/EnterTanGeneratorAtcResult.kt b/fints4k/src/main/kotlin/net/dankito/fints/model/EnterTanGeneratorAtcResult.kt index 9ef3cd7c..6d416684 100644 --- a/fints4k/src/main/kotlin/net/dankito/fints/model/EnterTanGeneratorAtcResult.kt +++ b/fints4k/src/main/kotlin/net/dankito/fints/model/EnterTanGeneratorAtcResult.kt @@ -12,7 +12,7 @@ open class EnterTanGeneratorAtcResult protected constructor( return EnterTanGeneratorAtcResult(enteredTan, enteredAtc) } - fun userDidNotEnterTan(): EnterTanGeneratorAtcResult { + fun userDidNotEnterAtc(): EnterTanGeneratorAtcResult { return EnterTanGeneratorAtcResult(null, null) } diff --git a/fints4k/src/test/kotlin/net/dankito/fints/FinTsClientTest.kt b/fints4k/src/test/kotlin/net/dankito/fints/FinTsClientTest.kt index 02c2a5df..e956fe26 100644 --- a/fints4k/src/test/kotlin/net/dankito/fints/FinTsClientTest.kt +++ b/fints4k/src/test/kotlin/net/dankito/fints/FinTsClientTest.kt @@ -53,7 +53,7 @@ class FinTsClientTest { override fun enterTanGeneratorAtc(customer: CustomerData, tanMedium: TanGeneratorTanMedium): EnterTanGeneratorAtcResult { Assert.fail("Bank asks you to synchronize your TAN generator for card ${tanMedium.cardNumber} " + "(card sequence number ${tanMedium.cardSequenceNumber}). Please do this via your online banking portal or Banking UI.") - return EnterTanGeneratorAtcResult.userDidNotEnterTan() // should actually never be called + return EnterTanGeneratorAtcResult.userDidNotEnterAtc() // should actually never be called } } diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/EnterAtcDialog.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/EnterAtcDialog.kt index b48a8146..7f0a196b 100644 --- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/EnterAtcDialog.kt +++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/EnterAtcDialog.kt @@ -70,7 +70,7 @@ open class EnterAtcDialog : DialogFragment() { } } - val result = if (enteredTan == null || enteredAtc == null) EnterTanGeneratorAtcResult.userDidNotEnterTan() + val result = if (enteredTan == null || enteredAtc == null) EnterTanGeneratorAtcResult.userDidNotEnterAtc() else EnterTanGeneratorAtcResult.userEnteredAtc(enteredTan, enteredAtc) atcEnteredCallback(result) diff --git a/ui/BankingJavaFxControls/src/main/kotlin/net/dankito/banking/ui/javafx/RouterJavaFx.kt b/ui/BankingJavaFxControls/src/main/kotlin/net/dankito/banking/ui/javafx/RouterJavaFx.kt index 147fb8a1..97759891 100644 --- a/ui/BankingJavaFxControls/src/main/kotlin/net/dankito/banking/ui/javafx/RouterJavaFx.kt +++ b/ui/BankingJavaFxControls/src/main/kotlin/net/dankito/banking/ui/javafx/RouterJavaFx.kt @@ -42,7 +42,7 @@ open class RouterJavaFx : IRouter { } override fun getAtcFromUserFromNonUiThread(tanMedium: TanGeneratorTanMedium): EnterTanGeneratorAtcResult { - return EnterTanGeneratorAtcResult.userDidNotEnterTan() + return EnterTanGeneratorAtcResult.userDidNotEnterAtc() } override fun showTransferMoneyDialog(presenter: BankingPresenter, preselectedBankAccount: BankAccount?, preselectedValues: TransferMoneyData?) { diff --git a/ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/tan/EnterTanGeneratorAtcResult.kt b/ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/tan/EnterTanGeneratorAtcResult.kt index 5c65ec3e..239245cb 100644 --- a/ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/tan/EnterTanGeneratorAtcResult.kt +++ b/ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/tan/EnterTanGeneratorAtcResult.kt @@ -12,7 +12,7 @@ open class EnterTanGeneratorAtcResult protected constructor( return EnterTanGeneratorAtcResult(enteredTan, enteredAtc) } - fun userDidNotEnterTan(): EnterTanGeneratorAtcResult { + fun userDidNotEnterAtc(): EnterTanGeneratorAtcResult { return EnterTanGeneratorAtcResult(null, null) } diff --git a/ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/mapper/fints4javaModelMapper.kt b/ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/mapper/fints4javaModelMapper.kt index 0462c23c..3ecfeaa0 100644 --- a/ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/mapper/fints4javaModelMapper.kt +++ b/ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/mapper/fints4javaModelMapper.kt @@ -364,7 +364,7 @@ open class fints4javaModelMapper { return net.dankito.fints.model.EnterTanGeneratorAtcResult.userEnteredAtc(result.tan!!, result.atc!!) } - return net.dankito.fints.model.EnterTanGeneratorAtcResult.userDidNotEnterTan() + return net.dankito.fints.model.EnterTanGeneratorAtcResult.userDidNotEnterAtc() } open fun mapTanChallenge(tanChallenge: net.dankito.fints.model.TanChallenge): TanChallenge {