FinTsClientCallback returns now EnterTanGeneratorAtcResult instead of EnterTanGeneratorAtcResult? and EnterAtcDialog returns EnterTanGeneratorAtcResult now

fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/MainActivity.kt

@@ -17,7 +17,6 @@ import net.dankito.fints.FinTsClientCallback
 import net.dankito.fints.messages.datenelemente.implementierte.tan.TanGeneratorTanMedium
 import net.dankito.fints.model.*
 import java.util.concurrent.CountDownLatch
-import java.util.concurrent.atomic.AtomicInteger
 import java.util.concurrent.atomic.AtomicReference
 
 
@@ -36,7 +35,7 @@ class MainActivity : AppCompatActivity() {
             return getTanFromUserOffUiThread(customer, tanChallenge)
         }
 
-        override fun enterTanGeneratorAtc(customer: CustomerData, tanMedium: TanGeneratorTanMedium): EnterTanGeneratorAtcResult? {
+        override fun enterTanGeneratorAtc(customer: CustomerData, tanMedium: TanGeneratorTanMedium): EnterTanGeneratorAtcResult {
             return getAtcFromUserOffUiThread(customer, tanMedium)
         }
 
@@ -107,23 +106,21 @@ class MainActivity : AppCompatActivity() {
         return enteredTan.get()
     }
 
-    private fun getAtcFromUserOffUiThread(customer: CustomerData, tanMedium: TanGeneratorTanMedium): EnterTanGeneratorAtcResult? {
+    private fun getAtcFromUserOffUiThread(customer: CustomerData, tanMedium: TanGeneratorTanMedium): EnterTanGeneratorAtcResult {
-        val enteredTan = AtomicReference<String>(null)
+        val result = AtomicReference<EnterTanGeneratorAtcResult>(null)
-        val enteredAtc = AtomicInteger()
         val tanEnteredLatch = CountDownLatch(1)
 
         runOnUiThread {
             // TODO: don't create a fints4javaModelMapper instance here, let MainWindowPresenter do the job
-            EnterAtcDialog().show(fints4javaModelMapper().mapTanMedium(tanMedium), this@MainActivity, false) { tan, atc ->
+            EnterAtcDialog().show(fints4javaModelMapper().mapTanMedium(tanMedium), this@MainActivity, false) { enteredResult ->
-                enteredTan.set(tan)
+                result.set(enteredResult)
-                atc?.let { enteredAtc.set(atc) }
                 tanEnteredLatch.countDown()
             }
         }
 
         try { tanEnteredLatch.await() } catch (ignored: Exception) { }
 
-        return if (enteredTan.get() == null) null else EnterTanGeneratorAtcResult(enteredTan.get(), enteredAtc.get())
+        return result.get()
     }
 
 }

fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/EnterAtcDialog.kt

@@ -11,6 +11,7 @@ import android.view.ViewGroup
 import kotlinx.android.synthetic.main.dialog_enter_atc.view.*
 import net.dankito.banking.fints4java.android.R
 import net.dankito.banking.ui.model.TanMedium
+import net.dankito.fints.model.EnterTanGeneratorAtcResult
 
 
 open class EnterAtcDialog : DialogFragment() {
@@ -22,11 +23,11 @@ open class EnterAtcDialog : DialogFragment() {
 
     protected lateinit var tanMedium: TanMedium
 
-    protected lateinit var atcEnteredCallback: (tan: String?, atc: Int?) -> Unit
+    protected lateinit var atcEnteredCallback: (EnterTanGeneratorAtcResult) -> Unit
 
 
     open fun show(tanMedium: TanMedium, activity: AppCompatActivity,
-                  fullscreen: Boolean = false, atcEnteredCallback: (tan: String?, atc: Int?) -> Unit) {
+                  fullscreen: Boolean = false, atcEnteredCallback: (EnterTanGeneratorAtcResult?) -> Unit) {
 
         this.tanMedium = tanMedium
         this.atcEnteredCallback = atcEnteredCallback
@@ -69,7 +70,10 @@ open class EnterAtcDialog : DialogFragment() {
             }
         }
 
-        atcEnteredCallback(enteredTan, enteredAtc)
+        val result = if (enteredTan == null || enteredAtc == null) EnterTanGeneratorAtcResult.userDidNotEnterTan()
+                     else EnterTanGeneratorAtcResult.userEnteredAtc(enteredTan, enteredAtc)
+
+        atcEnteredCallback(result)
 
         dismiss()
     }

fints4javaLib/src/main/kotlin/net/dankito/fints/FinTsClient.kt

@@ -339,7 +339,7 @@ open class FinTsClient @JvmOverloads constructor(
         if (bank.changeTanMediumParameters?.enteringAtcAndTanRequired == true) {
             enteredAtc = callback.enterTanGeneratorAtc(customer, newActiveTanMedium)
 
-            if (enteredAtc == null) {
+            if (enteredAtc.hasAtcBeenEntered) {
                 val message = "Bank requires to enter ATC and TAN in order to change TAN medium." // TODO: translate
                 return FinTsClientResponse(Response(false, exception = Exception(message)))
             }

fints4javaLib/src/main/kotlin/net/dankito/fints/FinTsClientCallback.kt

@@ -13,6 +13,6 @@ interface FinTsClientCallback {
     /**
      * This method gets called for chipTan TAN generators when the bank asks the customer to synchronize her/his TAN generator.
      */
-    fun enterTanGeneratorAtc(customer: CustomerData, tanMedium: TanGeneratorTanMedium): EnterTanGeneratorAtcResult?
+    fun enterTanGeneratorAtc(customer: CustomerData, tanMedium: TanGeneratorTanMedium): EnterTanGeneratorAtcResult
 
 }

fints4javaLib/src/main/kotlin/net/dankito/fints/model/EnterTanGeneratorAtcResult.kt

@@ -1,11 +1,28 @@
 package net.dankito.fints.model
 
 
-open class EnterTanGeneratorAtcResult(
+open class EnterTanGeneratorAtcResult protected constructor(
-    val tan: String,
+    val tan: String?,
-    val atc: Int
+    val atc: Int?
 ) {
 
+    companion object {
+
+        fun userEnteredAtc(enteredTan: String, enteredAtc: Int): EnterTanGeneratorAtcResult {
+            return EnterTanGeneratorAtcResult(enteredTan, enteredAtc)
+        }
+
+        fun userDidNotEnterTan(): EnterTanGeneratorAtcResult {
+            return EnterTanGeneratorAtcResult(null, null)
+        }
+
+    }
+
+
+    val hasAtcBeenEntered: Boolean
+        get() = tan != null && atc != null
+
+
     override fun toString(): String {
         return "TAN: $tan, ATC: $atc"
     }

fints4javaLib/src/main/kotlin/net/dankito/fints/model/EnterTanResult.kt

@@ -3,7 +3,7 @@ package net.dankito.fints.model
 import net.dankito.fints.messages.datenelemente.implementierte.tan.TanMedium
 
 
-open class EnterTanResult constructor(
+open class EnterTanResult protected constructor(
     val enteredTan: String?,
     val changeTanMediumTo: TanMedium?
 ) {

fints4javaLib/src/test/java/net/dankito/fints/java/JavaShowcase.java

@@ -49,7 +49,7 @@ public class JavaShowcase {
                 @Nullable
                 @Override
                 public EnterTanGeneratorAtcResult enterTanGeneratorAtc(@NotNull CustomerData customer, @NotNull TanGeneratorTanMedium tanMedium) {
-                    return null;
+                    return EnterTanGeneratorAtcResult.Companion.userDidNotEnterTan();
                 }
             };
 

fints4javaLib/src/test/kotlin/net/dankito/fints/FinTsClientTest.kt

@@ -43,10 +43,10 @@ class FinTsClientTest {
             return EnterTanResult.userDidNotEnterTan()
         }
 
-        override fun enterTanGeneratorAtc(customer: CustomerData, tanMedium: TanGeneratorTanMedium): EnterTanGeneratorAtcResult? {
+        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 null // should actually never be called
+            return EnterTanGeneratorAtcResult.userDidNotEnterTan() // should actually never be called
         }
 
     }