From 64256d2d677bf8e90463e08c89ed2531a60e0c62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mieszko=20Wrzeszczy=C5=84ski?= <miewrz@st.amu.edu.pl>
Date: Sat, 3 Nov 2018 16:15:55 +0100
Subject: [PATCH] Update login validation

---
 .../uam/wmi/findmytutor/activity/LoginActivity.java  | 12 ++----------
 .../com/uam/wmi/findmytutor/utils/PrefUtils.java     |  2 +-
 app/src/main/res/values-pl/strings.xml               |  3 +--
 app/src/main/res/values/strings.xml                  |  5 +++--
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java
index 6b33d70..bc7c95f 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java
@@ -114,10 +114,6 @@ public class LoginActivity extends AppCompatActivity {
             mPasswordView.setError(getString(R.string.error_field_required));
             focusView = mPasswordView;
             cancel = true;
-        } else if (!isPasswordValid(password)) {
-            mPasswordView.setError(getString(R.string.error_invalid_password));
-            focusView = mPasswordView;
-            cancel = true;
         }
 
         if (cancel) {
@@ -130,13 +126,9 @@ public class LoginActivity extends AppCompatActivity {
     }
 
     private boolean isEmailValid(String loginName) {
-        Pattern pattern = Pattern.compile("^s\\d+");
+        Pattern pattern = Pattern.compile("\\s");
         Matcher matcher = pattern.matcher(loginName);
-        return matcher.find();
-    }
-
-    private boolean isPasswordValid(String password) {
-        return password.length() > 4;
+        return !matcher.find();
     }
 
     @TargetApi(Build.VERSION_CODES.HONEYCOMB_MR2)
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/utils/PrefUtils.java b/app/src/main/java/com/uam/wmi/findmytutor/utils/PrefUtils.java
index 2977ea2..f6b7d13 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/utils/PrefUtils.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/utils/PrefUtils.java
@@ -121,7 +121,7 @@ public class PrefUtils {
     }
 
     public static String getLocale(Context context) {
-        return getSharedPreferences(context).getString("LOCALE", null);
+        return getSharedPreferences(context).getString("LOCALE", "pl");
     }
 
 
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index b686890..7f81b8f 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -111,13 +111,12 @@
     <string name="userNote"><b>Notatka</b></string>
     <string name="userDutyHoursHeader"><b>Dyżury</b></string>
     <string name="dutyHours"> <b>Dyżury</b></string>
-    <string name="error_invalid_login_name">Niepoprawny format loginu.</string>
     <string name="userDepartment">Zakład</string>
     <string name="loading">Loading …</string>
     <string name="logo_find_my_tutor">Logo find my tutor</string>
     <string name="prompt_login">Login (Ldap)</string>
     <string name="action_log_in">Zaloguj!</string>
-
+    <string name="error_invalid_login_name">Niepoprawny format loginu.</string>
     <string name="user_list_nav">Lista użytkowników</string>
 </resources>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d7eab17..264cb47 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -170,12 +170,13 @@
     <string name="userNote"><b>Note</b></string>
     <string name="userDutyHoursHeader"><b>Duty Hours</b></string>
     <string name="dutyHours"> <b>Duty Hours</b></string>
-    <string name="error_invalid_login_name">Invalid format login. Use s11111 format</string>
+
     <string name="userDepartment">Department</string>
     <string name="loading">Loading …</string>
     <string name="logo_find_my_tutor">Logo find my tutor</string>
-    <string name="prompt_login">Login (sXXXXXX)</string>
+    <string name="prompt_login">Login (Ldap)</string>
     <string name="action_log_in">Log in </string>
     <string name="user_list_nav">Users list</string>
+    <string name="error_invalid_login_name">Invalid login format.</string>
 
 </resources>