From 94a669fcb861d9cff4414d98abb289d1452c9300 Mon Sep 17 00:00:00 2001
From: lookshe <github@lookshe.org>
Date: Sat, 11 Apr 2015 20:53:25 +0200
Subject: no trim of messages or password check password with only spaces
 separately

---
 .../java/eu/siacs/conversations/ui/ChangePasswordActivity.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java')

diff --git a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
index 54c064c6..aac435fd 100644
--- a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
@@ -27,11 +27,14 @@ public class ChangePasswordActivity extends XmppActivity implements XmppConnecti
 					mCurrentPassword.requestFocus();
 					mCurrentPassword.setError(getString(R.string.account_status_unauthorized));
 				} else if (!newPassword.equals(newPasswordConfirm)) {
-					mNewPasswordConfirm.requestFocus();
-					mNewPasswordConfirm.setError(getString(R.string.passwords_do_not_match));
+                    mNewPasswordConfirm.requestFocus();
+                    mNewPasswordConfirm.setError(getString(R.string.passwords_do_not_match));
+                } else if (newPassword.isEmpty()) {
+                    mNewPassword.requestFocus();
+                    mNewPassword.setError(getString(R.string.password_should_not_be_empty));
 				} else if (newPassword.trim().isEmpty()) {
 					mNewPassword.requestFocus();
-					mNewPassword.setError(getString(R.string.password_should_not_be_empty));
+					mNewPassword.setError(getString(R.string.password_should_not_contain_only_spaces));
 				} else {
 					mCurrentPassword.setError(null);
 					mNewPassword.setError(null);
-- 
cgit v1.2.3