From 0fd50892af711100a48832c073d1c55ade2b7ef4 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 27 May 2020 16:12:06 +0200
Subject: [PATCH] Temporary fix to show error when user is creating an account
 on matrix.org with userId containing only digits (#1410)

---
 .idea/codeStyles/Project.xml                             | 3 ---
 CHANGES.md                                               | 1 +
 .../java/im/vector/riotx/features/login/LoginFragment.kt | 9 +++++++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 40ee4ee5cff..b3719669fd6 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,9 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <option name="RIGHT_MARGIN" value="160" />
-    <AndroidXmlCodeStyleSettings>
-      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
-    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
diff --git a/CHANGES.md b/CHANGES.md
index 150e83c8230..7588904c958 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ Improvements 🙌:
 
 Bugfix 🐛:
  - Switch theme is not fully taken into account without restarting the app
+ - Temporary fix to show error when user is creating an account on matrix.org with userId containing only digits (#1410)
 
 Translations 🗣:
  -
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt b/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt
index c2bd02b817a..eaf0a3cc788 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt
@@ -21,6 +21,7 @@ import android.os.Bundle
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import androidx.autofill.HintConstants
+import androidx.core.text.isDigitsOnly
 import androidx.core.view.isVisible
 import butterknife.OnClick
 import com.airbnb.mvrx.Fail
@@ -53,6 +54,9 @@ class LoginFragment @Inject constructor() : AbstractLoginFragment() {
 
     private var passwordShown = false
     private var isSignupMode = false
+    // Temporary patch for https://github.com/vector-im/riotX-android/issues/1410,
+    // waiting for https://github.com/matrix-org/synapse/issues/7576
+    private var isNumericOnlyUserIdForbidden = false
 
     override fun getLayoutResId() = R.layout.fragment_login
 
@@ -101,6 +105,10 @@ class LoginFragment @Inject constructor() : AbstractLoginFragment() {
             loginFieldTil.error = getString(if (isSignupMode) R.string.error_empty_field_choose_user_name else R.string.error_empty_field_enter_user_name)
             error++
         }
+        if (isSignupMode && isNumericOnlyUserIdForbidden && login.isDigitsOnly()) {
+            loginFieldTil.error = "The homeserver does not accept username with only digits."
+            error++
+        }
         if (password.isEmpty()) {
             passwordFieldTil.error = getString(if (isSignupMode) R.string.error_empty_field_choose_password else R.string.error_empty_field_your_password)
             error++
@@ -227,6 +235,7 @@ class LoginFragment @Inject constructor() : AbstractLoginFragment() {
 
     override fun updateWithState(state: LoginViewState) {
         isSignupMode = state.signMode == SignMode.SignUp
+        isNumericOnlyUserIdForbidden = state.serverType == ServerType.MatrixOrg
 
         setupUi(state)
         setupAutoFill(state)