Merge pull request #7432 from ByeongsuPark/feature/bspark/enhancement-7111-trim-username

Add trim to username input when sign-in
2023-01-10 14:38:56 +01:00 · 2023-01-10 14:38:56 +01:00 · 31a0a049b1
parent 94a2453861 75d589bedd
commit 31a0a049b1
3 changed files with 3 additions and 2 deletions
--- a/changelog.d/7111.misc
+++ b/changelog.d/7111.misc
@ -0,0 +1 @@
+Add trim to username input on the app side and SDK side when sign-in
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt
@ -69,7 +69,7 @@ internal class DefaultLoginWizard(
            )
        } else {
            PasswordLoginParams.userIdentifier(
-                    user = login,
+                    user = login.trim(),
                    password = password,
                    deviceDisplayName = initialDeviceName,
                    deviceId = deviceId
--- a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
@ -685,7 +685,7 @@ class LoginViewModel @AssistedInject constructor(
            currentJob = viewModelScope.launch {
                try {
                    safeLoginWizard.login(
-                            action.username,
+                            action.username.trim(),
                            action.password,
                            action.initialDeviceName
                    )
				`@ -0,0 +1 @@`
				`Add trim to username input on the app side and SDK side when sign-in`