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

Fix account list in status bar when at least one is disabled

Browse source
This commit is contained in:
Sylvain Berfini 2013-01-31 11:53:44 +01:00
parent e3bb3b72e1
commit fedf522fcd
1 changed files with 53 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -540,8 +540,30 @@ public class StatusFragment extends Fragment {
CheckBox checkBox = (CheckBox) v; CheckBox checkBox = (CheckBox) v;
if (checkBox.isChecked()) { if (checkBox.isChecked()) {
SharedPreferences.Editor editor = prefs.edit(); SharedPreferences.Editor editor = prefs.edit();
int selectedPosition = (Integer) checkBox.getTag(); String tag = (String) checkBox.getTag();
editor.putInt(getString(R.string.pref_default_account_key), selectedPosition); 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(); editor.commit();
for (CheckBox cb : checkboxes) { for (CheckBox cb : checkboxes) {
@ -552,7 +574,7 @@ public class StatusFragment extends Fragment {
checkBox.setEnabled(false); checkBox.setEnabled(false);
LinphoneCore lc = LinphoneManager.getLc(); LinphoneCore lc = LinphoneManager.getLc();
lc.setDefaultProxyConfig((LinphoneProxyConfig) getItem(selectedPosition)); lc.setDefaultProxyConfig((LinphoneProxyConfig) getItem(accountPosition));
if (lc.isNetworkReachable()) { if (lc.isNetworkReachable()) {
lc.refreshRegisters(); lc.refreshRegisters();
} }
@ -602,17 +624,40 @@ public class StatusFragment extends Fragment {
CheckBox isDefault = (CheckBox) view.findViewById(R.id.Default); CheckBox isDefault = (CheckBox) view.findViewById(R.id.Default);
checkboxes.add(isDefault); checkboxes.add(isDefault);
isDefault.setTag(position); isDefault.setTag(sipAddress + ":" + position);
isDefault.setChecked(false); isDefault.setChecked(false);
isDefault.setEnabled(true); isDefault.setEnabled(true);
if (prefs != null && prefs.getInt(getString(R.string.pref_default_account_key), 0) == position) { if (prefs != null) {
isDefault.setChecked(true); int nbAccounts = prefs.getInt(getString(R.string.pref_extra_accounts), 0);
isDefault.setEnabled(false); int accountIndex = 0;
status.setImageResource(getStatusIconResource(lpc.getState(), true)); 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 { } else {
status.setImageResource(getStatusIconResource(lpc.getState(), false)); status.setImageResource(getStatusIconResource(lpc.getState(), false));
} }
isDefault.setOnClickListener(defaultListener); isDefault.setOnClickListener(defaultListener);
return view; return view;