From 9e34b10b5c4e9bf63474f67948d982fe8e1e10fa Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Mon, 29 Feb 2016 16:21:14 +0100 Subject: [PATCH] Fix echo cancellation when creating a new account --- .../resizable_assistant_button_disabled.9.png | Bin 0 -> 419 bytes res/drawable/assistant_button.xml | 2 +- .../assistant_account_creation_activation.xml | 1 + res/values-fr/strings.xml | 1 + src/org/linphone/assistant/AssistantActivity.java | 12 +++++++----- .../CreateAccountActivationFragment.java | 6 +++++- .../linphone/assistant/CreateAccountFragment.java | 2 -- 7 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 res/drawable-xhdpi/resizable_assistant_button_disabled.9.png diff --git a/res/drawable-xhdpi/resizable_assistant_button_disabled.9.png b/res/drawable-xhdpi/resizable_assistant_button_disabled.9.png new file mode 100644 index 0000000000000000000000000000000000000000..df69f9217f0474c43e157024abce87ca4946fadf GIT binary patch literal 419 zcmV;U0bKrxP)Yl&Z`LCNJ#rZ9b(klGMY(f0^cs? z{Y>6_kT0jxzJq^D-Jq1dx~}`?`+g9HAv;otfmn$7CrCobH3))_qX8F09mlzD0>*Lt z@-_J;FOVb&D~f_uRmJMM-bGjoYhvvM;2T(0L1oA+%UIv{jB|dd5CgGf*wy0}C*qHX zVK^Le6k?TSIf3;&?=mYKu4r^ZdN&ZV;=wj N002ovPDHLkV1lJO!4Lod literal 0 HcmV?d00001 diff --git a/res/drawable/assistant_button.xml b/res/drawable/assistant_button.xml index 5c7dfea0d..1d6cbee82 100644 --- a/res/drawable/assistant_button.xml +++ b/res/drawable/assistant_button.xml @@ -3,7 +3,7 @@ + android:drawable="@drawable/resizable_assistant_button_disabled" /> diff --git a/res/layout/assistant_account_creation_activation.xml b/res/layout/assistant_account_creation_activation.xml index f11bba7e8..dbc535b48 100644 --- a/res/layout/assistant_account_creation_activation.xml +++ b/res/layout/assistant_account_creation_activation.xml @@ -33,6 +33,7 @@ android:id="@+id/assistant_check" android:text="@string/assistant_finish" android:background="@drawable/assistant_button" + android:textColor="@drawable/assistant_button_text_color" style="@style/font8" android:contentDescription="@string/content_description_valid" android:layout_width="wrap_content" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 0024676a8..6dbea1728 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -47,6 +47,7 @@ Bienvenue Assistant Créer un compte + Terminer la configuration Votre compte a été créé. Vérifiez vos emails pour valider votre compte. Lorsque cela est fait, cliquez sur le bouton pour continuer. Cet assistant va vous guider pour réaliser des appels à l\'aide d\'un compte SIP. diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java index e56c8e7ca..c4f45c5fd 100644 --- a/src/org/linphone/assistant/AssistantActivity.java +++ b/src/org/linphone/assistant/AssistantActivity.java @@ -99,18 +99,21 @@ public class AssistantActivity extends Activity implements OnClickListener { if(accountCreated && !newAccount){ if(address != null && address.asString().equals(cfg.getIdentity()) ) { if (state == RegistrationState.RegistrationOk) { - progress.dismiss(); + if(progress != null) + progress.dismiss(); if (LinphoneManager.getLc().getDefaultProxyConfig() != null) { launchEchoCancellerCalibration(true); } } else if (state == RegistrationState.RegistrationFailed) { - progress.dismiss(); + if(progress != null) + progress.dismiss(); if(dialog == null || !dialog.isShowing()) { dialog = createErrorDialog(cfg, smessage); dialog.show(); } } else if(!(state == RegistrationState.RegistrationProgress)) { - progress.dismiss(); + if(progress != null) + progress.dismiss(); } } } @@ -379,7 +382,7 @@ public class AssistantActivity extends Activity implements OnClickListener { .setAvpfRRInterval(5); } - if(transport != null){ + if(transport != null) { builder.setTransport(transport); } } @@ -431,7 +434,6 @@ public class AssistantActivity extends Activity implements OnClickListener { public void isAccountVerified(String username) { Toast.makeText(this, getString(R.string.assistant_account_validated), Toast.LENGTH_LONG).show(); - LinphoneManager.getLcIfManagerNotDestroyedOrNull().refreshRegisters(); launchEchoCancellerCalibration(true); } diff --git a/src/org/linphone/assistant/CreateAccountActivationFragment.java b/src/org/linphone/assistant/CreateAccountActivationFragment.java index 719cc7897..1bc6b5934 100644 --- a/src/org/linphone/assistant/CreateAccountActivationFragment.java +++ b/src/org/linphone/assistant/CreateAccountActivationFragment.java @@ -40,6 +40,7 @@ import de.timroes.axmlrpc.XMLRPCServerException; public class CreateAccountActivationFragment extends Fragment { private String username, password, domain; private Handler mHandler = new Handler(); + private Button checkAccount; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, @@ -49,10 +50,11 @@ public class CreateAccountActivationFragment extends Fragment { username = getArguments().getString("Username"); 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() { @Override public void onClick(View v) { + checkAccount.setEnabled(false); isAccountVerified(username); } }); @@ -73,12 +75,14 @@ public class CreateAccountActivationFragment extends Fragment { XMLRPCCallback listener = new XMLRPCCallback() { Runnable runNotOk = new Runnable() { public void run() { + checkAccount.setEnabled(true); Toast.makeText(getActivity(), getString(R.string.assistant_account_not_validated), Toast.LENGTH_LONG).show(); } }; Runnable runOk = new Runnable() { public void run() { + checkAccount.setEnabled(true); AssistantActivity.instance().saveCreatedAccount(username,password,null, getString(R.string.default_domain),null); AssistantActivity.instance().isAccountVerified(username); } diff --git a/src/org/linphone/assistant/CreateAccountFragment.java b/src/org/linphone/assistant/CreateAccountFragment.java index cebf9cbfd..c0c1dd1a2 100644 --- a/src/org/linphone/assistant/CreateAccountFragment.java +++ b/src/org/linphone/assistant/CreateAccountFragment.java @@ -29,10 +29,8 @@ import org.linphone.core.LinphoneProxyConfig; import android.accounts.Account; import android.accounts.AccountManager; -import android.app.AlertDialog; import android.app.Fragment; import android.content.Context; -import android.content.DialogInterface; import android.os.Bundle; import android.os.Handler; import android.text.Editable;