MyHyvesBookPlus/TheReturnOfTheMyHyvesBookPlus
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Because Paul wanted to Merge

Browse Source
This commit is contained in:
Marijn Jansen
2017-06-22 11:36:17 +02:00
parent c040ef495f
commit aabe207594
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/LoginActivity.java
View File

@@ -44,11 +44,6 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
bindOnClick(); bindOnClick();
} }
@Override
protected void onStart() {
super.onStart();
}
/** /**
* Assigns all views. * Assigns all views.
*/ */
@@ -109,7 +104,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
if (!emailString.isEmpty() && !passwordString.isEmpty()) { if (!emailString.isEmpty() && !passwordString.isEmpty()) {
logIn(emailString, passwordString); logIn(emailString, passwordString);
} else { } else {
Toast.makeText(LoginActivity.this, "Please fill in email and password", Toast.LENGTH_SHORT).show(); Toast.makeText(LoginActivity.this, R.string.login_error, Toast.LENGTH_SHORT).show();
} }
} }
@@ -127,16 +122,13 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
if (passwordField.getText().toString().equals(passwordConfirmField.getText().toString())) { if (passwordField.getText().toString().equals(passwordConfirmField.getText().toString())) {
registerUser(emailField.getText().toString(), passwordField.getText().toString()); registerUser(emailField.getText().toString(), passwordField.getText().toString());
} else { } else {
Toast.makeText(LoginActivity.this, "Passwords do not match", Toast.makeText(LoginActivity.this, R.string.password_match_error,
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
Log.d(TAG, "registerOnClick: Passwords do not match"); Log.d(TAG, "registerOnClick: Passwords do not match");
} }
} else { } else {
Toast.makeText(LoginActivity.this, "Please fill in all the fields.", Toast.LENGTH_SHORT).show(); Toast.makeText(LoginActivity.this, R.string.register_error, Toast.LENGTH_SHORT).show();
} }
} }
/// UI-changes /// /// UI-changes ///
@@ -189,7 +181,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
* @param passwordString the entered password * @param passwordString the entered password
*/ */
protected void logIn(String emailString, String passwordString) { protected void logIn(String emailString, String passwordString) {
progressDialog = ProgressDialog.show(LoginActivity.this, "Please Wait", "Logging in", true, false); progressDialog = ProgressDialog.show(LoginActivity.this, getString(R.string.please_wait), "Logging in", true, false);
mAuth.signInWithEmailAndPassword(emailString, passwordString) mAuth.signInWithEmailAndPassword(emailString, passwordString)
.addOnCompleteListener(this, new OnCompleteListener<AuthResult>() { .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {