From 6b3bff441262b4f3f717a724d837d8952fc8aa3c Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 17 Apr 2019 13:44:27 +0200 Subject: [PATCH] Fixed phone number linphone connection doing nothing + username too short error on tablets while creating account --- .../assistant/CreateAccountFragment.java | 2 +- .../assistant/LinphoneLoginFragment.java | 17 ++++++----------- .../java/org/linphone/utils/LinphoneUtils.java | 1 + 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/org/linphone/assistant/CreateAccountFragment.java b/app/src/main/java/org/linphone/assistant/CreateAccountFragment.java index 3d09a520f..37ac55e16 100644 --- a/app/src/main/java/org/linphone/assistant/CreateAccountFragment.java +++ b/app/src/main/java/org/linphone/assistant/CreateAccountFragment.java @@ -339,7 +339,7 @@ public class CreateAccountFragment extends Fragment addAlias(); } else { if (mUseEmail.isChecked()) mAccountCreator.setPhoneNumber(null, null); - if (!getResources().getBoolean(R.bool.isTablet) || getUsername().length() > 0) { + if (getUsername().length() > 0) { mAccountCreator.isAccountExist(); } else { LinphoneUtils.displayErrorAlert( diff --git a/app/src/main/java/org/linphone/assistant/LinphoneLoginFragment.java b/app/src/main/java/org/linphone/assistant/LinphoneLoginFragment.java index e4029c6af..c58cd133d 100644 --- a/app/src/main/java/org/linphone/assistant/LinphoneLoginFragment.java +++ b/app/src/main/java/org/linphone/assistant/LinphoneLoginFragment.java @@ -58,10 +58,9 @@ public class LinphoneLoginFragment extends Fragment private CheckBox mUseUsername; private LinearLayout mPhoneNumberLayout, mUsernameLayout, mPasswordLayout; private TextView mForgotPassword, mMessagePhoneNumber, mPhoneNumberError; - private Boolean mRecoverAccount; private AccountCreator mAccountCreator; private int mCountryCode; - private String mPhone, mDialcode, mUsername, mPwd; + private String mPhone, mUsername, mPwd; private ImageView mPhoneNumberInfo; @Override @@ -77,8 +76,6 @@ public class LinphoneLoginFragment extends Fragment mLogin = view.findViewById(R.id.assistant_username); mLogin.addTextChangedListener(this); - mRecoverAccount = true; - mDialCode = view.findViewById(R.id.dial_code); mPhoneNumberEdit = view.findViewById(R.id.phone_number); @@ -104,7 +101,7 @@ public class LinphoneLoginFragment extends Fragment if (getResources().getBoolean(R.bool.use_phone_number_validation)) { mMessagePhoneNumber.setText(getString(R.string.assistant_create_account_part_1)); mPhone = getArguments().getString("Phone"); - mDialcode = getArguments().getString("Dialcode"); + String prefix = getArguments().getString("Dialcode"); getActivity().getApplicationContext(); // Automatically get the country code from the mPhone @@ -148,7 +145,7 @@ public class LinphoneLoginFragment extends Fragment } if (mPhone != null) mPhoneNumberEdit.setText(mPhone); - if (mDialcode != null) mDialCode.setText("+" + mDialcode); + if (prefix != null) mDialCode.setText("+" + prefix); } if (getResources().getBoolean(R.bool.assistant_allow_username)) { @@ -212,6 +209,7 @@ public class LinphoneLoginFragment extends Fragment } private int getPhoneNumberStatus() { + mAccountCreator.setDomain(getString(R.string.default_domain)); return mAccountCreator.setPhoneNumber( mPhoneNumberEdit.getText().toString(), LinphoneUtils.getCountryCode(mDialCode)); } @@ -247,7 +245,6 @@ public class LinphoneLoginFragment extends Fragment @Override public void onResume() { super.onResume(); - mRecoverAccount = mUseUsername == null || !mUseUsername.isChecked(); } @Override @@ -255,7 +252,7 @@ public class LinphoneLoginFragment extends Fragment int id = v.getId(); if (id == R.id.assistant_apply) { mApply.setEnabled(false); - if (mRecoverAccount) { + if (mUseUsername == null || !mUseUsername.isChecked()) { recoverAccount(); } else { linphoneLogIn(); @@ -271,7 +268,7 @@ public class LinphoneLoginFragment extends Fragment } private void recoverAccount() { - if (mPhoneNumberEdit.length() > 0 || mDialCode.length() > 1) { + if (mPhoneNumberEdit.getText().length() > 0 || mDialCode.getText().length() > 1) { int status = getPhoneNumberStatus(); boolean isOk = status == AccountCreator.PhoneNumberStatus.Ok.toInt(); if (isOk) { @@ -333,14 +330,12 @@ public class LinphoneLoginFragment extends Fragment mPhoneNumberEdit.setVisibility(EditText.GONE); mPhoneNumberLayout.setVisibility(LinearLayout.GONE); mMessagePhoneNumber.setText(getString(R.string.assistant_linphone_login_desc)); - mRecoverAccount = false; } else { mUsernameLayout.setVisibility(View.GONE); mPasswordLayout.setVisibility(View.GONE); mPhoneNumberEdit.setVisibility(EditText.VISIBLE); mPhoneNumberLayout.setVisibility(LinearLayout.VISIBLE); mMessagePhoneNumber.setText(getString(R.string.assistant_create_account_part_1)); - mRecoverAccount = true; } } } diff --git a/app/src/main/java/org/linphone/utils/LinphoneUtils.java b/app/src/main/java/org/linphone/utils/LinphoneUtils.java index b732e0eb8..70d4fe5cd 100644 --- a/app/src/main/java/org/linphone/utils/LinphoneUtils.java +++ b/app/src/main/java/org/linphone/utils/LinphoneUtils.java @@ -385,6 +385,7 @@ public final class LinphoneUtils { public static String errorForStatus(AccountCreator.Status status) { Context ctxt = getContext(); + Log.e("Status error " + status.name()); if (ctxt != null) { if (status.equals(AccountCreator.Status.RequestFailed)) return ctxt.getString(R.string.request_failed);