From adfa788a73d2c53c55d509f44fb7a47b185b4794 Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Fri, 2 Sep 2016 17:26:09 +0200 Subject: [PATCH] Fix country code chooser --- res/layout/assistant_linphone_login.xml | 6 +++-- res/values/strings.xml | 2 ++ .../linphone/assistant/AssistantActivity.java | 14 +++++++---- .../CreateAccountCodeActivationFragment.java | 23 ++++++++++--------- .../assistant/LinphoneLoginFragment.java | 3 +-- 5 files changed, 28 insertions(+), 20 deletions(-) diff --git a/res/layout/assistant_linphone_login.xml b/res/layout/assistant_linphone_login.xml index 3a130a6f4..2a17a5605 100644 --- a/res/layout/assistant_linphone_login.xml +++ b/res/layout/assistant_linphone_login.xml @@ -73,9 +73,11 @@ android:background="@drawable/resizable_textfield" android:textColor="@color/colorB" android:inputType="phone" + android:text="+" android:layout_marginRight="10dp" - android:layout_width="50dp" - android:layout_height="40dp" + android:gravity="center" + android:layout_width="65dp" + android:layout_height="42dp" android:singleLine="true"/> Conference Link Do you want to link the account %s with your phone number ? + Maybe later the libre SIP client @@ -84,6 +85,7 @@ Echo canceler calibration in progress Enter your login Your account has not been validated yet. + Your account has been validated. Incorrect username or password Do you agree to download OpenH264 Video Codec provided by Cisco Systems, Inc.? diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java index ed0bb2079..e11c3726e 100644 --- a/src/org/linphone/assistant/AssistantActivity.java +++ b/src/org/linphone/assistant/AssistantActivity.java @@ -69,6 +69,7 @@ public class AssistantActivity extends Activity implements OnClickListener, Acti private static AssistantActivity instance; private ImageView back, cancel; private AssistantFragmentsEnum currentFragment; + private AssistantFragmentsEnum lastFragment; private AssistantFragmentsEnum firstFragment; private Fragment fragment; private LinphonePreferences mPrefs; @@ -234,14 +235,15 @@ private static AssistantActivity instance; || currentFragment == AssistantFragmentsEnum.LINPHONE_LOGIN || currentFragment == AssistantFragmentsEnum.CREATE_ACCOUNT || currentFragment == AssistantFragmentsEnum.REMOTE_PROVISIONING) { - WelcomeFragment fragment = new WelcomeFragment(); - changeFragment(fragment); - currentFragment = AssistantFragmentsEnum.WELCOME; - back.setVisibility(View.INVISIBLE); + displayMenu(); } else if (currentFragment == AssistantFragmentsEnum.WELCOME) { finish(); } else if (currentFragment == AssistantFragmentsEnum.COUNTRY_CHOOSER){ - displayCreateAccount(); + if(lastFragment.equals(AssistantFragmentsEnum.LINPHONE_LOGIN)){ + displayLoginLinphone(); + } else { + displayCreateAccount(); + } } } @@ -344,6 +346,7 @@ private static AssistantActivity instance; public void displayMenu() { fragment = new WelcomeFragment(); changeFragment(fragment); + country = null; currentFragment = AssistantFragmentsEnum.WELCOME; back.setVisibility(View.INVISIBLE); } @@ -382,6 +385,7 @@ private static AssistantActivity instance; public void displayCountryChooser() { fragment = new CountryListFragment(); changeFragment(fragment); + lastFragment = currentFragment; currentFragment = AssistantFragmentsEnum.COUNTRY_CHOOSER; back.setVisibility(View.VISIBLE); } diff --git a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java index 4c0c00de9..f947f31aa 100644 --- a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java +++ b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java @@ -22,7 +22,6 @@ import android.app.Fragment; import android.os.Bundle; import android.text.Editable; import android.text.TextWatcher; -import org.linphone.mediastream.Log; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; @@ -35,6 +34,7 @@ import org.linphone.LinphoneManager; import org.linphone.LinphonePreferences; import org.linphone.R; import org.linphone.core.LinphoneAccountCreator; +import org.linphone.mediastream.Log; import org.linphone.core.LinphoneAccountCreatorImpl; @@ -126,20 +126,21 @@ public class CreateAccountCodeActivationFragment extends Fragment implements Lin @Override public void onAccountCreatorAccountActivated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) { - if(status.equals(Status.AccountActivated)){ + 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().isAccountVerified(accountCreator.getUsername()); + if (accountCreator.getUsername() != null) { + AssistantActivity.instance().saveCreatedAccount(accountCreator.getUsername(), null, null, accountCreator.getHa1(), getString(R.string.default_domain), null); + if(!recoverAccount) + AssistantActivity.instance().isAccountVerified(accountCreator.getUsername()); } else { - AssistantActivity.instance().saveCreatedAccount(accountCreator.getPhoneNumber(), null , null, accountCreator.getHa1() , getString(R.string.default_domain), null); - AssistantActivity.instance().isAccountVerified(accountCreator.getPhoneNumber()); + AssistantActivity.instance().saveCreatedAccount(accountCreator.getPhoneNumber(), null, null, accountCreator.getHa1(), getString(R.string.default_domain), null); + if(!recoverAccount) + AssistantActivity.instance().isAccountVerified(accountCreator.getPhoneNumber()); } - - } else if (status.equals(LinphoneAccountCreator.Status.Failed)){ + } else if (status.equals(LinphoneAccountCreator.Status.Failed)) { Toast.makeText(getActivity(), getString(R.string.wizard_server_unavailable), Toast.LENGTH_LONG).show(); - } else { - Toast.makeText(getActivity(), getString(R.string.assistant_account_not_validated), Toast.LENGTH_LONG).show(); + }else { + Toast.makeText(getActivity(), getString(R.string.assistant_error_confirmation_code), Toast.LENGTH_LONG).show(); } } diff --git a/src/org/linphone/assistant/LinphoneLoginFragment.java b/src/org/linphone/assistant/LinphoneLoginFragment.java index bc20239c0..9423a0523 100644 --- a/src/org/linphone/assistant/LinphoneLoginFragment.java +++ b/src/org/linphone/assistant/LinphoneLoginFragment.java @@ -225,8 +225,7 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On } private void recoverAccount() { - //accountCreator.recoverPhoneAccount(); - AssistantActivity.instance().displayAssistantCodeConfirm(accountCreator.getUsername(), phoneNumberEdit.getText().toString(), getCountryCode(), true); + accountCreator.recoverPhoneAccount(); } @Override