From c9dfe6ad6c092ee8c9b2bdaf0bbaf03068cdc253 Mon Sep 17 00:00:00 2001 From: "Howard.HT_Chang" Date: Tue, 27 Jan 2015 14:25:47 +0800 Subject: [PATCH] Toast should respect to the isParseLoginEmailAsUsername flag to avoid confusion --- ParseLoginUI/src/com/parse/ui/ParseLoginFragment.java | 6 +++++- ParseLoginUI/src/com/parse/ui/ParseSignupFragment.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ParseLoginUI/src/com/parse/ui/ParseLoginFragment.java b/ParseLoginUI/src/com/parse/ui/ParseLoginFragment.java index 00f6074..94ad6ed 100644 --- a/ParseLoginUI/src/com/parse/ui/ParseLoginFragment.java +++ b/ParseLoginUI/src/com/parse/ui/ParseLoginFragment.java @@ -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 { diff --git a/ParseLoginUI/src/com/parse/ui/ParseSignupFragment.java b/ParseLoginUI/src/com/parse/ui/ParseSignupFragment.java index 4e38b66..27f9dca 100644 --- a/ParseLoginUI/src/com/parse/ui/ParseSignupFragment.java +++ b/ParseLoginUI/src/com/parse/ui/ParseSignupFragment.java @@ -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) {