caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Prevent duplicate numbers in SMS communicator config

Browse source
This commit is contained in:
Dominik Dzienia 2020-10-22 23:49:36 +02:00
parent b2bd2cafec
commit 0f4a428c00
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
View file

@ -1004,7 +1004,7 @@ class SmsCommunicatorPlugin @Inject constructor(
private fun areMoreNumbers(allowednumbers: String?): Boolean { private fun areMoreNumbers(allowednumbers: String?): Boolean {
return allowednumbers?.let { return allowednumbers?.let {
var countNumbers = 0 val knownNumbers = HashSet<String>()
val substrings = it.split(";").toTypedArray() val substrings = it.split(";").toTypedArray()
for (number in substrings) { for (number in substrings) {
var cleaned = number.replace(Regex("\\s+"), "") var cleaned = number.replace(Regex("\\s+"), "")
@ -1012,9 +1012,9 @@ class SmsCommunicatorPlugin @Inject constructor(
cleaned = cleaned.replace("+", "") cleaned = cleaned.replace("+", "")
cleaned = cleaned.replace("-", "") cleaned = cleaned.replace("-", "")
if (!cleaned.matches(Regex("[0-9]+"))) continue if (!cleaned.matches(Regex("[0-9]+"))) continue
countNumbers++ knownNumbers.add(cleaned)
} }
countNumbers > 1 knownNumbers.size > 1
} ?: false } ?: false
} }
} }

4
core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiPhoneValidator.kt
View file

@ -7,9 +7,13 @@ class MultiPhoneValidator(val _customErrorMessage: String?) : Validator(_customE
override fun isValid(editText: EditText): Boolean { override fun isValid(editText: EditText): Boolean {
val substrings = editText.text.split(";").toTypedArray() val substrings = editText.text.split(";").toTypedArray()
val knownNumbers = HashSet<String>()
for (number in substrings) { for (number in substrings) {
if (!PatternValidator(_customErrorMessage, Patterns.PHONE).isValid(number)) if (!PatternValidator(_customErrorMessage, Patterns.PHONE).isValid(number))
return false return false
if (knownNumbers.contains(number))
return false
knownNumbers.add(number)
} }
return substrings.isNotEmpty() return substrings.isNotEmpty()
} }