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 @@
Notatka
Dyżury
Dyżury
- Niepoprawny format loginu.
Zakład
Loading …
Logo find my tutor
Login (Ldap)
Zaloguj!
-
+ Niepoprawny format loginu.
Lista użytkowników
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 @@
Note
Duty Hours
Duty Hours
- Invalid format login. Use s11111 format
+
Department
Loading …
Logo find my tutor
- Login (sXXXXXX)
+ Login (Ldap)
Log in
Users list
+ Invalid login format.