From 3aa9f829c9045401475a2b1e4d6d7d0d552bacad Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Fri, 13 Nov 2015 16:47:48 +0100
Subject: [PATCH] Fix account delete in side menu and status bar

---
 res/layout/contact_control_row.xml            |  4 +-
 .../linphone/AccountPreferencesFragment.java  |  2 +
 src/org/linphone/ContactDetailsFragment.java  | 45 ++++++++++++-------
 src/org/linphone/LinphoneActivity.java        | 11 +++--
 src/org/linphone/LinphonePreferences.java     |  5 ++-
 src/org/linphone/StatusFragment.java          |  7 +++
 6 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/res/layout/contact_control_row.xml b/res/layout/contact_control_row.xml
index 9d91776f4..360344f79 100644
--- a/res/layout/contact_control_row.xml
+++ b/res/layout/contact_control_row.xml
@@ -46,7 +46,7 @@
 			android:orientation="horizontal">
 
 			<ImageView
-				android:id="@+id/call"
+				android:id="@+id/contact_call"
 				android:src="@drawable/call_start_body_default"
 				android:contentDescription="@string/content_description_dial_back"
 				android:layout_width="60dp"
@@ -56,7 +56,7 @@
 				android:layout_centerInParent="true"/>
 
 			<ImageView
-				android:id="@+id/chat"
+				android:id="@+id/contact_chat"
 				android:src="@drawable/chat_start_body_default"
 				android:contentDescription="@string/content_description_chat"
 				android:layout_width="60dp"
diff --git a/src/org/linphone/AccountPreferencesFragment.java b/src/org/linphone/AccountPreferencesFragment.java
index e95ab392a..d6822542b 100644
--- a/src/org/linphone/AccountPreferencesFragment.java
+++ b/src/org/linphone/AccountPreferencesFragment.java
@@ -343,6 +343,7 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
     	delete.setOnPreferenceClickListener(new OnPreferenceClickListener() {
 	        public boolean onPreferenceClick(Preference preference) {
 	        	mPrefs.deleteAccount(n);
+				LinphoneActivity.instance().refreshAccounts();
 	        	LinphoneActivity.instance().displaySettings();
 	        	return true;
 	        }
@@ -447,6 +448,7 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
     	delete.setOnPreferenceClickListener(new OnPreferenceClickListener() {
 	        public boolean onPreferenceClick(Preference preference) {
 	        	mPrefs.deleteAccount(n);
+				LinphoneActivity.instance().refreshAccounts();
 	        	LinphoneActivity.instance().displaySettings();
 	        	return true;
 	        }
diff --git a/src/org/linphone/ContactDetailsFragment.java b/src/org/linphone/ContactDetailsFragment.java
index 8a6921306..242248a33 100644
--- a/src/org/linphone/ContactDetailsFragment.java
+++ b/src/org/linphone/ContactDetailsFragment.java
@@ -27,6 +27,7 @@ import org.linphone.mediastream.Log;
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.ContentProviderOperation;
 import android.content.DialogInterface;
 import android.graphics.BitmapFactory;
@@ -37,6 +38,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TableLayout;
 import android.widget.TextView;
@@ -152,13 +154,13 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 			tv.setSelected(true);
 			
 			if (!displayChatAddressOnly) {
-				v.findViewById(R.id.call).setOnClickListener(dialListener);
-				v.findViewById(R.id.call).setTag(displayednumberOrAddress);
+				v.findViewById(R.id.contact_call).setOnClickListener(dialListener);
+				v.findViewById(R.id.contact_call).setTag(displayednumberOrAddress);
 			} else {
-				v.findViewById(R.id.call).setVisibility(View.GONE);
+				v.findViewById(R.id.contact_call).setVisibility(View.GONE);
 			}
 
-			v.findViewById(R.id.chat).setOnClickListener(chatListener);
+			v.findViewById(R.id.contact_chat).setOnClickListener(chatListener);
 			LinphoneProxyConfig lpc = LinphoneManager.getLc().getDefaultProxyConfig();
 			if (lpc != null) {
 				displayednumberOrAddress = lpc.normalizePhoneNumber(displayednumberOrAddress);
@@ -170,9 +172,9 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 				if (!numberOrAddress.contains("@")) {
 					tag = numberOrAddress + "@" + lpc.getDomain();
 				}
-				v.findViewById(R.id.chat).setTag(tag);
+				v.findViewById(R.id.contact_chat).setTag(tag);
 			} else {
-				v.findViewById(R.id.chat).setTag(numberOrAddress);
+				v.findViewById(R.id.contact_chat).setTag(numberOrAddress);
 			}
 			
 			final String finalNumberOrAddress = numberOrAddress;
@@ -205,7 +207,7 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 			}*/
 			
 			if (getResources().getBoolean(R.bool.disable_chat)) {
-				v.findViewById(R.id.chat).setVisibility(View.GONE);
+				v.findViewById(R.id.contact_chat).setVisibility(View.GONE);
 			}
 			
 			controls.addView(v);
@@ -236,17 +238,28 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 		if (id == R.id.editContact) {
 			LinphoneActivity.instance().editContact(contact);
 		} else if (id == R.id.deleteContact) {
-			AlertDialog.Builder alertDialog = new AlertDialog.Builder(getActivity());
-			alertDialog.setMessage(getString(R.string.delete_contact_dialog));
-			alertDialog.setPositiveButton(getString(R.string.button_ok),new DialogInterface.OnClickListener() {
-				public void onClick(DialogInterface dialog, int which) {
-				deleteExistingContact();
-				ContactsManager.getInstance().removeContactFromLists(getActivity().getContentResolver(),contact);
-				LinphoneActivity.instance().displayContacts(false);
+			final Dialog dialog = LinphoneActivity.instance().displayDialog(getString(R.string.delete_text));
+			Button delete = (Button) dialog.findViewById(R.id.delete);
+			Button cancel = (Button) dialog.findViewById(R.id.cancel);
+
+			delete.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					deleteExistingContact();
+					ContactsManager.getInstance().removeContactFromLists(getActivity().getContentResolver(), contact);
+					LinphoneActivity.instance().displayContacts(false);
+					dialog.dismiss();
 				}
 			});
-			alertDialog.setNegativeButton(getString(R.string.button_cancel),null);
-			alertDialog.show();
+
+			cancel.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					dialog.dismiss();
+
+				}
+			});
+			dialog.show();
 		}
 	}
 	
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index d72d3de39..1bb86a746 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -207,11 +207,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 					}
 				}
 
-				if(proxy == lc.getDefaultProxyConfig()){
-					displayMainAccount();
-				} else {
-					refreshAccounts();
-				}
+				refreshAccounts();
 
 				if(state.equals(RegistrationState.RegistrationFailed) && newProxyConfig) {
 					newProxyConfig = false;
@@ -1352,6 +1348,8 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		if(proxy == null) {
 			displayName.setText(getString(R.string.no_account));
 			status.setVisibility(View.GONE);
+			address.setText("");
+			statusFragment.resetAccountStatus();
 
 			defaultAccount.setOnClickListener(new OnClickListener() {
 				@Override
@@ -1376,7 +1374,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		}
 	}
 
-	private void refreshAccounts(){
+	public void refreshAccounts(){
 		if(LinphoneManager.getLc().getProxyConfigList().length > 1) {
 			accountsList.setVisibility(View.VISIBLE);
 			accountsList.setAdapter(new AccountsListAdapter());
@@ -1391,6 +1389,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		} else {
 			accountsList.setVisibility(View.GONE);
 		}
+		displayMainAccount();
 	}
 
 	private void initAccounts() {
diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java
index 63892c36f..cc2c384ee 100644
--- a/src/org/linphone/LinphonePreferences.java
+++ b/src/org/linphone/LinphonePreferences.java
@@ -700,13 +700,14 @@ public class LinphonePreferences {
 
 	public void deleteAccount(int n) {
 		final LinphoneProxyConfig proxyCfg = getProxyConfig(n);
-
 		if (proxyCfg != null)
 			getLc().removeProxyConfig(proxyCfg);
 		if (getLc().getProxyConfigList().length != 0) {
 			resetDefaultProxyConfig();
-			getLc().refreshRegisters();
+		} else {
+			getLc().setDefaultProxyConfig(null);
 		}
+		getLc().refreshRegisters();
 	}
 	// End of accounts settings
 
diff --git a/src/org/linphone/StatusFragment.java b/src/org/linphone/StatusFragment.java
index 63ebd4ce6..33301a511 100644
--- a/src/org/linphone/StatusFragment.java
+++ b/src/org/linphone/StatusFragment.java
@@ -204,6 +204,13 @@ public class StatusFragment extends Fragment {
 		}
 	}
 
+	public void resetAccountStatus(){
+		if(LinphoneManager.getLc().getProxyConfigList().length == 0){
+			statusLed.setImageResource(R.drawable.led_disconnected);
+			statusText.setText(getString(R.string.no_account));
+		}
+	}
+
 	public void enableSideMenu(boolean enabled) {
 		menu.setEnabled(enabled);
 	}