Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 09:49:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix error display when entering invalid username characters.

Browse Source 
Also convert UsernameEditViewModel to kotlin.
This commit is contained in:
Greyson Parrelli
2023-08-25 11:17:26 -04:00
parent 3fe9ce378e
commit 84b4d69913
6 changed files with 316 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/src/main/java/org/thoughtcrime/securesms/util/UsernameUtil.kt
View File

@@ -33,19 +33,26 @@ object UsernameUtil {
}
@JvmStatic
fun checkUsername(value: String?): Optional<InvalidReason> {
return if (value == null) {
Optional.of(InvalidReason.TOO_SHORT)
} else if (value.length < MIN_LENGTH) {
Optional.of(InvalidReason.TOO_SHORT)
} else if (value.length > MAX_LENGTH) {
Optional.of(InvalidReason.TOO_LONG)
} else if (DIGIT_START_PATTERN.matcher(value).matches()) {
Optional.of(InvalidReason.STARTS_WITH_NUMBER)
} else if (!FULL_PATTERN.matcher(value).matches()) {
Optional.of(InvalidReason.INVALID_CHARACTERS)
} else {
Optional.empty()
fun checkUsername(value: String?): InvalidReason? {
return when {
value == null -> {
InvalidReason.TOO_SHORT
}
value.length < MIN_LENGTH -> {
InvalidReason.TOO_SHORT
}
value.length > MAX_LENGTH -> {
InvalidReason.TOO_LONG
}
DIGIT_START_PATTERN.matcher(value).matches() -> {
InvalidReason.STARTS_WITH_NUMBER
}
!FULL_PATTERN.matcher(value).matches() -> {
InvalidReason.INVALID_CHARACTERS
}
else -> {
null
}
}
}