From fedf522fcdd54eb8575e06ee45da9f74a98d42d0 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 31 Jan 2013 11:53:44 +0100
Subject: [PATCH] Fix account list in status bar when at least one is disabled

---
 src/org/linphone/StatusFragment.java | 61 ++++++++++++++++++++++++----
 1 file changed, 53 insertions(+), 8 deletions(-)

diff --git a/src/org/linphone/StatusFragment.java b/src/org/linphone/StatusFragment.java
index 52f7d94a1..8f27c5e3b 100644
--- a/src/org/linphone/StatusFragment.java
+++ b/src/org/linphone/StatusFragment.java
@@ -540,8 +540,30 @@ public class StatusFragment extends Fragment {
 				CheckBox checkBox = (CheckBox) v;
 				if (checkBox.isChecked()) {
 					SharedPreferences.Editor editor = prefs.edit();
-					int selectedPosition = (Integer) checkBox.getTag();
-					editor.putInt(getString(R.string.pref_default_account_key), selectedPosition);
+					String tag = (String) checkBox.getTag();
+					String sipAddress = tag.split(":")[0];
+					int accountPosition = Integer.parseInt(tag.split(":")[1]);
+					
+					int nbAccounts = prefs.getInt(getString(R.string.pref_extra_accounts), 0);
+					int accountIndex = 0;
+					for (int i = 0; i < nbAccounts; i++)
+					{
+						String keyUsername = getString(R.string.pref_username_key);
+						String keyDomain = getString(R.string.pref_domain_key);
+						if (i > 0) {
+							keyUsername += i + "";
+							keyDomain += i + "";
+						}
+						String username = prefs.getString(keyUsername, "");
+						String domain = prefs.getString(keyDomain, "");
+						String identity = username + "@" + domain;
+						if (identity.equals(sipAddress)) {
+							accountIndex = i;
+							break;
+						}
+					}
+					
+					editor.putInt(getString(R.string.pref_default_account_key), accountIndex);
 					editor.commit();
 
 					for (CheckBox cb : checkboxes) {
@@ -552,7 +574,7 @@ public class StatusFragment extends Fragment {
 					checkBox.setEnabled(false);
 					
 					LinphoneCore lc = LinphoneManager.getLc();
-					lc.setDefaultProxyConfig((LinphoneProxyConfig) getItem(selectedPosition));
+					lc.setDefaultProxyConfig((LinphoneProxyConfig) getItem(accountPosition));
 					if (lc.isNetworkReachable()) {
 						lc.refreshRegisters();
 					}
@@ -602,17 +624,40 @@ public class StatusFragment extends Fragment {
 			CheckBox isDefault = (CheckBox) view.findViewById(R.id.Default);
 			checkboxes.add(isDefault);
 			
-			isDefault.setTag(position);
+			isDefault.setTag(sipAddress + ":" + position);
 			isDefault.setChecked(false);
 			isDefault.setEnabled(true);
 			
-			if (prefs != null && prefs.getInt(getString(R.string.pref_default_account_key), 0) == position) {
-				isDefault.setChecked(true);
-				isDefault.setEnabled(false);
-				status.setImageResource(getStatusIconResource(lpc.getState(), true));
+			if (prefs != null) {
+				int nbAccounts = prefs.getInt(getString(R.string.pref_extra_accounts), 0);
+				int accountIndex = 0;
+				for (int i = 0; i < nbAccounts; i++)
+				{
+					String keyUsername = getString(R.string.pref_username_key);
+					String keyDomain = getString(R.string.pref_domain_key);
+					if (i > 0) {
+						keyUsername += i + "";
+						keyDomain += i + "";
+					}
+					String username = prefs.getString(keyUsername, "");
+					String domain = prefs.getString(keyDomain, "");
+					String id = username + "@" + domain;
+					if (id.equals(sipAddress)) {
+						accountIndex = i;
+						break;
+					}
+				}
+				if (prefs.getInt(getString(R.string.pref_default_account_key), 0) == accountIndex) {
+					isDefault.setChecked(true);
+					isDefault.setEnabled(false);
+					status.setImageResource(getStatusIconResource(lpc.getState(), true));
+				} else {
+					status.setImageResource(getStatusIconResource(lpc.getState(), false));
+				}
 			} else {
 				status.setImageResource(getStatusIconResource(lpc.getState(), false));
 			}
+			
 			isDefault.setOnClickListener(defaultListener);
 			
 			return view;