From 4235b26bb5a1a366f9992b5d27211df5887f6e5d Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Tue, 4 Sep 2012 18:20:49 +0200
Subject: [PATCH] Fix default account issue

---
 src/org/linphone/AccountPreferencesFragment.java | 10 +++++-----
 src/org/linphone/LinphoneManager.java            |  2 +-
 src/org/linphone/StatusFragment.java             |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/org/linphone/AccountPreferencesFragment.java b/src/org/linphone/AccountPreferencesFragment.java
index e5b4f3abe..9b59d29ab 100644
--- a/src/org/linphone/AccountPreferencesFragment.java
+++ b/src/org/linphone/AccountPreferencesFragment.java
@@ -96,12 +96,12 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
     	outboundProxy.setKey(getString(R.string.pref_enable_outbound_proxy_key) + key);
    
     	final Preference disable = advanced.getPreference(2);
-    	disable.setEnabled(prefs.getInt(getString(R.string.pref_default_account), 0) != n);
+    	disable.setEnabled(prefs.getInt(getString(R.string.pref_default_account_key), 0) != n);
     	Compatibility.setPreferenceChecked(disable, prefs.getBoolean(getString(R.string.pref_disable_account_key) + key, false));
     	disable.setKey(getString(R.string.pref_disable_account_key) + key);
 
     	final Preference delete = advanced.getPreference(4);
-    	delete.setEnabled(prefs.getInt(getString(R.string.pref_default_account), 0) != n);
+    	delete.setEnabled(prefs.getInt(getString(R.string.pref_default_account_key), 0) != n);
     	delete.setOnPreferenceClickListener(new OnPreferenceClickListener() {
 	        public boolean onPreferenceClick(Preference preference) {
 	        	int nbAccounts = prefs.getInt(getString(R.string.pref_extra_accounts), 1);
@@ -124,9 +124,9 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
         		editor.putBoolean(getString(R.string.pref_enable_outbound_proxy_key) + getAccountNumber(lastAccount), false);
         		editor.putBoolean(getString(R.string.pref_disable_account_key) + getAccountNumber(lastAccount), false);
         		
-        		int defaultAccount = prefs.getInt(getString(R.string.pref_default_account), 0);
+        		int defaultAccount = prefs.getInt(getString(R.string.pref_default_account_key), 0);
         		if (defaultAccount > n) {
-        			editor.putInt(getString(R.string.pref_default_account), defaultAccount - 1);
+        			editor.putInt(getString(R.string.pref_default_account_key), defaultAccount - 1);
         		}
         		
         		editor.putInt(getString(R.string.pref_extra_accounts), nbAccounts - 1);
@@ -139,7 +139,7 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
         });
     	
     	Preference mainAccount = advanced.getPreference(3);
-    	Compatibility.setPreferenceChecked(mainAccount, prefs.getInt(getString(R.string.pref_default_account), 0) == n);
+    	Compatibility.setPreferenceChecked(mainAccount, prefs.getInt(getString(R.string.pref_default_account_key), 0) == n);
     	mainAccount.setEnabled(!Compatibility.isPreferenceChecked(mainAccount));
     	mainAccount.setOnPreferenceClickListener(new OnPreferenceClickListener() 
     	{
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 44efc8e87..4c9586707 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -581,7 +581,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			if (getPrefBoolean(getString(R.string.pref_disable_account_key) + key, false)) {
 				continue;
 			}
-			initAccount(key, i == 0, i == getPrefInt(R.string.pref_default_account, 0));
+			initAccount(key, i == 0, i == getPrefInt(R.string.pref_default_account_key, 0));
 		}
 		
 		LinphoneProxyConfig lDefaultProxyConfig = mLc.getDefaultProxyConfig();
diff --git a/src/org/linphone/StatusFragment.java b/src/org/linphone/StatusFragment.java
index b6878abf4..a790d614d 100644
--- a/src/org/linphone/StatusFragment.java
+++ b/src/org/linphone/StatusFragment.java
@@ -340,7 +340,7 @@ public class StatusFragment extends Fragment {
 				if (checkBox.isChecked()) {
 					SharedPreferences.Editor editor = prefs.edit();
 					int selectedPosition = (Integer) checkBox.getTag();
-					editor.putInt(getString(R.string.pref_default_account), selectedPosition);
+					editor.putInt(getString(R.string.pref_default_account_key), selectedPosition);
 					editor.commit();
 
 					for (CheckBox cb : checkboxes) {
@@ -394,7 +394,7 @@ public class StatusFragment extends Fragment {
 			isDefault.setChecked(false);
 			isDefault.setEnabled(true);
 			
-			if (prefs.getInt(getString(R.string.pref_default_account), 0) == position) {
+			if (prefs.getInt(getString(R.string.pref_default_account_key), 0) == position) {
 				isDefault.setChecked(true);
 				isDefault.setEnabled(false);
 				status.setImageResource(getStatusIconResource(lpc.getState(), true));