Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix assistant create account

Browse source
This commit is contained in:
Margaux Clerc 2016-09-13 17:15:06 +02:00
parent 714733a885
commit 5565dc6234
1 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/org/linphone/assistant/CreateAccountFragment.java
View file

@ -421,13 +421,6 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
private void addEmailHandler(final EditText field, final ImageView icon) { private void addEmailHandler(final EditText field, final ImageView icon) {
field.addTextChangedListener(new TextWatcher() { field.addTextChangedListener(new TextWatcher() {
public void afterTextChanged(Editable s) { public void afterTextChanged(Editable s) {
}
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
public void onTextChanged(CharSequence s, int start, int count, int after)
{
emailOk = false; emailOk = false;
Status status = accountCreator.setEmail(field.getText().toString()); Status status = accountCreator.setEmail(field.getText().toString());
if (status.equals(Status.Ok)) { if (status.equals(Status.Ok)) {
@ -439,19 +432,18 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
} }
createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk); createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk);
} }
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
public void onTextChanged(CharSequence s, int start, int count, int after) {
}
}); });
} }
private void addPasswordHandler(final EditText field1, final ImageView icon) { private void addPasswordHandler(final EditText field1, final ImageView icon) {
TextWatcher passwordListener = new TextWatcher() { TextWatcher passwordListener = new TextWatcher() {
public void afterTextChanged(Editable s) { public void afterTextChanged(Editable s) {
}
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
public void onTextChanged(CharSequence s, int start, int count, int after)
{
passwordOk = false; passwordOk = false;
Status status = accountCreator.setPassword(field1.getText().toString()); Status status = accountCreator.setPassword(field1.getText().toString());
if (isPasswordCorrect(field1.getText().toString())) { if (isPasswordCorrect(field1.getText().toString())) {
@ -463,6 +455,12 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
} }
createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk); createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk);
} }
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
public void onTextChanged(CharSequence s, int start, int count, int after) {
}
}; };
field1.addTextChangedListener(passwordListener); field1.addTextChangedListener(passwordListener);
@ -471,13 +469,6 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
private void addConfirmPasswordHandler(final EditText field1, final EditText field2, final ImageView icon) { private void addConfirmPasswordHandler(final EditText field1, final EditText field2, final ImageView icon) {
TextWatcher passwordListener = new TextWatcher() { TextWatcher passwordListener = new TextWatcher() {
public void afterTextChanged(Editable s) { public void afterTextChanged(Editable s) {
}
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
public void onTextChanged(CharSequence s, int start, int count, int after)
{
confirmPasswordOk = false; confirmPasswordOk = false;
if (field1.getText().toString().equals(field2.getText().toString())) { if (field1.getText().toString().equals(field2.getText().toString())) {
confirmPasswordOk = true; confirmPasswordOk = true;
@ -490,9 +481,12 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
displayError(confirmPasswordOk, passwordConfirmError, passwordConfirmEdit, getString(R.string.wizard_passwords_unmatched)); displayError(confirmPasswordOk, passwordConfirmError, passwordConfirmEdit, getString(R.string.wizard_passwords_unmatched));
} }
createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk); createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk);
} }
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
public void onTextChanged(CharSequence s, int start, int count, int after) {}
}; };
field1.addTextChangedListener(passwordListener); field1.addTextChangedListener(passwordListener);
field2.addTextChangedListener(passwordListener); field2.addTextChangedListener(passwordListener);
@ -550,7 +544,7 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
@Override @Override
public void onAccountCreatorIsAccountUsed(LinphoneAccountCreator accountCreator, final Status status) { public void onAccountCreatorIsAccountUsed(LinphoneAccountCreator accountCreator, final Status status) {
if(getResources().getBoolean(R.bool.isTablet) || useEmail.isChecked()){ if(getResources().getBoolean(R.bool.isTablet) || useEmail.isChecked() || !getResources().getBoolean(R.bool.use_phone_number_validation)){
if (status.equals(Status.AccountExist) || status.equals(Status.AccountExistWithAlias)) { if (status.equals(Status.AccountExist) || status.equals(Status.AccountExistWithAlias)) {
usernameOk = false; usernameOk = false;
displayError(usernameOk, usernameError, usernameEdit, errorForStatus(status)); displayError(usernameOk, usernameError, usernameEdit, errorForStatus(status));