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

Fixing some bugs on Assistant

Browse source 
Update application version
Update linphone
This commit is contained in:
Erwan Croze 2017-01-04 15:43:36 +01:00
parent 1fb3e03ada
commit 822367b271
6 changed files with 39 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
AndroidManifest.xml
View file

@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.linphone"
android:installLocation="auto"
android:versionCode="3214"
android:versionName="3.2.1">
android:versionCode="3220"
android:versionName="3.2.2">
<uses-sdk
android:minSdkVersion="14"

3
src/org/linphone/assistant/CreateAccountActivationFragment.java
View file

@ -97,6 +97,9 @@ public class CreateAccountActivationFragment extends Fragment implements OnClick
@Override
public void onAccountCreatorIsAccountActivated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
if (AssistantActivity.instance() == null) {
return;
}
if (status.equals(LinphoneAccountCreator.Status.AccountNotActivated)) {
Toast.makeText(getActivity(), getString(R.string.assistant_account_not_validated), Toast.LENGTH_LONG).show();
} else if (status.equals(LinphoneAccountCreator.Status.AccountActivated)) {

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

@ -142,6 +142,9 @@ public class CreateAccountCodeActivationFragment extends Fragment implements Lin
@Override
public void onAccountCreatorAccountActivated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
if (AssistantActivity.instance() == null) {
return;
}
if (status.equals(Status.AccountActivated)) {
checkAccount.setEnabled(true);
if (accountCreator.getUsername() != null) {
@ -174,6 +177,9 @@ public class CreateAccountCodeActivationFragment extends Fragment implements Lin
@Override
public void onAccountCreatorPhoneNumberLinkActivated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
if (AssistantActivity.instance() == null) {
return;
}
if(status.equals(LinphoneAccountCreator.Status.Ok)){
LinphonePreferences.instance().setLinkPopupTime("");
AssistantActivity.instance().hideKeyboard();

15
src/org/linphone/assistant/CreateAccountFragment.java
View file

@ -626,6 +626,9 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
@Override
public void onAccountCreatorAccountLinkedWithPhoneNumber(LinphoneAccountCreator accountCreator, Status status) {
if (AssistantActivity.instance() == null) {
return;
}
if (status.equals(Status.Ok)) {
AssistantActivity.instance().displayAssistantCodeConfirm(getUsername()
, phoneNumberEdit.getText().toString()
@ -635,6 +638,9 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
@Override
public void onAccountCreatorPhoneNumberLinkActivated(LinphoneAccountCreator accountCreator, Status status) {
if (AssistantActivity.instance() == null) {
return;
}
if (status.equals(Status.Ok)) {
AssistantActivity.instance().displayAssistantCodeConfirm(getUsername()
, phoneNumberEdit.getText().toString()
@ -644,6 +650,9 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
@Override
public void onAccountCreatorIsAccountActivated(LinphoneAccountCreator accountCreator, Status status) {
if (AssistantActivity.instance() == null) {
return;
}
if (status.equals(Status.AccountNotActivated)) {
if (getResources().getBoolean(R.bool.isTablet)
|| !getResources().getBoolean(R.bool.use_phone_number_validation)) {
@ -660,6 +669,9 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
@Override
public void onAccountCreatorPhoneAccountRecovered(LinphoneAccountCreator accountCreator, Status status) {
if (AssistantActivity.instance() == null) {
return;
}
if (status.equals(Status.Ok)) {
AssistantActivity.instance().displayAssistantCodeConfirm(getUsername()
, dialCode.getText().toString() , phoneNumberEdit.getText().toString(), false);
@ -677,6 +689,9 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
@Override
public void onAccountCreatorIsPhoneNumberUsed(LinphoneAccountCreator ac, Status status) {
if (AssistantActivity.instance() == null) {
return;
}
if (status.equals(Status.PhoneNumberUsedAccount) || status.equals(Status.PhoneNumberUsedAlias)) {
if (accountCreator.getPhoneNumber() != null && accountCreator.getUsername() != null
&& accountCreator.getPhoneNumber().compareTo(accountCreator.getUsername()) == 0) {

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

@ -321,6 +321,10 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On
@Override
public void onAccountCreatorIsAccountUsed(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
if (AssistantActivity.instance() == null) {
apply.setEnabled(true);
return;
}
if (status.equals(LinphoneAccountCreator.Status.AccountExist) || status.equals(LinphoneAccountCreator.Status.AccountExistWithAlias)) {
String phone = accountCreator.getPhoneNumber();
String dial = null;
@ -355,6 +359,10 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On
@Override
public void onAccountCreatorPhoneAccountRecovered(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
if (AssistantActivity.instance() == null) {
apply.setEnabled(true);
return;
}
if (status.equals(LinphoneAccountCreator.Status.ErrorServer)) {
LinphoneUtils.displayErrorAlert(LinphoneUtils.errorForStatus(LinphoneAccountCreator.Status.Failed), AssistantActivity.instance());
apply.setEnabled(true);
@ -369,6 +377,10 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On
@Override
public void onAccountCreatorIsPhoneNumberUsed(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
if (AssistantActivity.instance() == null) {
apply.setEnabled(true);
return;
}
if (status.equals(LinphoneAccountCreator.Status.PhoneNumberUsedAccount) || status.equals(LinphoneAccountCreator.Status.PhoneNumberUsedAlias)) {
accountCreator.recoverPhoneAccount();
} else {

2
submodules/linphone

@ -1 +1 @@
Subproject commit 19007584c4d7e93b18b525285de24da209e27afe
Subproject commit 0a88099a5a52fdf6f97a405d51b1ee48edde16e9