Merge pull request #1100 from wireapp/AN-5615

deanrobertcook · web-flow · commit d112d5e81b29 · 2017-09-05T15:35:24.000+02:00
[AN-5615] Name on registration should have at least 2 characters
diff --git a/app/src/main/scala/com/waz/zclient/appentry/PhoneSetNameFragment.scala b/app/src/main/scala/com/waz/zclient/appentry/PhoneSetNameFragment.scala
@@ -30,7 +30,6 @@ import com.waz.zclient.newreg.views.PhoneConfirmationButton
 import com.waz.zclient.pages.BaseFragment
 import com.waz.zclient.ui.text.TypefaceEditText
 import com.waz.zclient.ui.utils.KeyboardUtils
-import com.waz.zclient.utils.StringUtils
 
 object PhoneSetNameFragment {
   val TAG = classOf[PhoneSetNameFragment].getName
@@ -131,6 +130,6 @@ class PhoneSetNameFragment extends BaseFragment[PhoneSetNameFragment.Container]
       PhoneConfirmationButton.State.NONE
   }
 
-  private def isNameValid(name: String): Boolean = !StringUtils.isBlank(name)
+  private def isNameValid(name: String): Boolean = name != null && name.trim.length > 1
 
 }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ import com.waz.zclient.newreg.views.PhoneConfirmationButton`
`30`	`30`	`import com.waz.zclient.pages.BaseFragment`
`31`	`31`	`import com.waz.zclient.ui.text.TypefaceEditText`
`32`	`32`	`import com.waz.zclient.ui.utils.KeyboardUtils`
`33`		`-import com.waz.zclient.utils.StringUtils`
`34`	`33`
`35`	`34`	`object PhoneSetNameFragment {`
`36`	`35`	`val TAG = classOf[PhoneSetNameFragment].getName`
`@@ -131,6 +130,6 @@ class PhoneSetNameFragment extends BaseFragment[PhoneSetNameFragment.Container]`
`131`	`130`	`PhoneConfirmationButton.State.NONE`
`132`	`131`	`}`
`133`	`132`
`134`		`- private def isNameValid(name: String): Boolean = !StringUtils.isBlank(name)`
	`133`	`+ private def isNameValid(name: String): Boolean = name != null && name.trim.length > 1`
`135`	`134`
`136`	`135`	`}`