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

Removed led on accounts in settings

Browse source
This commit is contained in:
Sylvain Berfini 2012-08-28 12:16:24 +02:00
parent 3a66c0490c
commit 422887b801
2 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/values/non_localizable_custom.xml
View file

@ -6,7 +6,7 @@
<string name="wizard_url">https://www.linphone.org/wizard.php</string> <string name="wizard_url">https://www.linphone.org/wizard.php</string>
<!-- Interface settings --> <!-- Interface settings -->
<bool name="use_simple_history">true</bool> <bool name="use_simple_history">false</bool>
<bool name="hide_camera_settings">false</bool> <bool name="hide_camera_settings">false</bool>
<bool name="hide_wizard">false</bool> <bool name="hide_wizard">false</bool>
<bool name="hide_accounts">false</bool> <bool name="hide_accounts">false</bool>

18
src/org/linphone/PreferencesActivity.java
View file

@ -60,6 +60,7 @@ import android.preference.Preference.OnPreferenceChangeListener;
import android.preference.Preference.OnPreferenceClickListener; import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceCategory; import android.preference.PreferenceCategory;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.widget.ImageView;
public class PreferencesActivity extends LinphonePreferencesActivity implements EcCalibrationListener { public class PreferencesActivity extends LinphonePreferencesActivity implements EcCalibrationListener {
private Handler mHandler = new Handler(); private Handler mHandler = new Handler();
@ -130,14 +131,14 @@ public class PreferencesActivity extends LinphonePreferencesActivity implements
} }
private void addExtraAccountPreferencesButton(PreferenceCategory parent, final int n, boolean isNewAccount) { private void addExtraAccountPreferencesButton(PreferenceCategory parent, final int n, boolean isNewAccount) {
SharedPreferences prefs = getPreferenceManager().getSharedPreferences(); final SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
if (isNewAccount) { if (isNewAccount) {
SharedPreferences.Editor editor = prefs.edit(); SharedPreferences.Editor editor = prefs.edit();
editor.putInt(getString(R.string.pref_extra_accounts), n+1); editor.putInt(getString(R.string.pref_extra_accounts), n+1);
editor.commit(); editor.commit();
} }
Preference me = new Preference(PreferencesActivity.this); final Preference me = new Preference(PreferencesActivity.this);
String keyUsername = getString(R.string.pref_username_key); String keyUsername = getString(R.string.pref_username_key);
String keyDomain = getString(R.string.pref_domain_key); String keyDomain = getString(R.string.pref_domain_key);
if (n > 0) { if (n > 0) {
@ -161,19 +162,6 @@ public class PreferencesActivity extends LinphonePreferencesActivity implements
} }
}); });
for (LinphoneProxyConfig lpc : LinphoneManager.getLc().getProxyConfigList()) {
if (lpc.getIdentity().contains(prefs.getString(keyUsername, "")) && lpc.getIdentity().contains(prefs.getString(keyDomain, ""))) {
while ((lpc.getState() == RegistrationState.RegistrationProgress || lpc.getState() == RegistrationState.RegistrationNone) && (LinphoneManager.getLc().isNetworkReachable()))
{ };
if (lpc.getState() == LinphoneCore.RegistrationState.RegistrationOk) {
me.setWidgetLayoutResource(R.layout.preference_led_connected);
} else {
me.setWidgetLayoutResource(R.layout.preference_led_not_connected);
}
}
}
parent.addPreference(me); parent.addPreference(me);
} }