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

Add inprogress popup assistant registration in progress

Browse source
This commit is contained in:
Margaux Clerc 2016-02-22 14:11:26 +01:00
parent 0e3dd22b52
commit a772ab303e
2 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
res/layout/progress_dialog.xml Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:gravity="center"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<ProgressBar
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginBottom="20dp"/>
</LinearLayout>

23
src/org/linphone/assistant/AssistantActivity.java
View file

@ -37,14 +37,19 @@ import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.app.Fragment; import android.app.Fragment;
import android.app.FragmentTransaction; import android.app.FragmentTransaction;
import android.app.ProgressDialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.view.Window;
import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.Toast; import android.widget.Toast;
@ -62,6 +67,7 @@ public class AssistantActivity extends Activity implements OnClickListener {
private LinphoneCoreListenerBase mListener; private LinphoneCoreListenerBase mListener;
private LinphoneAddress address; private LinphoneAddress address;
private StatusFragment status; private StatusFragment status;
private ProgressDialog progress;
private Dialog dialog; private Dialog dialog;
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -93,14 +99,18 @@ 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) {
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) {
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)) {
progress.dismiss();
} }
} }
} }
@ -385,12 +395,25 @@ public class AssistantActivity extends Activity implements OnClickListener {
try { try {
builder.saveNewAccount(); builder.saveNewAccount();
displayRegistrationInProgressDialog();
accountCreated = true; accountCreated = true;
} catch (LinphoneCoreException e) { } catch (LinphoneCoreException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
public void displayRegistrationInProgressDialog(){
if(LinphoneManager.getLc().isNetworkReachable()) {
progress = ProgressDialog.show(this,null,null);
Drawable d = new ColorDrawable(getResources().getColor(R.color.colorE));
d.setAlpha(200);
progress.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
progress.getWindow().setBackgroundDrawable(d);
progress.setContentView(R.layout.progress_dialog);
progress.show();
}
}
public void displayWizardConfirm(String username) { public void displayWizardConfirm(String username) {
CreateAccountActivationFragment fragment = new CreateAccountActivationFragment(); CreateAccountActivationFragment fragment = new CreateAccountActivationFragment();