Clean up in tls adn audio preferences
Refs #45008
diff --git a/res/xml/account_tls.xml b/res/xml/account_tls.xml
index a8c00b7..e968f9f 100644
--- a/res/xml/account_tls.xml
+++ b/res/xml/account_tls.xml
@@ -60,6 +60,7 @@
android:key="TLS.certificateFile"
android:persistent="false"
android:title="@string/account_tls_certificate_file_label" />
+
<Preference
android:id="@+id/account_tls_private_key_file"
android:key="TLS.privateKeyFile"
@@ -72,16 +73,19 @@
android:persistent="false"
android:singleLine="true"
android:title="@string/account_tls_password_label" />
+
<ListPreference
android:id="@+id/account_tls_method"
android:key="TLS.method"
android:persistent="false"
android:title="@string/account_tls_method_label" />
+
<EditTextPreference
android:id="@+id/account_tls_ciphers"
android:key="TLS.ciphers"
android:persistent="false"
android:title="@string/account_tls_ciphers_label" />
+
<EditTextPreference
android:id="@+id/account_tls_server_name"
android:key="TLS.serverName"
@@ -89,7 +93,7 @@
android:singleLine="true"
android:title="@string/account_tls_server_name_label" />
- <EditTextPreference
+ <org.sflphone.views.NumberPickerPreference
android:id="@+id/account_tls_timeout_sec"
android:key="TLS.negotiationTimeoutSec"
android:persistent="false"
diff --git a/src/org/sflphone/account/TLSManager.java b/src/org/sflphone/account/TLSManager.java
index 14c0abf..1bc79a7 100644
--- a/src/org/sflphone/account/TLSManager.java
+++ b/src/org/sflphone/account/TLSManager.java
@@ -126,6 +126,7 @@
String[] values = mFrag.getTlsMethods();
((ListPreference)current).setEntries(values);
((ListPreference)current).setEntryValues(values);
+ current.setSummary(mAccount.getTlsDetails().getDetailString(mScreen.getPreference(i).getKey()));
} else {
current.setSummary(mAccount.getTlsDetails().getDetailString(mScreen.getPreference(i).getKey()));
}
diff --git a/src/org/sflphone/fragments/AudioManagementFragment.java b/src/org/sflphone/fragments/AudioManagementFragment.java
index 6562d28..791d48c 100644
--- a/src/org/sflphone/fragments/AudioManagementFragment.java
+++ b/src/org/sflphone/fragments/AudioManagementFragment.java
@@ -269,11 +269,15 @@
if (preference instanceof CheckBoxPreference) {
if (preference.getKey().contentEquals(AccountDetailAdvanced.CONFIG_RINGTONE_ENABLED))
getPreferenceScreen().findPreference(AccountDetailAdvanced.CONFIG_RINGTONE_PATH).setEnabled((Boolean) newValue);
- mCallbacks.getAccount().getAdvancedDetails().setDetailString(preference.getKey(), ((Boolean) newValue).toString());
+ mCallbacks.getAccount().getAdvancedDetails().setDetailString(preference.getKey(), newValue.toString());
} else {
- preference.setSummary((CharSequence) newValue);
- Log.i(TAG, "Changing" + preference.getKey() + " value:" + newValue);
- mCallbacks.getAccount().getAdvancedDetails().setDetailString(preference.getKey(), ((CharSequence) newValue).toString());
+ if (preference.getKey().contentEquals("Account.dtmfType")) {
+ preference.setSummary(((String)newValue).contentEquals("overrtp") ? "RTP" : "SIP");
+ } else {
+ preference.setSummary((CharSequence) newValue);
+ Log.i(TAG, "Changing" + preference.getKey() + " value:" + newValue);
+ mCallbacks.getAccount().getAdvancedDetails().setDetailString(preference.getKey(), newValue.toString());
+ }
}
mCallbacks.getAccount().notifyObservers();