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

Fix back in settings

Browse source
This commit is contained in:
Margaux Clerc 2015-11-17 17:23:19 +01:00
parent b32ad9ab61
commit d943c41fe5
3 changed files with 81 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -59,13 +59,11 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
PreferenceScreen screen = getPreferenceScreen(); PreferenceScreen screen = getPreferenceScreen();
n = getArguments().getInt("Account", 0); n = getArguments().getInt("Account", 0);
if(n == mPrefs.getAccountCount()){ if(n == mPrefs.getAccountCount()) {
isNewAccount=true; isNewAccount = true;
builder = new AccountBuilder(LinphoneManager.getLc()); builder = new AccountBuilder(LinphoneManager.getLc());
initAccountPreferencesFields(screen);
} else {
manageAccountPreferencesFields(screen);
} }
initAccountPreferencesFields(screen);
// Force hide keyboard // Force hide keyboard
getActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN); getActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
@ -185,7 +183,7 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
String value = newValue.toString(); String value = newValue.toString();
preference.setSummary(value); preference.setSummary(value);
if (isNewAccount) { if (isNewAccount) {
//TODO acocunt builder ste prefix //TODO accpunt builder ste prefix
} else { } else {
mPrefs.setPrefix(n, value); mPrefs.setPrefix(n, value);
} }
@ -274,55 +272,106 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
PreferenceCategory account = (PreferenceCategory) getPreferenceScreen().findPreference(getString(R.string.pref_sipaccount_key)); PreferenceCategory account = (PreferenceCategory) getPreferenceScreen().findPreference(getString(R.string.pref_sipaccount_key));
EditTextPreference username = (EditTextPreference) account.getPreference(0); EditTextPreference username = (EditTextPreference) account.getPreference(0);
username.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS); username.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
username.setOnPreferenceChangeListener(usernameChangedListener); username.setOnPreferenceChangeListener(usernameChangedListener);
if (!isNewAccount){
username.setText(mPrefs.getAccountUsername(n));
username.setSummary(username.getText());
}
EditTextPreference userid = (EditTextPreference) account.getPreference(1); EditTextPreference userid = (EditTextPreference) account.getPreference(1);
userid.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS); userid.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
userid.setOnPreferenceChangeListener(useridChangedListener); userid.setOnPreferenceChangeListener(useridChangedListener);
if (!isNewAccount){
userid.setText(mPrefs.getAccountUserId(n));
userid.setSummary(userid.getText());
}
EditTextPreference password = (EditTextPreference) account.getPreference(2); EditTextPreference password = (EditTextPreference) account.getPreference(2);
password.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD); password.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
password.setOnPreferenceChangeListener(passwordChangedListener); password.setOnPreferenceChangeListener(passwordChangedListener);
if(!isNewAccount){
password.setText(mPrefs.getAccountPassword(n));
}
EditTextPreference domain = (EditTextPreference) account.getPreference(3); EditTextPreference domain = (EditTextPreference) account.getPreference(3);
domain.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS); domain.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
domain.setOnPreferenceChangeListener(domainChangedListener); domain.setOnPreferenceChangeListener(domainChangedListener);
if (!isNewAccount){
domain.setText(mPrefs.getAccountDomain(n));
domain.setSummary(domain.getText());
}
EditTextPreference displayName = (EditTextPreference) account.getPreference(4); EditTextPreference displayName = (EditTextPreference) account.getPreference(4);
displayName.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PERSON_NAME); displayName.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PERSON_NAME);
displayName.setOnPreferenceChangeListener(displayNameChangedListener); displayName.setOnPreferenceChangeListener(displayNameChangedListener);
if (!isNewAccount){
displayName.setText(mPrefs.getAccountDisplayName(n));
displayName.setSummary(displayName.getText());
}
PreferenceCategory advanced = (PreferenceCategory) getPreferenceScreen().findPreference(getString(R.string.pref_advanced_key)); PreferenceCategory advanced = (PreferenceCategory) getPreferenceScreen().findPreference(getString(R.string.pref_advanced_key));
mTransportPreference = (ListPreference) advanced.getPreference(0); mTransportPreference = (ListPreference) advanced.getPreference(0);
initializeTransportPreference(mTransportPreference); initializeTransportPreference(mTransportPreference);
mTransportPreference.setOnPreferenceChangeListener(transportChangedListener); mTransportPreference.setOnPreferenceChangeListener(transportChangedListener);
if(!isNewAccount){
mTransportPreference.setSummary(mPrefs.getAccountTransportString(n));
}
mProxyPreference = (EditTextPreference) advanced.getPreference(1); mProxyPreference = (EditTextPreference) advanced.getPreference(1);
mProxyPreference.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS); mProxyPreference.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
mProxyPreference.setOnPreferenceChangeListener(proxyChangedListener); mProxyPreference.setOnPreferenceChangeListener(proxyChangedListener);
if (!isNewAccount){
mProxyPreference.setText(mPrefs.getAccountProxy(n));
mProxyPreference.setSummary("".equals(mProxyPreference.getText()) || (mProxyPreference.getText() == null) ? getString(R.string.pref_help_proxy) : mProxyPreference.getText());
}
CheckBoxPreference outboundProxy = (CheckBoxPreference) advanced.getPreference(2); CheckBoxPreference outboundProxy = (CheckBoxPreference) advanced.getPreference(2);
outboundProxy.setOnPreferenceChangeListener(outboundProxyChangedListener); outboundProxy.setOnPreferenceChangeListener(outboundProxyChangedListener);
if (!isNewAccount){
outboundProxy.setChecked(mPrefs.isAccountOutboundProxySet(n));
}
EditTextPreference expires = (EditTextPreference) advanced.getPreference(3); EditTextPreference expires = (EditTextPreference) advanced.getPreference(3);
expires.setOnPreferenceChangeListener(expiresChangedListener); expires.setOnPreferenceChangeListener(expiresChangedListener);
if(!isNewAccount){
expires.setText(mPrefs.getExpires(n));
expires.setSummary(mPrefs.getExpires(n));
}
EditTextPreference prefix = (EditTextPreference) advanced.getPreference(4); EditTextPreference prefix = (EditTextPreference) advanced.getPreference(4);
prefix.setOnPreferenceChangeListener(prefixChangedListener); prefix.setOnPreferenceChangeListener(prefixChangedListener);
if(!isNewAccount){
String prefixValue = mPrefs.getPrefix(n);
prefix.setText(prefixValue);
prefix.setOnPreferenceChangeListener(prefixChangedListener);
}
CheckBoxPreference avpf = (CheckBoxPreference) advanced.getPreference(5); CheckBoxPreference avpf = (CheckBoxPreference) advanced.getPreference(5);
avpf.setOnPreferenceChangeListener(avpfChangedListener); avpf.setOnPreferenceChangeListener(avpfChangedListener);
if (!isNewAccount){
avpf.setChecked(mPrefs.avpfEnabled(n));
}
EditTextPreference avpfRRInterval = (EditTextPreference) advanced.getPreference(6); EditTextPreference avpfRRInterval = (EditTextPreference) advanced.getPreference(6);
avpfRRInterval.setOnPreferenceChangeListener(avpfRRIntervalChangedListener); avpfRRInterval.setOnPreferenceChangeListener(avpfRRIntervalChangedListener);
if (!isNewAccount){
avpfRRInterval.setText(mPrefs.getAvpfRRInterval(n));
avpfRRInterval.setSummary(mPrefs.getAvpfRRInterval(n));
}
CheckBoxPreference escape = (CheckBoxPreference) advanced.getPreference(7); CheckBoxPreference escape = (CheckBoxPreference) advanced.getPreference(7);
escape.setOnPreferenceChangeListener(escapeChangedListener); escape.setOnPreferenceChangeListener(escapeChangedListener);
if(!isNewAccount){
escape.setChecked(mPrefs.getReplacePlusByZeroZero(n));
}
PreferenceCategory manage = (PreferenceCategory) getPreferenceScreen().findPreference(getString(R.string.pref_manage_key)); PreferenceCategory manage = (PreferenceCategory) getPreferenceScreen().findPreference(getString(R.string.pref_manage_key));
final CheckBoxPreference disable = (CheckBoxPreference) manage.getPreference(0); final CheckBoxPreference disable = (CheckBoxPreference) manage.getPreference(0);
disable.setEnabled(true); disable.setEnabled(true);
disable.setOnPreferenceChangeListener(disableChangedListener); disable.setOnPreferenceChangeListener(disableChangedListener);
if(!isNewAccount){
disable.setChecked(!mPrefs.isAccountEnabled(n));
}
CheckBoxPreference mainAccount = (CheckBoxPreference) manage.getPreference(1); CheckBoxPreference mainAccount = (CheckBoxPreference) manage.getPreference(1);
mainAccount.setChecked(isDefaultAccount); mainAccount.setChecked(isDefaultAccount);
@ -337,111 +386,9 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
return true; return true;
} }
}); });
if(!isNewAccount){
final Preference delete = manage.getPreference(2); mainAccount.setEnabled(!mainAccount.isChecked());
delete.setEnabled(true); }
delete.setOnPreferenceClickListener(new OnPreferenceClickListener() {
public boolean onPreferenceClick(Preference preference) {
mPrefs.deleteAccount(n);
LinphoneActivity.instance().refreshAccounts();
LinphoneActivity.instance().displaySettings();
return true;
}
});
}
private void manageAccountPreferencesFields(PreferenceScreen parent) {
boolean isDefaultAccount = mPrefs.getDefaultAccountIndex() == n;
PreferenceCategory account = (PreferenceCategory) getPreferenceScreen().findPreference(getString(R.string.pref_sipaccount_key));
EditTextPreference username = (EditTextPreference) account.getPreference(0);
username.setText(mPrefs.getAccountUsername(n));
username.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
username.setOnPreferenceChangeListener(usernameChangedListener);
username.setSummary(username.getText());
EditTextPreference userid = (EditTextPreference) account.getPreference(1);
userid.setText(mPrefs.getAccountUserId(n));
userid.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
userid.setOnPreferenceChangeListener(useridChangedListener);
userid.setSummary(userid.getText());
EditTextPreference password = (EditTextPreference) account.getPreference(2);
password.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
password.setText(mPrefs.getAccountPassword(n));
password.setOnPreferenceChangeListener(passwordChangedListener);
EditTextPreference domain = (EditTextPreference) account.getPreference(3);
domain.setText(mPrefs.getAccountDomain(n));
domain.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
domain.setOnPreferenceChangeListener(domainChangedListener);
domain.setSummary(domain.getText());
EditTextPreference displayName = (EditTextPreference) account.getPreference(4);
displayName.setText(mPrefs.getAccountDisplayName(n));
displayName.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PERSON_NAME);
displayName.setOnPreferenceChangeListener(displayNameChangedListener);
displayName.setSummary(displayName.getText());
PreferenceCategory advanced = (PreferenceCategory) getPreferenceScreen().findPreference(getString(R.string.pref_advanced_key));
mTransportPreference = (ListPreference) advanced.getPreference(0);
initializeTransportPreference(mTransportPreference);
mTransportPreference.setOnPreferenceChangeListener(transportChangedListener);
mTransportPreference.setSummary(mPrefs.getAccountTransportString(n));
mProxyPreference = (EditTextPreference) advanced.getPreference(1);
mProxyPreference.setText(mPrefs.getAccountProxy(n));
mProxyPreference.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
mProxyPreference.setOnPreferenceChangeListener(proxyChangedListener);
mProxyPreference.setSummary("".equals(mProxyPreference.getText()) || (mProxyPreference.getText() == null) ? getString(R.string.pref_help_proxy) : mProxyPreference.getText());
CheckBoxPreference outboundProxy = (CheckBoxPreference) advanced.getPreference(2);
outboundProxy.setChecked(mPrefs.isAccountOutboundProxySet(n));
outboundProxy.setOnPreferenceChangeListener(outboundProxyChangedListener);
EditTextPreference expires = (EditTextPreference) advanced.getPreference(3);
expires.setText(mPrefs.getExpires(n));
expires.setOnPreferenceChangeListener(expiresChangedListener);
expires.setSummary(mPrefs.getExpires(n));
EditTextPreference prefix = (EditTextPreference) advanced.getPreference(4);
String prefixValue = mPrefs.getPrefix(n);
prefix.setSummary(prefixValue);
prefix.setText(prefixValue);
prefix.setOnPreferenceChangeListener(prefixChangedListener);
CheckBoxPreference avpf = (CheckBoxPreference) advanced.getPreference(5);
avpf.setChecked(mPrefs.avpfEnabled(n));
avpf.setOnPreferenceChangeListener(avpfChangedListener);
EditTextPreference avpfRRInterval = (EditTextPreference) advanced.getPreference(6);
avpfRRInterval.setText(mPrefs.getAvpfRRInterval(n));
avpfRRInterval.setOnPreferenceChangeListener(avpfRRIntervalChangedListener);
avpfRRInterval.setSummary(mPrefs.getAvpfRRInterval(n));
CheckBoxPreference escape = (CheckBoxPreference) advanced.getPreference(7);
escape.setChecked(mPrefs.getReplacePlusByZeroZero(n));
escape.setOnPreferenceChangeListener(escapeChangedListener);
PreferenceCategory manage = (PreferenceCategory) getPreferenceScreen().findPreference(getString(R.string.pref_manage_key));
final CheckBoxPreference disable = (CheckBoxPreference) manage.getPreference(0);
disable.setEnabled(true);
disable.setChecked(!mPrefs.isAccountEnabled(n));
disable.setOnPreferenceChangeListener(disableChangedListener);
CheckBoxPreference mainAccount = (CheckBoxPreference) manage.getPreference(1);
mainAccount.setChecked(isDefaultAccount);
mainAccount.setEnabled(!mainAccount.isChecked());
mainAccount.setOnPreferenceClickListener(new OnPreferenceClickListener()
{
public boolean onPreferenceClick(Preference preference) {
mPrefs.setDefaultAccount(n);
disable.setEnabled(false);
disable.setChecked(false);
preference.setEnabled(false);
return true;
}
});
final Preference delete = manage.getPreference(2); final Preference delete = manage.getPreference(2);
delete.setEnabled(true); delete.setEnabled(true);
@ -503,6 +450,7 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
} }
LinphoneActivity.instance().isNewProxyConfig(); LinphoneActivity.instance().isNewProxyConfig();
LinphoneManager.getLc().refreshRegisters(); LinphoneManager.getLc().refreshRegisters();
LinphoneActivity.instance().hideTopBar();
} }
} }
} }

7
src/org/linphone/LinphoneActivity.java
View file

@ -695,8 +695,8 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
changeCurrentFragment(FragmentsAvailable.CHAT_LIST, null); changeCurrentFragment(FragmentsAvailable.CHAT_LIST, null);
chat_selected.setVisibility(View.VISIBLE); chat_selected.setVisibility(View.VISIBLE);
} else if (id == R.id.cancel){ } else if (id == R.id.cancel){
hideTopBar();
displayDialer(); displayDialer();
mTopBar.setVisibility(View.GONE);
} }
} }
@ -715,6 +715,10 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
} }
} }
public void hideTopBar() {
mTopBar.setVisibility(View.GONE);
}
@SuppressWarnings("incomplete-switch") @SuppressWarnings("incomplete-switch")
public void selectMenu(FragmentsAvailable menuToSelect) { public void selectMenu(FragmentsAvailable menuToSelect) {
currentFragment = menuToSelect; currentFragment = menuToSelect;
@ -781,6 +785,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putInt("Account", accountNumber); bundle.putInt("Account", accountNumber);
changeCurrentFragment(FragmentsAvailable.ACCOUNT_SETTINGS, bundle); changeCurrentFragment(FragmentsAvailable.ACCOUNT_SETTINGS, bundle);
mTabBar.setVisibility(View.VISIBLE);
//settings.setSelected(true); //settings.setSelected(true);
} }

11
src/org/linphone/SettingsFragment.java
View file

@ -885,7 +885,8 @@ public class SettingsFragment extends PreferencesListFragment {
int port = -1; int port = -1;
try { try {
port = Integer.parseInt(newValue.toString()); port = Integer.parseInt(newValue.toString());
} catch (NumberFormatException nfe) { } } catch (NumberFormatException nfe) {
}
mPrefs.setSipPort(port); mPrefs.setSipPort(port);
preference.setSummary(newValue.toString()); preference.setSummary(newValue.toString());
@ -1010,7 +1011,7 @@ public class SettingsFragment extends PreferencesListFragment {
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
String value = (String) newValue; String value = (String) newValue;
if(value.equals("")) return false; if (value.equals("")) return false;
mPrefs.setDefaultUsername(value); mPrefs.setDefaultUsername(value);
preference.setSummary(value); preference.setSummary(value);
@ -1030,4 +1031,10 @@ public class SettingsFragment extends PreferencesListFragment {
} }
} }
@Override
public void onPause() {
LinphoneActivity.instance().hideTopBar();
super.onPause();
}
} }