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

Removed hardcoded strings + better account disable feature

Browse source
This commit is contained in:
Sylvain Berfini 2012-05-16 17:12:44 +02:00
parent b86621a964
commit bf5938cdad
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/values/strings.xml
View file

@ -117,6 +117,8 @@
<string name="no_phone_numbers">No phone numbers found for %s</string> <string name="no_phone_numbers">No phone numbers found for %s</string>
<string name="filter_contacts">Filter contacts</string> <string name="filter_contacts">Filter contacts</string>
<string name="title_numbers_dialog">%s\'s phone numbers</string> <string name="title_numbers_dialog">%s\'s phone numbers</string>
<string name="pref_delete_account">Delete this account</string>
<string name="pref_default_account_title">Use as default</string>
<string name="pref_echo_canceller_calibration">Echo canceller calibration</string> <string name="pref_echo_canceller_calibration">Echo canceller calibration</string>
<string name="pref_echo_limiter">Echo limiter</string> <string name="pref_echo_limiter">Echo limiter</string>
<string name="pref_video_use_front_camera_title">Use front camera</string> <string name="pref_video_use_front_camera_title">Use front camera</string>

12
src/org/linphone/LinphonePreferencesSIPAccountActivity.java
View file

@ -18,8 +18,6 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
import org.linphone.core.Log;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.preference.CheckBoxPreference; import android.preference.CheckBoxPreference;
@ -78,13 +76,13 @@ public class LinphonePreferencesSIPAccountActivity extends PreferenceActivity {
outboundProxy.setPersistent(true); outboundProxy.setPersistent(true);
outboundProxy.setKey(getString(R.string.pref_enable_outbound_proxy_key) + getAccountNumber(n)); outboundProxy.setKey(getString(R.string.pref_enable_outbound_proxy_key) + getAccountNumber(n));
CheckBoxPreference disable = new CheckBoxPreference(this); final CheckBoxPreference disable = new CheckBoxPreference(this);
disable.setTitle(getString(R.string.pref_disable_account)); disable.setTitle(getString(R.string.pref_disable_account));
disable.setPersistent(true); disable.setPersistent(true);
disable.setKey(getString(R.string.pref_disable_account_key) + getAccountNumber(n)); disable.setKey(getString(R.string.pref_disable_account_key) + getAccountNumber(n));
final Preference delete = new Preference(this); final Preference delete = new Preference(this);
delete.setTitle("Delete this account"); delete.setTitle(R.string.pref_delete_account);
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), 0); int nbAccounts = prefs.getInt(getString(R.string.pref_extra_accounts), 0);
@ -109,7 +107,6 @@ public class LinphonePreferencesSIPAccountActivity extends PreferenceActivity {
int defaultAccount = prefs.getInt(getString(R.string.pref_default_account), 0); int defaultAccount = prefs.getInt(getString(R.string.pref_default_account), 0);
if (defaultAccount > n) { if (defaultAccount > n) {
Log.e("Default Account : ", defaultAccount + " => " + (defaultAccount - 1));
editor.putInt(getString(R.string.pref_default_account), defaultAccount - 1); editor.putInt(getString(R.string.pref_default_account), defaultAccount - 1);
} }
@ -121,7 +118,7 @@ public class LinphonePreferencesSIPAccountActivity extends PreferenceActivity {
}); });
CheckBoxPreference mainAccount = new CheckBoxPreference(this); CheckBoxPreference mainAccount = new CheckBoxPreference(this);
mainAccount.setTitle("Use as default"); mainAccount.setTitle(R.string.pref_default_account_title);
mainAccount.setOnPreferenceClickListener(new OnPreferenceClickListener() mainAccount.setOnPreferenceClickListener(new OnPreferenceClickListener()
{ {
public boolean onPreferenceClick(Preference preference) { public boolean onPreferenceClick(Preference preference) {
@ -130,6 +127,8 @@ public class LinphonePreferencesSIPAccountActivity extends PreferenceActivity {
editor.putInt(getString(R.string.pref_default_account), n); editor.putInt(getString(R.string.pref_default_account), n);
editor.commit(); editor.commit();
delete.setEnabled(false); delete.setEnabled(false);
disable.setEnabled(false);
disable.setChecked(false);
preference.setEnabled(false); preference.setEnabled(false);
return true; return true;
} }
@ -138,6 +137,7 @@ public class LinphonePreferencesSIPAccountActivity extends PreferenceActivity {
mainAccount.setChecked(prefs.getInt(getString(R.string.pref_default_account), 0) == n); mainAccount.setChecked(prefs.getInt(getString(R.string.pref_default_account), 0) == n);
mainAccount.setEnabled(!mainAccount.isChecked()); mainAccount.setEnabled(!mainAccount.isChecked());
delete.setEnabled(prefs.getInt(getString(R.string.pref_default_account), 0) != n); delete.setEnabled(prefs.getInt(getString(R.string.pref_default_account), 0) != n);
disable.setEnabled(prefs.getInt(getString(R.string.pref_default_account), 0) != n);
parent.addPreference(category); parent.addPreference(category);
category.addPreference(username); category.addPreference(username);