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

Fix default account issue

Browse source
This commit is contained in:
Sylvain Berfini 2012-09-04 18:20:49 +02:00
parent 7c7075ff80
commit 4235b26bb5
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/org/linphone/AccountPreferencesFragment.java
View file

@ -96,12 +96,12 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
outboundProxy.setKey(getString(R.string.pref_enable_outbound_proxy_key) + key); outboundProxy.setKey(getString(R.string.pref_enable_outbound_proxy_key) + key);
final Preference disable = advanced.getPreference(2); 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)); Compatibility.setPreferenceChecked(disable, prefs.getBoolean(getString(R.string.pref_disable_account_key) + key, false));
disable.setKey(getString(R.string.pref_disable_account_key) + key); disable.setKey(getString(R.string.pref_disable_account_key) + key);
final Preference delete = advanced.getPreference(4); 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() { delete.setOnPreferenceClickListener(new OnPreferenceClickListener() {
public boolean onPreferenceClick(Preference preference) { public boolean onPreferenceClick(Preference preference) {
int nbAccounts = prefs.getInt(getString(R.string.pref_extra_accounts), 1); 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_enable_outbound_proxy_key) + getAccountNumber(lastAccount), false);
editor.putBoolean(getString(R.string.pref_disable_account_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) { 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); editor.putInt(getString(R.string.pref_extra_accounts), nbAccounts - 1);
@ -139,7 +139,7 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
}); });
Preference mainAccount = advanced.getPreference(3); 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.setEnabled(!Compatibility.isPreferenceChecked(mainAccount));
mainAccount.setOnPreferenceClickListener(new OnPreferenceClickListener() mainAccount.setOnPreferenceClickListener(new OnPreferenceClickListener()
{ {

2
src/org/linphone/LinphoneManager.java
View file

@ -581,7 +581,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
if (getPrefBoolean(getString(R.string.pref_disable_account_key) + key, false)) { if (getPrefBoolean(getString(R.string.pref_disable_account_key) + key, false)) {
continue; 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(); LinphoneProxyConfig lDefaultProxyConfig = mLc.getDefaultProxyConfig();

4
src/org/linphone/StatusFragment.java
View file

@ -340,7 +340,7 @@ public class StatusFragment extends Fragment {
if (checkBox.isChecked()) { if (checkBox.isChecked()) {
SharedPreferences.Editor editor = prefs.edit(); SharedPreferences.Editor editor = prefs.edit();
int selectedPosition = (Integer) checkBox.getTag(); 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(); editor.commit();
for (CheckBox cb : checkboxes) { for (CheckBox cb : checkboxes) {
@ -394,7 +394,7 @@ public class StatusFragment extends Fragment {
isDefault.setChecked(false); isDefault.setChecked(false);
isDefault.setEnabled(true); 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.setChecked(true);
isDefault.setEnabled(false); isDefault.setEnabled(false);
status.setImageResource(getStatusIconResource(lpc.getState(), true)); status.setImageResource(getStatusIconResource(lpc.getState(), true));