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

Fixing order of attributs in login function

Browse source
This commit is contained in:
Erwan Croze 2017-01-20 16:14:06 +01:00
parent 66f0617801
commit c636ad4dd3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org/linphone/assistant/AssistantActivity.java
View file

@ -465,7 +465,7 @@ private static AssistantActivity instance;
return phoneNumberWithCountry; return phoneNumberWithCountry;
} }
public void saveCreatedAccount(String username, String password, String prefix, String ha1, String domain, TransportType transport) { public void saveCreatedAccount(String username, String password, String ha1, String prefix, String domain, TransportType transport) {
if (accountCreated) if (accountCreated)
return; return;

4
src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
View file

@ -148,14 +148,14 @@ public class CreateAccountCodeActivationFragment extends Fragment implements Lin
if (status.equals(Status.AccountActivated)) { if (status.equals(Status.AccountActivated)) {
checkAccount.setEnabled(true); checkAccount.setEnabled(true);
if (accountCreator.getUsername() != null) { if (accountCreator.getUsername() != null) {
AssistantActivity.instance().saveCreatedAccount(accountCreator.getUsername(), null , dialcode, accountCreator.getHa1(), getString(R.string.default_domain), null); AssistantActivity.instance().saveCreatedAccount(accountCreator.getUsername(), null , accountCreator.getHa1(), dialcode, getString(R.string.default_domain), null);
if(!recoverAccount){ if(!recoverAccount){
AssistantActivity.instance().isAccountVerified(accountCreator.getUsername()); AssistantActivity.instance().isAccountVerified(accountCreator.getUsername());
} else { } else {
AssistantActivity.instance().success(); AssistantActivity.instance().success();
} }
} else { } else {
AssistantActivity.instance().saveCreatedAccount(accountCreator.getPhoneNumber(), null, dialcode, accountCreator.getHa1(), getString(R.string.default_domain), null); AssistantActivity.instance().saveCreatedAccount(accountCreator.getPhoneNumber(), null, accountCreator.getHa1(), dialcode, getString(R.string.default_domain), null);
if(!recoverAccount) { if(!recoverAccount) {
AssistantActivity.instance().isAccountVerified(accountCreator.getPhoneNumber()); AssistantActivity.instance().isAccountVerified(accountCreator.getPhoneNumber());
} else { } else {