diff --git a/res/values/non_localizable_strings.xml b/res/values/non_localizable_strings.xml index b11c9f12d..84ce36f8f 100644 --- a/res/values/non_localizable_strings.xml +++ b/res/values/non_localizable_strings.xml @@ -124,9 +124,6 @@ - download_bw - upload_bw - diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java index 78c5870f3..6d0afc9c8 100644 --- a/src/org/linphone/LinphonePreferences.java +++ b/src/org/linphone/LinphonePreferences.java @@ -83,18 +83,18 @@ public class LinphonePreferences { } public void load() { - Log.w("Preferences loading..."); loadSection("sip", R.array.lpconfig_sip_keys); } private void loadSection(String section, int resourcesID) { Log.w("Preferences loading for section " + section); for (String key : LinphoneService.instance().getResources().getStringArray(resourcesID)) { - Log.w("Looking for value for key " + key); String value = config.getString("sip", key, ""); if (value != null && value.length() > 0) { Log.w("Value read for key " + key + " : " + value); dict.put(key, value); + } else { + Log.w("Value not found for key " + key); } } } diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java index cee623128..310e283dc 100644 --- a/src/org/linphone/LinphoneService.java +++ b/src/org/linphone/LinphoneService.java @@ -139,10 +139,6 @@ public final class LinphoneService extends Service implements LinphoneServiceLis // In case restart after a crash. Main in LinphoneActivity LinphonePreferenceManager.getInstance(this); - // Set default preferences - PreferenceManager.setDefaultValues(this, R.xml.preferences, true); - - mNotificationTitle = getString(R.string.app_name); // Dump some debugging information to the logs diff --git a/src/org/linphone/SettingsFragment.java b/src/org/linphone/SettingsFragment.java index f93cc7813..1a7e9b05e 100644 --- a/src/org/linphone/SettingsFragment.java +++ b/src/org/linphone/SettingsFragment.java @@ -48,7 +48,6 @@ public class SettingsFragment extends PreferencesListFragment implements EcCalib // FIXME: first display doesn't match the linphonerc values if (pref.hasKey()) { - Log.w("Preference key = " + pref.getKey()); pref.setOnPreferenceChangeListener(new OnPreferenceChangeListener() { @Override public boolean onPreferenceChange(Preference preference, Object newValue) { @@ -59,7 +58,6 @@ public class SettingsFragment extends PreferencesListFragment implements EcCalib }); } else { if (pref instanceof PreferenceCategory) { - Log.w("Preference is a category (" + pref.getTitle() + "), let's recurse!"); PreferenceCategory cat = (PreferenceCategory) pref; int count = cat.getPreferenceCount(); for (int i = 0; i < count; i++) { @@ -67,7 +65,6 @@ public class SettingsFragment extends PreferencesListFragment implements EcCalib setListenerForPreference(p); } } else if (pref instanceof PreferenceScreen) { - Log.w("Preference is a screen (" + pref.getTitle() + "), let's recurse!"); PreferenceScreen screen = (PreferenceScreen) pref; int count = screen.getPreferenceCount(); for (int i = 0; i < count; i++) {