From f13eb168a5d5fddfe0be6dae1e5fd8a15a645654 Mon Sep 17 00:00:00 2001
From: dankito <git@dankito.net>
Date: Thu, 30 Apr 2020 15:42:23 +0200
Subject: [PATCH] Implemented stating that displayed text comes from bank and
 not from us (there are many really curious descriptions banks show so we tell
 user that this doesn't come from our side)

---
 BankingJavaFxApp/src/main/resources/Messages.properties         | 1 +
 BankingJavaFxApp/src/main/resources/Messages_de.properties      | 1 +
 .../net/dankito/banking/ui/javafx/dialogs/tan/EnterTanDialog.kt | 2 +-
 .../banking/fints4java/android/ui/dialogs/EnterTanDialog.kt     | 2 +-
 fints4javaAndroidApp/src/main/res/values-de/strings.xml         | 1 +
 fints4javaAndroidApp/src/main/res/values/strings.xml            | 1 +
 6 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/BankingJavaFxApp/src/main/resources/Messages.properties b/BankingJavaFxApp/src/main/resources/Messages.properties
index 5e51e291..90af48f5 100755
--- a/BankingJavaFxApp/src/main/resources/Messages.properties
+++ b/BankingJavaFxApp/src/main/resources/Messages.properties
@@ -47,6 +47,7 @@ enter.tan.dialog.select.tan.procedure=TAN procedure:
 enter.tan.dialog.select.tan.medium=TAN medium:
 enter.tan.dialog.size.label=Size:
 enter.tan.dialog.frequency.label=Speed:
+enter.tan.dialog.hint.from.bank=Hint from your bank: %s
 enter.tan.dialog.enter.tan.label=TAN:
 enter.tan.dialog.error.could.not.decode.tan.image=Could not decode flicker code or QR code / PhotoTan. Most likely an internal error:\n%s.
 enter.tan.dialog.tan.medium.successfully.changed=TAN medium successfully changed to \'%s\'.
diff --git a/BankingJavaFxApp/src/main/resources/Messages_de.properties b/BankingJavaFxApp/src/main/resources/Messages_de.properties
index 508300a4..0e5fe77f 100755
--- a/BankingJavaFxApp/src/main/resources/Messages_de.properties
+++ b/BankingJavaFxApp/src/main/resources/Messages_de.properties
@@ -47,6 +47,7 @@ enter.tan.dialog.select.tan.procedure=TAN Verfahren:
 enter.tan.dialog.select.tan.medium=TAN Medium:
 enter.tan.dialog.size.label=Größe:
 enter.tan.dialog.frequency.label=Geschwindigkeit:
+enter.tan.dialog.hint.from.bank=Hinweis Ihrer Bank: %s
 enter.tan.dialog.enter.tan.label=TAN:
 enter.tan.dialog.error.could.not.decode.tan.image=Flickercode bzw. QR-Code / PhotoTan konnte nicht dekodiert werden. Höchst wahrscheinlich ein interner Fehler:\n%s.
 enter.tan.dialog.tan.medium.successfully.changed=TAN Medium erfolgreich geändert zu \'%s\'.
diff --git a/BankingJavaFxControls/src/main/kotlin/net/dankito/banking/ui/javafx/dialogs/tan/EnterTanDialog.kt b/BankingJavaFxControls/src/main/kotlin/net/dankito/banking/ui/javafx/dialogs/tan/EnterTanDialog.kt
index f1348d1f..4786fde6 100644
--- a/BankingJavaFxControls/src/main/kotlin/net/dankito/banking/ui/javafx/dialogs/tan/EnterTanDialog.kt
+++ b/BankingJavaFxControls/src/main/kotlin/net/dankito/banking/ui/javafx/dialogs/tan/EnterTanDialog.kt
@@ -120,7 +120,7 @@ open class EnterTanDialog(
         hbox {
             maxWidth = 400.0
 
-            label(challenge.messageToShowToUser) {
+            label(String.format(messages["enter.tan.dialog.hint.from.bank"], challenge.messageToShowToUser)) {
                 isWrapText = true
             }
 
diff --git a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/EnterTanDialog.kt b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/EnterTanDialog.kt
index a03aca40..cd71051d 100644
--- a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/EnterTanDialog.kt
+++ b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/EnterTanDialog.kt
@@ -80,7 +80,7 @@ open class EnterTanDialog : DialogFragment() {
 
         setupTanView(rootView)
 
-        rootView.txtTanDescriptionToShowToUser.text = tanChallenge.messageToShowToUser
+        rootView.txtTanDescriptionToShowToUser.text = getString(R.string.dialog_enter_tan_hint_from_bank,  tanChallenge.messageToShowToUser)
 
         rootView.btnCancel.setOnClickListener { enteringTanDone(null) }
 
diff --git a/fints4javaAndroidApp/src/main/res/values-de/strings.xml b/fints4javaAndroidApp/src/main/res/values-de/strings.xml
index 76d9318c..c2fc7954 100644
--- a/fints4javaAndroidApp/src/main/res/values-de/strings.xml
+++ b/fints4javaAndroidApp/src/main/res/values-de/strings.xml
@@ -68,6 +68,7 @@
 
     <string name="dialog_enter_tan_select_tan_procedure">TAN Verfahren</string>
     <string name="dialog_enter_tan_select_tan_medium">TAN Medium</string>
+    <string name="dialog_enter_tan_hint_from_bank">Hinweis Ihrer Bank: %s</string>
     <string name="dialog_enter_tan_enter_tan">TAN eingeben:</string>
     <string name="dialog_enter_tan_error_could_not_decode_tan_image">Flicker code oder QR code / PhotoTan konnten nicht dekodiert werden. Sehr wahrscheinlich ein interner Fehler:\n%s.</string>
     <string name="dialog_enter_tan_tan_medium_successfully_changed">TAN Medium erfolgreich zu \'%s\' geändert.</string>
diff --git a/fints4javaAndroidApp/src/main/res/values/strings.xml b/fints4javaAndroidApp/src/main/res/values/strings.xml
index fd6901bb..ee0e2dfa 100644
--- a/fints4javaAndroidApp/src/main/res/values/strings.xml
+++ b/fints4javaAndroidApp/src/main/res/values/strings.xml
@@ -68,6 +68,7 @@
 
     <string name="dialog_enter_tan_select_tan_procedure">TAN procedure</string>
     <string name="dialog_enter_tan_select_tan_medium">TAN medium</string>
+    <string name="dialog_enter_tan_hint_from_bank">Hint from your bank: %s</string>
     <string name="dialog_enter_tan_enter_tan">Enter TAN:</string>
     <string name="dialog_enter_tan_error_could_not_decode_tan_image">Could not decode flicker code or QR code / PhotoTan. Most likely an internal error:\n%s.</string>
     <string name="dialog_enter_tan_tan_medium_successfully_changed">TAN medium successfully changed to \'%s\'.</string>