diff --git a/res/layout/assistant_account_creation_email_activation.xml b/res/layout/assistant_account_creation_email_activation.xml index f3d795e41..a2fcc8b53 100644 --- a/res/layout/assistant_account_creation_email_activation.xml +++ b/res/layout/assistant_account_creation_email_activation.xml @@ -17,13 +17,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"/> - - Use SIP account Fetch remote configuration Please confirm your country code and enter your phone number - We have sent you a SMS with a validation code.\n\nTo complete your phone number verification, please enter the %i digit code below:\n + We have sent you a SMS with a validation code.\n\nTo complete your phone number verification, please enter the 4 digit code below:\n Display name (optional) Use your Linphone account Configure SIP account diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java index 8db511e99..7970a119b 100644 --- a/src/org/linphone/LinphonePreferences.java +++ b/src/org/linphone/LinphonePreferences.java @@ -209,6 +209,7 @@ public class LinphonePreferences { private String tempDomain; private String tempProxy; private String tempRealm; + private String tempPrefix; private boolean tempOutboundProxy; private String tempContactsParams; private String tempExpire; @@ -301,6 +302,11 @@ public class LinphonePreferences { return this; } + public AccountBuilder setPrefix(String prefix) { + tempPrefix = prefix; + return this; + } + public AccountBuilder setQualityReportingEnabled(boolean enable) { tempQualityReportingEnabled = enable; return this; @@ -373,6 +379,11 @@ public class LinphonePreferences { prxCfg.setQualityReportingCollector(tempQualityReportingCollector); prxCfg.setQualityReportingInterval(tempQualityReportingInterval); + if(tempPrefix != null){ + prxCfg.setDialPrefix(tempPrefix); + } + + if(tempRealm != null) prxCfg.setRealm(tempRealm); diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java index 853d67883..97a469a02 100644 --- a/src/org/linphone/assistant/AssistantActivity.java +++ b/src/org/linphone/assistant/AssistantActivity.java @@ -312,31 +312,31 @@ private static AssistantActivity instance; } } - private void logIn(String username, String password, String ha1, String displayName, String domain, TransportType transport, boolean sendEcCalibrationResult) { - saveCreatedAccount(username, password, displayName, ha1, domain, transport); + private void logIn(String username, String password, String ha1, String prefix, String domain, TransportType transport, boolean sendEcCalibrationResult) { + saveCreatedAccount(username, password, ha1, prefix, domain, transport); } - public void checkAccount(String username, String password, String displayName, String domain) { - saveCreatedAccount(username, password, displayName, null, domain, null); + public void checkAccount(String username, String password, String prefix, String domain) { + saveCreatedAccount(username, password, null, prefix, domain, null); } - public void linphoneLogIn(String username, String password, String ha1, String displayName, boolean validate) { + public void linphoneLogIn(String username, String password, String ha1, String prefix, boolean validate) { if (validate) { - checkAccount(username, password, displayName, getString(R.string.default_domain)); + checkAccount(username, password, prefix, getString(R.string.default_domain)); } else { if(accountCreated) { - retryLogin(username, password, displayName, getString(R.string.default_domain), null); + retryLogin(username, password, prefix, getString(R.string.default_domain), null); } else { - logIn(username, password, ha1, displayName, getString(R.string.default_domain), null, true); + logIn(username, password, ha1, prefix, getString(R.string.default_domain), null, true); } } } - public void genericLogIn(String username, String password, String displayName, String domain, TransportType transport) { + public void genericLogIn(String username, String password, String prefix, String domain, TransportType transport) { if (accountCreated) { - retryLogin(username, password, displayName, domain, transport); + retryLogin(username, password, prefix, domain, transport); } else { - logIn(username, password, null, displayName, domain, transport, false); + logIn(username, password, null, prefix, domain, transport, false); } } @@ -400,9 +400,9 @@ private static AssistantActivity instance; back.setVisibility(View.VISIBLE); } - public void retryLogin(String username, String password, String displayName, String domain, TransportType transport) { + public void retryLogin(String username, String password, String prefix, String domain, TransportType transport) { accountCreated = false; - saveCreatedAccount(username, password, displayName, null, domain, transport); + saveCreatedAccount(username, password, null, prefix, domain, transport); } private void launchDownloadCodec() { @@ -427,7 +427,7 @@ private static AssistantActivity instance; return phoneNumberWithCountry; } - public void saveCreatedAccount(String username, String password, String displayName, String ha1, String domain, TransportType transport) { + public void saveCreatedAccount(String username, String password, String prefix, String ha1, String domain, TransportType transport) { if (accountCreated) return; @@ -441,19 +441,16 @@ private static AssistantActivity instance; Log.e(e); } - if(address != null && displayName != null && !displayName.equals("")){ - address.setDisplayName(displayName); - } - - - boolean isMainAccountLinphoneDotOrg = domain.equals(getString(R.string.default_domain)); AccountBuilder builder = new AccountBuilder(LinphoneManager.getLc()) .setUsername(username) .setDomain(domain) - .setDisplayName(displayName) .setHa1(ha1) .setPassword(password); + + if(prefix != null){ + builder.setPrefix(prefix); + } if (isMainAccountLinphoneDotOrg) { if (getResources().getBoolean(R.bool.disable_all_security_features_for_markets)) { diff --git a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java index db3d3e8b1..6dc8a9ba6 100644 --- a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java +++ b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java @@ -129,14 +129,14 @@ public class CreateAccountCodeActivationFragment extends Fragment implements Lin if (status.equals(Status.AccountActivated)) { checkAccount.setEnabled(true); if (accountCreator.getUsername() != null) { - AssistantActivity.instance().saveCreatedAccount(accountCreator.getUsername(), null, null, accountCreator.getHa1(), getString(R.string.default_domain), null); + AssistantActivity.instance().saveCreatedAccount(accountCreator.getUsername(), null , dialcode, accountCreator.getHa1(), getString(R.string.default_domain), null); if(!recoverAccount){ AssistantActivity.instance().isAccountVerified(accountCreator.getUsername()); } else { AssistantActivity.instance().finish(); } } else { - AssistantActivity.instance().saveCreatedAccount(accountCreator.getPhoneNumber(), null, null, accountCreator.getHa1(), getString(R.string.default_domain), null); + AssistantActivity.instance().saveCreatedAccount(accountCreator.getPhoneNumber(), null, dialcode, accountCreator.getHa1(), getString(R.string.default_domain), null); if(!recoverAccount) { AssistantActivity.instance().isAccountVerified(accountCreator.getPhoneNumber()); } else { diff --git a/src/org/linphone/assistant/LoginFragment.java b/src/org/linphone/assistant/LoginFragment.java index f107d2981..1b2d3df51 100644 --- a/src/org/linphone/assistant/LoginFragment.java +++ b/src/org/linphone/assistant/LoginFragment.java @@ -82,7 +82,7 @@ public class LoginFragment extends Fragment implements OnClickListener, TextWatc } } - AssistantActivity.instance().genericLogIn(login.getText().toString(), password.getText().toString(), displayName.getText().toString(), domain.getText().toString(), transport); + AssistantActivity.instance().genericLogIn(login.getText().toString(), password.getText().toString(), null, domain.getText().toString(), transport); } }