* #34699: persistent SRTP preferences, TLS not working
diff --git a/res/xml/account_general_prefs.xml b/res/xml/account_general_prefs.xml
index 9417ae5..d3d0c8b 100644
--- a/res/xml/account_general_prefs.xml
+++ b/res/xml/account_general_prefs.xml
@@ -37,32 +37,28 @@
android:title="@string/account_basic_category" >
<EditTextPreference
android:id="@+id/account_alias"
- android:defaultValue=""
android:key="Account.alias"
android:persistent="false"
android:summary=""
- android:title="Alias" />
+ android:title="@string/account_alias_label" />
<EditTextPreference
android:id="@+id/account_hostname"
- android:defaultValue=""
android:key="Account.hostname"
android:persistent="false"
android:summary=""
- android:title="Hostname" />
+ android:title="@string/account_hostname_label" />
<EditTextPreference
android:id="@+id/account_username"
- android:defaultValue=""
android:key="Account.username"
android:persistent="false"
android:summary=""
- android:title="Username" />
+ android:title="@string/account_username_label" />
<EditTextPreference
android:id="@+id/account_password"
- android:defaultValue=""
android:key="Account.password"
android:persistent="false"
android:summary=""
- android:title="Password" />
+ android:title="@string/account_password_label" />
</PreferenceCategory>
<PreferenceCategory
android:id="@+id/account_optionnal_category"
@@ -89,303 +85,5 @@
android:summaryOn="enabled"
android:title="@string/account_autoanswer_label" />
</PreferenceCategory>
- <!-- <PreferenceCategory -->
- <!-- android:id="@+id/account_advanced_category" -->
- <!-- android:title="Advanced settings"> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_registration_expire" -->
- <!-- android:key="Account.registrationExpire" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="60" -->
- <!-- android:title="Registration Expire" -->
- <!-- android:summary="60"/> -->
-
-
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_registration_status" -->
- <!-- android:key="Account.registrationStatus" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="" -->
- <!-- android:title="Registration Status" -->
- <!-- android:summary=""/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_registration_state_code" -->
- <!-- android:key="Account.registrationCode" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="" -->
- <!-- android:title="Registration Code" -->
- <!-- android:summary=""/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_registration_state_desc" -->
- <!-- android:key="Account.registrationDescription" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="" -->
- <!-- android:title="Registration Desciption" -->
- <!-- android:summary=""/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_credential_number" -->
- <!-- android:key="Credential.count" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="0" -->
- <!-- android:title="Credential Number" -->
- <!-- android:summary="0"/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_dtmf_type" -->
- <!-- android:key="Account.dtmfType" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="SIP" -->
- <!-- android:title="DTMF Type" -->
- <!-- android:summary="SIP"/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_ringtone_path" -->
- <!-- android:key="Account.ringtonePath" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="" -->
- <!-- android:title="Ringtone Path"/> -->
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_ringtone_enabled" -->
- <!-- android:key="Account.ringtoneEnabled" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="true" -->
- <!-- android:title="Ringtone Enabled"/> -->
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_keep_alive" -->
- <!-- android:key="Account.keepAliveEnabled" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="false" -->
- <!-- android:title="Keep Alive"/> -->
- <!-- <ListPreference -->
- <!-- android:id="@+id/account_creation_local_interface" -->
- <!-- android:key="Account.localInterface" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="wlan0" -->
- <!-- android:title="Local Interface" -->
- <!-- android:summary="wlan0"/> -->
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_published_sameas_local" -->
- <!-- android:key="Account.publishedSameAsLocal" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="false" -->
- <!-- android:title="Published same as local" -->
- <!-- android:summaryOn="yes" -->
- <!-- android:summaryOff="no"/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_local_port" -->
- <!-- android:key="Account.localPort" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="5070" -->
- <!-- android:title="Local Port" -->
- <!-- android:summary="5070"/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_published_port" -->
- <!-- android:key="Account.publishedPort" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="5070" -->
- <!-- android:title="Published Port" -->
- <!-- android:summary="5070"/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_published_address" -->
- <!-- android:key="Account.publishedAddress" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="0.0.0.0" -->
- <!-- android:title="Published Address" -->
- <!-- android:summary="0.0.0.0"/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_display_name" -->
- <!-- android:key="Account.displayName" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="SFLPhone" -->
- <!-- android:title="Display Name" -->
- <!-- android:summary="SFLPhone"/> -->
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_stun_enable" -->
- <!-- android:key="STUN.enable" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="false" -->
- <!-- android:title="Stun Enabled" -->
- <!-- android:summaryOn="enabled" -->
- <!-- android:summaryOff="disabled"/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_stun_server" -->
- <!-- android:key="STUN.server" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="" -->
- <!-- android:title="Stun Server" -->
- <!-- android:summary=""/> -->
- <!-- </PreferenceCategory> -->
- <!-- <PreferenceCategory -->
- <!-- android:id="@+id/account_srtp_category" -->
- <!-- android:title="SRTP settings"> -->
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_srtp_enable" -->
- <!-- android:key="SRTP.enable" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="false" -->
- <!-- android:title="SRTP Enabled" -->
- <!-- android:summaryOn="enabled" -->
- <!-- android:summaryOff="disabled"/> -->
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_srtp_key_exchange" -->
- <!-- android:key="SRTP.keyExchange" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="false" -->
- <!-- android:title="SRTP Key Exchange" -->
- <!-- android:summaryOn="enabled" -->
- <!-- android:summaryOff="disabled"/> -->
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_srtp_encryp_algo" -->
- <!-- android:key="SRTP.encryptionAlgorithm" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="false" -->
- <!-- android:title="SRTP Encrypt Algo" -->
- <!-- android:summaryOn="enabled" -->
- <!-- android:summaryOff="disabled"/> -->
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_srtp_rtp_fallback" -->
- <!-- android:key="SRTP.rtpFallback" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="false" -->
- <!-- android:title="SRTP RTP Fallback" -->
- <!-- android:summaryOn="enabled" -->
- <!-- android:summaryOff="disabled"/> -->
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_srtp_hello_hash" -->
- <!-- android:key="ZRTP.helloHashEnable" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="disabled" -->
- <!-- android:title="ZRTP Hello Hash" -->
- <!-- android:summaryOn="enabled" -->
- <!-- android:summaryOff="disabled"/> -->
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_srtp_display_sas" -->
- <!-- android:key="ZRTP.displaySAS" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="false" -->
- <!-- android:title="ZRTP Display SAS" -->
- <!-- android:summaryOn="enabled" -->
- <!-- android:summaryOff="disabled"/> -->
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_srtp_supported_warning" -->
- <!-- android:key="ZRTP.notSuppWarning" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="false" -->
- <!-- android:title="ZRTP Not Supported Warning" -->
- <!-- android:summaryOn="enabled" -->
- <!-- android:summaryOff="disabled"/> -->
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_srtp_displaysas_once" -->
- <!-- android:key="ZRTP.displaySasOnce" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="false" -->
- <!-- android:title="ZRTP Display SAS Once" -->
- <!-- android:summaryOn="enabled" -->
- <!-- android:summaryOff="disabled"/> -->
- <!-- </PreferenceCategory> -->
- <!-- <PreferenceCategory -->
- <!-- android:id="@+id/account_tls_category" -->
- <!-- android:title="TLS settings"> -->
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_tls_enable" -->
- <!-- android:key="TLS.enable" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="false" -->
- <!-- android:title="TLS Enabled" -->
- <!-- android:summaryOn="enabled" -->
- <!-- android:summaryOff="disabled"/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_tls_listener_port" -->
- <!-- android:key="TLS.listenerPort" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="5061" -->
- <!-- android:title="Listener Port" -->
- <!-- android:summary="5061"/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_tls_certificate_list_file" -->
- <!-- android:key="TLS.certificateListFile" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="" -->
- <!-- android:title="TLS Certificate List File" -->
- <!-- android:summary=""/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_tls_certificate_file" -->
- <!-- android:key="TLS.certificateFile" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="" -->
- <!-- android:title="TLS Certificate File" -->
- <!-- android:summary=""/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_tls_private_key_file" -->
- <!-- android:key="TLS.privateKeyFile" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="disabled" -->
- <!-- android:title="TLS Private Key File" -->
- <!-- android:summary="disabled"/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_tls_password" -->
- <!-- android:key="TLS.password" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="" -->
- <!-- android:title="TLS Password" -->
- <!-- android:summary=""/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_tls_method" -->
- <!-- android:key="TLS.method" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="" -->
- <!-- android:title="TLS Method" -->
- <!-- android:summary=""/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_tls_ciphers" -->
- <!-- android:key="TLS.ciphers" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="" -->
- <!-- android:title="TLS Ciphers" -->
- <!-- android:summary=""/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_tls_server_name" -->
- <!-- android:key="TLS.serverName" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="" -->
- <!-- android:title="TLS Server Name" -->
- <!-- android:summary=""/> -->
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_tls_verify_server" -->
- <!-- android:key="TLS.verifyServer" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="false" -->
- <!-- android:title="TLS Verify Server" -->
- <!-- android:summaryOn="enabled" -->
- <!-- android:summaryOff="disabled"/> -->
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_tls_verify_client" -->
- <!-- android:key="TLS.verifyClient" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="false" -->
- <!-- android:title="TLS Verify Client" -->
- <!-- android:summaryOn="enabled" -->
- <!-- android:summaryOff="disabled"/> -->
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_tls_require_client_cert" -->
- <!-- android:key="TLS.requireClientCertificate" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="false" -->
- <!-- android:title="TLS Require Client Certificate" -->
- <!-- android:summaryOn="enabled" -->
- <!-- android:summaryOff="disabled"/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_tls_timeout_sec" -->
- <!-- android:key="TLS.negotiationTimeoutSec" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="60" -->
- <!-- android:title="TLS Timeout Sec" -->
- <!-- android:summary="60"/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_tls_timeout_msec" -->
- <!-- android:key="TLS.negotiationTimeoutMsec" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="0" -->
- <!-- android:title="TLS Timeout Msec" -->
- <!-- android:summary="0"/> -->
- <!-- </PreferenceCategory> -->
</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/account_security_prefs.xml b/res/xml/account_security_prefs.xml
index deeded4..d170fc1 100644
--- a/res/xml/account_security_prefs.xml
+++ b/res/xml/account_security_prefs.xml
@@ -44,212 +44,25 @@
<PreferenceCategory
android:id="@+id/account_security_category"
android:title="Security" >
- <CheckBoxPreference
- android:id="@+id/account_creation_tls_enable"
- android:defaultValue="false"
- android:key="TLS.enable"
+ <Preference
+ android:id="@+id/account_tls"
+ android:key="TLS.details"
android:persistent="false"
- android:summaryOff="disabled"
- android:summaryOn="enabled"
android:title="TLS" />
<ListPreference
android:id="@+id/account_srtp_enable"
- android:defaultValue="Deactivated"
android:entries="@array/srtp_entry"
android:entryValues="@array/srtp_entry_values"
android:key="SRTP.enable"
android:persistent="false"
- android:summary="Deactivated"
android:title="SRTP Exchange" />
- <PreferenceScreen
+ <Preference
android:enabled="false"
+ android:key="SRTP.details"
android:title="SRTP Preferences" >
- <CheckBoxPreference
- android:id="@+id/account_creation_tls_enable"
- android:defaultValue="false"
- android:key="TLS.enable"
- android:persistent="false"
- android:summaryOff="disabled"
- android:summaryOn="enabled"
- android:title="TLS Enabled" />
- <CheckBoxPreference
- android:id="@+id/account_creation_tls_enable"
- android:defaultValue="false"
- android:key="TLS.enable"
- android:persistent="false"
- android:summaryOff="disabled"
- android:summaryOn="enabled"
- android:title="TLS Enabled" />
- <CheckBoxPreference
- android:id="@+id/account_creation_tls_enable"
- android:defaultValue="false"
- android:key="TLS.enable"
- android:persistent="false"
- android:summaryOff="disabled"
- android:summaryOn="enabled"
- android:title="TLS Enabled" />
- <CheckBoxPreference
- android:id="@+id/account_creation_tls_enable"
- android:defaultValue="false"
- android:key="TLS.enable"
- android:persistent="false"
- android:summaryOff="disabled"
- android:summaryOn="enabled"
- android:title="TLS" />
- </PreferenceScreen>
+ </Preference>
</PreferenceCategory>
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_srtp_key_exchange" -->
- <!-- android:key="SRTP.keyExchange" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="false" -->
- <!-- android:title="SRTP Key Exchange" -->
- <!-- android:summaryOn="enabled" -->
- <!-- android:summaryOff="disabled"/> -->
-
-
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_srtp_rtp_fallback" -->
- <!-- android:key="SRTP.rtpFallback" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="false" -->
- <!-- android:title="SRTP RTP Fallback" -->
- <!-- android:summaryOn="enabled" -->
- <!-- android:summaryOff="disabled"/> -->
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_srtp_hello_hash" -->
- <!-- android:key="ZRTP.helloHashEnable" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="disabled" -->
- <!-- android:title="ZRTP Hello Hash" -->
- <!-- android:summaryOn="enabled" -->
- <!-- android:summaryOff="disabled"/> -->
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_srtp_display_sas" -->
- <!-- android:key="ZRTP.displaySAS" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="false" -->
- <!-- android:title="ZRTP Display SAS" -->
- <!-- android:summaryOn="enabled" -->
- <!-- android:summaryOff="disabled"/> -->
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_srtp_supported_warning" -->
- <!-- android:key="ZRTP.notSuppWarning" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="false" -->
- <!-- android:title="ZRTP Not Supported Warning" -->
- <!-- android:summaryOn="enabled" -->
- <!-- android:summaryOff="disabled"/> -->
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_srtp_displaysas_once" -->
- <!-- android:key="ZRTP.displaySasOnce" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="false" -->
- <!-- android:title="ZRTP Display SAS Once" -->
- <!-- android:summaryOn="enabled" -->
- <!-- android:summaryOff="disabled"/> -->
-
- <!-- <PreferenceCategory -->
- <!-- android:id="@+id/account_tls_category" -->
- <!-- android:title="TLS settings"> -->
-
-
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_tls_listener_port" -->
- <!-- android:key="TLS.listenerPort" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="5061" -->
- <!-- android:title="Listener Port" -->
- <!-- android:summary="5061"/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_tls_certificate_list_file" -->
- <!-- android:key="TLS.certificateListFile" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="" -->
- <!-- android:title="TLS Certificate List File" -->
- <!-- android:summary=""/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_tls_certificate_file" -->
- <!-- android:key="TLS.certificateFile" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="" -->
- <!-- android:title="TLS Certificate File" -->
- <!-- android:summary=""/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_tls_private_key_file" -->
- <!-- android:key="TLS.privateKeyFile" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="disabled" -->
- <!-- android:title="TLS Private Key File" -->
- <!-- android:summary="disabled"/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_tls_password" -->
- <!-- android:key="TLS.password" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="" -->
- <!-- android:title="TLS Password" -->
- <!-- android:summary=""/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_tls_method" -->
- <!-- android:key="TLS.method" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="" -->
- <!-- android:title="TLS Method" -->
- <!-- android:summary=""/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_tls_ciphers" -->
- <!-- android:key="TLS.ciphers" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="" -->
- <!-- android:title="TLS Ciphers" -->
- <!-- android:summary=""/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_tls_server_name" -->
- <!-- android:key="TLS.serverName" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="" -->
- <!-- android:title="TLS Server Name" -->
- <!-- android:summary=""/> -->
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_tls_verify_server" -->
- <!-- android:key="TLS.verifyServer" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="false" -->
- <!-- android:title="TLS Verify Server" -->
- <!-- android:summaryOn="enabled" -->
- <!-- android:summaryOff="disabled"/> -->
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_tls_verify_client" -->
- <!-- android:key="TLS.verifyClient" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="false" -->
- <!-- android:title="TLS Verify Client" -->
- <!-- android:summaryOn="enabled" -->
- <!-- android:summaryOff="disabled"/> -->
- <!-- <CheckBoxPreference -->
- <!-- android:id="@+id/account_creation_tls_require_client_cert" -->
- <!-- android:key="TLS.requireClientCertificate" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="false" -->
- <!-- android:title="TLS Require Client Certificate" -->
- <!-- android:summaryOn="enabled" -->
- <!-- android:summaryOff="disabled"/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_tls_timeout_sec" -->
- <!-- android:key="TLS.negotiationTimeoutSec" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="60" -->
- <!-- android:title="TLS Timeout Sec" -->
- <!-- android:summary="60"/> -->
- <!-- <EditTextPreference -->
- <!-- android:id="@+id/account_creation_tls_timeout_msec" -->
- <!-- android:key="TLS.negotiationTimeoutMsec" -->
- <!-- android:persistent="false" -->
- <!-- android:defaultValue="0" -->
- <!-- android:title="TLS Timeout Msec" -->
- <!-- android:summary="0"/> -->
- <!-- </PreferenceCategory> -->
</PreferenceScreen>
\ No newline at end of file