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

Adding new error msg in assistant

Browse source
This commit is contained in:
Erwan Croze 2016-10-12 15:18:37 +02:00
parent f75de58f3d
commit 29817f91f5
4 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/values/strings.xml
View file

@ -122,6 +122,7 @@
<!-- Status --> <!-- Status -->
<string name="invalid_email">Invalid email</string> <string name="invalid_email">Invalid email</string>
<string name="account_already_exist">Account already exist</string> <string name="account_already_exist">Account already exist</string>
<string name="phone_number_not_exist">This account does not exist</string>
<string name="invalid_username">Invalid username</string> <string name="invalid_username">Invalid username</string>
<string name="invalid_domain">Invalid domain</string> <string name="invalid_domain">Invalid domain</string>
<string name="invalid_route">Invalid route</string> <string name="invalid_route">Invalid route</string>

14
src/org/linphone/LinphoneUtils.java
View file

@ -617,23 +617,27 @@ public final class LinphoneUtils {
return ctxt.getString(R.string.invalid_display_name); return ctxt.getString(R.string.invalid_display_name);
if (status.equals(LinphoneAccountCreator.Status.Failed)) if (status.equals(LinphoneAccountCreator.Status.Failed))
return ctxt.getString(R.string.request_failed); return ctxt.getString(R.string.request_failed);
if (status.equals(LinphoneAccountCreator.Status.ErrorServeur))
return ctxt.getString(R.string.wizard_failed);
if (status.equals(LinphoneAccountCreator.Status.TransportNotSupported)) if (status.equals(LinphoneAccountCreator.Status.TransportNotSupported))
return ctxt.getString(R.string.transport_unsupported); return ctxt.getString(R.string.transport_unsupported);
if (status.equals(LinphoneAccountCreator.Status.AccountExist)) if (status.equals(LinphoneAccountCreator.Status.AccountExist))
return ctxt.getString(R.string.account_already_exist); return ctxt.getString(R.string.account_already_exist);
if (status.equals(LinphoneAccountCreator.Status.AccountExistWithAlias))
return ctxt.getString(R.string.account_already_exist);
if (status.equals(LinphoneAccountCreator.Status.CountryCodeInvalid)) if (status.equals(LinphoneAccountCreator.Status.CountryCodeInvalid))
return ctxt.getString(R.string.country_code_invalid); return ctxt.getString(R.string.country_code_invalid);
if (status.equals(LinphoneAccountCreator.Status.PhoneNumberUsedAccount) if (status.equals(LinphoneAccountCreator.Status.PhoneNumberUsedAccount)
|| status.equals(LinphoneAccountCreator.Status.PhoneNumberUsedAlias)) || status.equals(LinphoneAccountCreator.Status.PhoneNumberUsedAlias)
|| status.equals(LinphoneAccountCreator.Status.AccountExistWithAlias))
return ctxt.getString(R.string.assistant_phone_number_unavailable); return ctxt.getString(R.string.assistant_phone_number_unavailable);
if (status.equals(LinphoneAccountCreator.Status.AccountNotExist))
return ctxt.getString(R.string.assistant_error_bad_credentials);
if (status.equals(LinphoneAccountCreator.Status.PhoneNumberNotUsed))
return ctxt.getString(R.string.phone_number_not_exist);
if (status.equals(LinphoneAccountCreator.Status.PhoneNumberNotUsed) if (status.equals(LinphoneAccountCreator.Status.PhoneNumberNotUsed)
|| status.equals(LinphoneAccountCreator.Status.AccountNotCreated)
|| status.equals(LinphoneAccountCreator.Status.AccountNotExist)
|| status.equals(LinphoneAccountCreator.Status.AccountNotActivated) || status.equals(LinphoneAccountCreator.Status.AccountNotActivated)
|| status.equals(LinphoneAccountCreator.Status.AccountAlreadyActivated) || status.equals(LinphoneAccountCreator.Status.AccountAlreadyActivated)
|| status.equals(LinphoneAccountCreator.Status.AccountActivated) || status.equals(LinphoneAccountCreator.Status.AccountActivated)
|| status.equals(LinphoneAccountCreator.Status.AccountNotCreated)
|| status.equals(LinphoneAccountCreator.Status.Ok)) || status.equals(LinphoneAccountCreator.Status.Ok))
return ""; return "";
} }

9
src/org/linphone/assistant/LinphoneLoginFragment.java
View file

@ -249,7 +249,7 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On
LinphoneAccountCreator.Status status = getPhoneNumberStatus(); LinphoneAccountCreator.Status status = getPhoneNumberStatus();
boolean isOk = status.equals(LinphoneAccountCreator.Status.Ok); boolean isOk = status.equals(LinphoneAccountCreator.Status.Ok);
if (isOk) { if (isOk) {
accountCreator.recoverPhoneAccount(); accountCreator.isPhoneNumberUsed();
} else { } else {
apply.setEnabled(true); apply.setEnabled(true);
LinphoneUtils.displayErrorAlert(LinphoneUtils.errorForStatus(status), getContext()); LinphoneUtils.displayErrorAlert(LinphoneUtils.errorForStatus(status), getContext());
@ -351,6 +351,11 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On
@Override @Override
public void onAccountCreatorIsPhoneNumberUsed(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) { public void onAccountCreatorIsPhoneNumberUsed(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
if (status.equals(LinphoneAccountCreator.Status.PhoneNumberUsedAccount) || status.equals(LinphoneAccountCreator.Status.PhoneNumberUsedAlias)) {
accountCreator.recoverPhoneAccount();
} else {
apply.setEnabled(true);
LinphoneUtils.displayErrorAlert(LinphoneUtils.errorForStatus(status), getContext());
}
} }
} }

2
submodules/linphone

@ -1 +1 @@
Subproject commit 3e7b6b90b5f5c70847b55b406221cd27c8ea307f Subproject commit 788f6cc4fc57b99d44cfde041623dfe781bf0251