Fix echo cancellation when creating a new account
This commit is contained in:
parent
375b7aadda
commit
9e34b10b5c
7 changed files with 15 additions and 9 deletions
BIN
res/drawable-xhdpi/resizable_assistant_button_disabled.9.png
Normal file
BIN
res/drawable-xhdpi/resizable_assistant_button_disabled.9.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 419 B |
|
@ -3,7 +3,7 @@
|
||||||
<item android:state_pressed="true"
|
<item android:state_pressed="true"
|
||||||
android:drawable="@drawable/resizable_assistant_button_over" />
|
android:drawable="@drawable/resizable_assistant_button_over" />
|
||||||
<item android:state_enabled="false"
|
<item android:state_enabled="false"
|
||||||
android:drawable="@drawable/resizable_cancel_button" />
|
android:drawable="@drawable/resizable_assistant_button_disabled" />
|
||||||
<item
|
<item
|
||||||
android:drawable="@drawable/resizable_assistant_button" />
|
android:drawable="@drawable/resizable_assistant_button" />
|
||||||
</selector>
|
</selector>
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
android:id="@+id/assistant_check"
|
android:id="@+id/assistant_check"
|
||||||
android:text="@string/assistant_finish"
|
android:text="@string/assistant_finish"
|
||||||
android:background="@drawable/assistant_button"
|
android:background="@drawable/assistant_button"
|
||||||
|
android:textColor="@drawable/assistant_button_text_color"
|
||||||
style="@style/font8"
|
style="@style/font8"
|
||||||
android:contentDescription="@string/content_description_valid"
|
android:contentDescription="@string/content_description_valid"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
|
|
@ -47,6 +47,7 @@
|
||||||
<string name="welcome">Bienvenue</string>
|
<string name="welcome">Bienvenue</string>
|
||||||
<string name="assistant">Assistant</string>
|
<string name="assistant">Assistant</string>
|
||||||
<string name="assistant_create_account">Créer un compte</string>
|
<string name="assistant_create_account">Créer un compte</string>
|
||||||
|
<string name="assistant_finish">Terminer la configuration</string>
|
||||||
<string name="assistant_validate_account">Votre compte a été créé. Vérifiez vos emails pour valider votre compte.
|
<string name="assistant_validate_account">Votre compte a été créé. Vérifiez vos emails pour valider votre compte.
|
||||||
Lorsque cela est fait, cliquez sur le bouton pour continuer.</string>
|
Lorsque cela est fait, cliquez sur le bouton pour continuer.</string>
|
||||||
<string name="assistant_welcome_desc">Cet assistant va vous guider pour réaliser des appels à l\'aide d\'un compte SIP.</string>
|
<string name="assistant_welcome_desc">Cet assistant va vous guider pour réaliser des appels à l\'aide d\'un compte SIP.</string>
|
||||||
|
|
|
@ -99,17 +99,20 @@ public class AssistantActivity extends Activity implements OnClickListener {
|
||||||
if(accountCreated && !newAccount){
|
if(accountCreated && !newAccount){
|
||||||
if(address != null && address.asString().equals(cfg.getIdentity()) ) {
|
if(address != null && address.asString().equals(cfg.getIdentity()) ) {
|
||||||
if (state == RegistrationState.RegistrationOk) {
|
if (state == RegistrationState.RegistrationOk) {
|
||||||
|
if(progress != null)
|
||||||
progress.dismiss();
|
progress.dismiss();
|
||||||
if (LinphoneManager.getLc().getDefaultProxyConfig() != null) {
|
if (LinphoneManager.getLc().getDefaultProxyConfig() != null) {
|
||||||
launchEchoCancellerCalibration(true);
|
launchEchoCancellerCalibration(true);
|
||||||
}
|
}
|
||||||
} else if (state == RegistrationState.RegistrationFailed) {
|
} else if (state == RegistrationState.RegistrationFailed) {
|
||||||
|
if(progress != null)
|
||||||
progress.dismiss();
|
progress.dismiss();
|
||||||
if(dialog == null || !dialog.isShowing()) {
|
if(dialog == null || !dialog.isShowing()) {
|
||||||
dialog = createErrorDialog(cfg, smessage);
|
dialog = createErrorDialog(cfg, smessage);
|
||||||
dialog.show();
|
dialog.show();
|
||||||
}
|
}
|
||||||
} else if(!(state == RegistrationState.RegistrationProgress)) {
|
} else if(!(state == RegistrationState.RegistrationProgress)) {
|
||||||
|
if(progress != null)
|
||||||
progress.dismiss();
|
progress.dismiss();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -379,7 +382,7 @@ public class AssistantActivity extends Activity implements OnClickListener {
|
||||||
.setAvpfRRInterval(5);
|
.setAvpfRRInterval(5);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(transport != null){
|
if(transport != null) {
|
||||||
builder.setTransport(transport);
|
builder.setTransport(transport);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -431,7 +434,6 @@ public class AssistantActivity extends Activity implements OnClickListener {
|
||||||
|
|
||||||
public void isAccountVerified(String username) {
|
public void isAccountVerified(String username) {
|
||||||
Toast.makeText(this, getString(R.string.assistant_account_validated), Toast.LENGTH_LONG).show();
|
Toast.makeText(this, getString(R.string.assistant_account_validated), Toast.LENGTH_LONG).show();
|
||||||
LinphoneManager.getLcIfManagerNotDestroyedOrNull().refreshRegisters();
|
|
||||||
launchEchoCancellerCalibration(true);
|
launchEchoCancellerCalibration(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -40,6 +40,7 @@ import de.timroes.axmlrpc.XMLRPCServerException;
|
||||||
public class CreateAccountActivationFragment extends Fragment {
|
public class CreateAccountActivationFragment extends Fragment {
|
||||||
private String username, password, domain;
|
private String username, password, domain;
|
||||||
private Handler mHandler = new Handler();
|
private Handler mHandler = new Handler();
|
||||||
|
private Button checkAccount;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
|
@ -49,10 +50,11 @@ public class CreateAccountActivationFragment extends Fragment {
|
||||||
username = getArguments().getString("Username");
|
username = getArguments().getString("Username");
|
||||||
password = getArguments().getString("Password");
|
password = getArguments().getString("Password");
|
||||||
|
|
||||||
Button checkAccount = (Button) view.findViewById(R.id.assistant_check);
|
checkAccount = (Button) view.findViewById(R.id.assistant_check);
|
||||||
checkAccount.setOnClickListener(new OnClickListener() {
|
checkAccount.setOnClickListener(new OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
|
checkAccount.setEnabled(false);
|
||||||
isAccountVerified(username);
|
isAccountVerified(username);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -73,12 +75,14 @@ public class CreateAccountActivationFragment extends Fragment {
|
||||||
XMLRPCCallback listener = new XMLRPCCallback() {
|
XMLRPCCallback listener = new XMLRPCCallback() {
|
||||||
Runnable runNotOk = new Runnable() {
|
Runnable runNotOk = new Runnable() {
|
||||||
public void run() {
|
public void run() {
|
||||||
|
checkAccount.setEnabled(true);
|
||||||
Toast.makeText(getActivity(), getString(R.string.assistant_account_not_validated), Toast.LENGTH_LONG).show();
|
Toast.makeText(getActivity(), getString(R.string.assistant_account_not_validated), Toast.LENGTH_LONG).show();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
Runnable runOk = new Runnable() {
|
Runnable runOk = new Runnable() {
|
||||||
public void run() {
|
public void run() {
|
||||||
|
checkAccount.setEnabled(true);
|
||||||
AssistantActivity.instance().saveCreatedAccount(username,password,null, getString(R.string.default_domain),null);
|
AssistantActivity.instance().saveCreatedAccount(username,password,null, getString(R.string.default_domain),null);
|
||||||
AssistantActivity.instance().isAccountVerified(username);
|
AssistantActivity.instance().isAccountVerified(username);
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,10 +29,8 @@ import org.linphone.core.LinphoneProxyConfig;
|
||||||
|
|
||||||
import android.accounts.Account;
|
import android.accounts.Account;
|
||||||
import android.accounts.AccountManager;
|
import android.accounts.AccountManager;
|
||||||
import android.app.AlertDialog;
|
|
||||||
import android.app.Fragment;
|
import android.app.Fragment;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.DialogInterface;
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.Handler;
|
import android.os.Handler;
|
||||||
import android.text.Editable;
|
import android.text.Editable;
|
||||||
|
|
Loading…
Reference in a new issue