Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ParseLoginUI/src/com/parse/ui/ParseLoginFragment.java
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,11 @@ public void onClick(View v) {
String password = passwordField.getText().toString();

if (username.length() == 0) {
showToast(R.string.com_parse_ui_no_username_toast);
if (config.isParseLoginEmailAsUsername()) {
showToast(R.string.com_parse_ui_no_email_toast);
} else {
showToast(R.string.com_parse_ui_no_username_toast);
}
} else if (password.length() == 0) {
showToast(R.string.com_parse_ui_no_password_toast);
} else {
Expand Down
6 changes: 5 additions & 1 deletion ParseLoginUI/src/com/parse/ui/ParseSignupFragment.java
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,11 @@ public void onClick(View v) {
}

if (username.length() == 0) {
showToast(R.string.com_parse_ui_no_username_toast);
if (config.isParseLoginEmailAsUsername()) {
showToast(R.string.com_parse_ui_no_email_toast);
} else {
showToast(R.string.com_parse_ui_no_username_toast);
}
} else if (password.length() == 0) {
showToast(R.string.com_parse_ui_no_password_toast);
} else if (password.length() < minPasswordLength) {
Expand Down