From 9c821d520b7b621f3b753e29f0662e9437fea9fd Mon Sep 17 00:00:00 2001
From: Kolya Opahle <k.opahle@sap.com>
Date: Tue, 2 Jun 2020 09:57:37 +0200
Subject: [PATCH] Add Support for lower case characters in the teleTAN screen
(#66)
* added support for lower case input in teleTan fragment
Signed-off-by: Kolya Opahle <k.opahle@sap.com>
* Removed notice of case insensitivity from temporary strings.xml
Signed-off-by: Kolya Opahle <k.opahle@sap.com>
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
---
.../coronawarnapp/ui/submission/SubmissionTanViewModel.kt | 6 +++++-
.../java/de/rki/coronawarnapp/ui/submission/TanInput.kt | 3 +--
Corona-Warn-App/src/main/res/values/strings.xml | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTanViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTanViewModel.kt
index 50f093824..22b63d2d9 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTanViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTanViewModel.kt
@@ -13,7 +13,11 @@ class SubmissionTanViewModel : ViewModel() {
private const val TAN_LENGTH = 7
private val EXCLUDED_TAN_CHARS = listOf('0', 'O', 'I', '1')
- private val VALID_TAN_CHARS = ('A'..'Z').plus('0'..'9').minus(EXCLUDED_TAN_CHARS)
+ private val VALID_TAN_CHARS =
+ ('a'..'z')
+ .plus('A'..'Z')
+ .plus('0'..'9')
+ .minus(EXCLUDED_TAN_CHARS)
}
val tan = MutableLiveData<String?>(null)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/TanInput.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/TanInput.kt
index 04c323b62..d1a251846 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/TanInput.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/TanInput.kt
@@ -15,7 +15,6 @@ import kotlinx.android.synthetic.main.view_tan_input.view.tan_input_textview_4
import kotlinx.android.synthetic.main.view_tan_input.view.tan_input_textview_5
import kotlinx.android.synthetic.main.view_tan_input.view.tan_input_textview_6
import kotlinx.android.synthetic.main.view_tan_input.view.tan_input_textview_7
-import java.util.Locale
class TanInput(context: Context, attrs: AttributeSet) : FrameLayout(context, attrs) {
@@ -46,7 +45,7 @@ class TanInput(context: Context, attrs: AttributeSet) : FrameLayout(context, att
}
private fun updateTan(text: CharSequence?) {
- this.tan = text?.toString()?.toUpperCase(Locale.getDefault())
+ this.tan = text?.toString()
updateDigits()
notifyListener()
}
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index 4b9e03875..a20246863 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -382,7 +382,7 @@
<string name="submission_test_result_invalid_remove_test_button">Test entfernen</string>
<!-- Submission Tan -->
<string name="submission_tan_title">TAN Eingabe</string>
- <string name="submission_tan_body">Geben Sie bitte die TAN Nummer ihres Befundes ein. Die TAN ist 7-stellig und Groß- und Kleinschreibung muss nicht beachtet werden.</string>
+ <string name="submission_tan_body">Geben Sie bitte die TAN Nummer ihres Befundes ein. Die TAN ist 7-stellig.</string>
<string name="submission_tan_button_text">Weiter</string>
<!-- Submission Intro -->
<string name="submission_intro_title">Wurden Sie getestet?</string>
--
GitLab