Commit 2282aeb7 authored by Niklas Fix's avatar Niklas Fix 🎓

fix allowed email endings

parent 191bf165
......@@ -12,7 +12,7 @@ class EmailPresenter(var view: EmailContract.View?) : EmailContract.Presenter {
override fun checkEmail(email: String) {
if (BuildConfig.DEBUG) {
view?.showEmailValid()
} else if (email.endsWith("@stud.tu-darmstadt.de")) {
} else if (email.endsWith(".tu-darmstadt.de") || email.endsWith("@tu-darmstadt.de")) {
view?.showEmailValid()
} else {
view?.showEmailNotValid()
......
......@@ -54,7 +54,7 @@
<string name="enter_new_password">Neues Passwort eingeben</string>
<string name="forgot_password">Passwort vergessen?</string>
<string name="subjects">Fächer</string>
<string name="signup_email_description_top">Bevor du Zugang zu einer komplett neuen Art des Lernens erlangst, benötigen wir deine Universitäts-Email-Adresse (mit Endung auf @stud.tu-darmstadt.de).</string>
<string name="signup_email_description_top">Bevor du Zugang zu einer komplett neuen Art des Lernens erlangst, benötigen wir deine Universitäts-Email-Adresse (mit Endung auf \"tu-darmstadt.de\").</string>
<string name="signup_email_description_bottom">Wir werden dir eine Email an diese Adresse senden, welche du zuerst bestätigen musst. Es kann manchmal ein paar Minuten dauern bevor die Email ankommt. Warum nicht die Zeit nutzen und deinen Freunden von Akamu erzählen?</string>
<string name="sign_out">Ausloggen</string>
<string name="alphabetic">Alphabetisch</string>
......@@ -67,7 +67,7 @@
<string name="hint_search_friend">Suche User</string>
<string name="no_active_duels">Du hast zur Zeit keine laufenden Duelle :( \nFüge zuerst ein paar Freunde hinzu.</string>
<string name="opponent_avatar">Gegner Avatar</string>
<string name="error_signup_invalidemail">Deine Email-Adresse muss auf \"@stud.tu-darmstadt.de\" enden.</string>
<string name="error_signup_invalidemail">Deine Email muss auf \"tu-darmstadt.de\" enden</string>
<string name="error_invalid_username_short">Dein Username muss mindestens 4 Zeichen lang sein.</string>
<string name="error_invalid_username_notalpha">Dein Username darf nur alphabetische oder numerische Zeichen enthalten</string>
<string name="error_invalid_username_long">Dein Username darf nicht länger als 12 Zeichen sein.</string>
......
......@@ -36,9 +36,7 @@
<string name="error_invalid_password_notequal">Passwords do not match
</string>
<string name="hint_signup_email">Enter your email address</string>
<string name="error_signup_invalidemail">Your email must end with
\"@stud.tu-darmstadt.de\"
</string>
<string name="error_signup_invalidemail">Your email must end with \"tu-darmstadt.de\"</string>
<!-- String related to Challenge -->
<string name="prompt_challenged_successful">has been challenged</string>
......@@ -110,7 +108,7 @@
exam…
</string>
<string name="signup_email_description_head">University Email</string>
<string name="signup_email_description_top">Before you get access to a complete new way of learning, we need your student email address (which ends on @stud.tu-darmstadt.de).</string>
<string name="signup_email_description_top">Before you get access to a complete new way of learning, we need your university email address (which ends on \"tu-darmstadt.de\").</string>
<string name="signup_email_description_bottom">We will send you an email to this address, which you have to confirm first. Sometimes it takes a few minutes before the email arrives. Why not use the time to tell your friends about Akamu?</string>
<string name="no_active_duels">You currently have no active duels :(\nStart with adding some friends.</string>
<string name="subjects">Subjects</string>
......
......@@ -117,9 +117,7 @@
<string name="error_invalid_password_notequal">Passwords do not match
</string>
<string name="hint_signup_email">Enter your email address</string>
<string name="error_signup_invalidemail">Your email must end with
\"@stud.tu-darmstadt.de\"
</string>
<string name="error_signup_invalidemail">Your email must end with \"tu-darmstadt.de\"</string>
<!-- String related to Challenge -->
<string name="prompt_challenged_successful">has been challenged</string>
......@@ -233,7 +231,7 @@
exam…
</string>
<string name="signup_email_description_head">University Email</string>
<string name="signup_email_description_top">Before you get access to a complete new way of learning, we need your student email address (which ends on @stud.tu-darmstadt.de).</string>
<string name="signup_email_description_top">Before you get access to a complete new way of learning, we need your university email address (which ends on \"tu-darmstadt.de\").</string>
<string name="signup_email_description_bottom">We will send you an email to this address, which you have to confirm first. Sometimes it takes a few minutes before the email arrives. Why not use the time to tell your friends about Akamu?</string>
<string name="no_active_duels">You currently have no active duels :(\nStart with adding some friends.</string>
<string name="subjects">Subjects</string>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment