Skip to content
Snippets Groups Projects
Commit 230d66e3 authored by Alexandre Lision's avatar Alexandre Lision
Browse files

* #32210: added strings

parent 0e3c2dfe
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 283 additions and 278 deletions
res/layout/frag_accounts_list.xml
+ 9
− 29
View file @ 230d66e3
......@@ -10,8 +10,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/sfl_another_blue"
android:paddingLeft="5dp"
android:singleLine="true"
android:text="Accounts"
android:text="@string/preference_section1"
android:textAppearance="@android:style/TextAppearance.Holo.Medium.Inverse"
android:textColor="@color/white" />
<org.sflphone.views.dragsortlv.DragSortListView
......@@ -20,7 +22,6 @@
android:layout_height="wrap_content"
android:choiceMode="multipleChoice"
android:dividerHeight="1px"
android:padding="3dp"
dslv:collapsed_height="1px"
dslv:drag_enabled="true"
dslv:drag_handle_id="@id/drag_handle"
......@@ -46,36 +47,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/sfl_another_blue"
android:paddingLeft="5dp"
android:singleLine="true"
android:text="IP2IP Account"
android:text="@string/ip2ip_account"
android:textAppearance="@android:style/TextAppearance.Holo.Medium.Inverse"
android:textColor="@color/white" />
<RelativeLayout
android:id="@+id/layer"
<ListView
android:id="@+id/ip2ip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="4dp" >
<TextView
android:id="@+id/account_alias"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_marginBottom="4dp"
android:layout_marginLeft="4dp"
android:text="IP2IP"
android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView
android:id="@+id/account_host"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/account_alias"
android:layout_marginLeft="4dp"
android:text="READY"
android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
android:layout_height="wrap_content" />
</LinearLayout>
\ No newline at end of file
res/values-fr/strings.xml
+ 1
− 98
View file @ 230d66e3
......@@ -99,104 +99,7 @@ as that of the covered work.
<string name="menu_item_about">À propos de SFLphone</string>
<!-- AccountManagementFragment -->
<string name="empty_account_list">Aucun compte enregistré</string>
<!-- Preferences -->
<string name="preference_section1">Comptes</string>
<string name="account_preferences_audio">Audio</string>
<string name="account_preferences">Préférences de compte</string>
<string name="account_preferences_basic">Compte</string>
<string name="account_preferences_advanced">Advanced Account Preferences</string>
<string name="account_preferences_srtp">SRTP Account Preferences</string>
<string name="account_preferences_tls">TLS Account Preferences</string>
<string name="audio_preferences">Audio Preferences</string>
<string name="account_hostname_label">Hostname</string>
<string name="account_username_label">Username</string>
<string name="account_routeset_label">Route Set</string>
<string name="account_password_label">Password</string>
<string name="account_realm_label">Realm</string>
<string name="account_useragent_label">User Agent</string>
<string name="account_autoanswer_label">Auto Answer</string>
<string name="account_type_label">Account Type</string>
<string name="account_alias_label">Alias</string>
<string name="account_mailbox_label">Mailbox</string>
<string name="account_enabled_label">Account Enabled</string>
<string name="account_registration_exp_label">Registration Expire</string>
<string name="account_registration_status_label">Registration Status</string>
<string name="account_registration_code_label">Registration Code</string>
<string name="account_registration_state_label">Registration State</string>
<string name="account_credential_count_label">Credential Count</string>
<string name="account_config_dtmf_type_label">overrtp</string>
<string name="account_ringtone_path_label">Ringtone</string>
<string name="account_ringtone_enabled_label">Ringtone Enabled</string>
<string name="account_keep_alive_label">Keep Alive</string>
<string name="account_local_interface_label">Local Interface</string>
<string name="account_published_same_as_local_label">Published Port Same As Local</string>
<string name="account_local_port_label">Local Port</string>
<string name="account_published_port_label">Published Port</string>
<string name="account_published_address_label">Published Address</string>
<string name="account_displayname_label">Displayname Label</string>
<string name="account_stun_server_label">Stun Server</string>
<string name="account_stun_enable_label">Stun Enabled</string>
<string name="account_srtp_enabled_label">SRTP Enabled</string>
<string name="account_srtp_exchange_label">SRTP Key Exchange</string>
<string name="account_encryption_algo_label">Encryption Algo</string>
<string name="account_srtp_fallback_label">SRTP Fallback</string>
<string name="account_hello_hash_enable_label">Hello Hash Enabled</string>
<string name="account_display_sas_label">Display SAS</string>
<string name="account_not_supported_warning_label">Not Supported Warning</string>
<string name="account_display_sas_once_label">Display SAS Once</string>
<string name="account_listener_port_label">TLS Listener Port</string>
<string name="account_tls_enabled_label">TLS Enabled</string>
<string name="account_tls_certificate_list_label">TLS Certificate List File</string>
<string name="account_tls_certificate_file_label">TLS Certificate File</string>
<string name="account_tls_private_key_file_label">TLS Private Key File</string>
<string name="account_tls_password_label">TLS Private Key Password</string>
<string name="account_tls_method_label">TLS Method</string>
<string name="account_tls_ciphers_label">TLS Ciphers</string>
<string name="account_tls_server_name_label">TLS Server Name</string>
<string name="account_tls_verify_label">TLS Verify Server</string>
<string name="account_tls_verify_client_label">TLS Verify Client</string>
<string name="account_tls_require_client_certificat_label">TLS Require Client Certificate</string>
<string name="account_tls_negotiation_timeout_sec">TLS Negotiation Timeout (sec)</string>
<string name="account_tls_negotiation_timeout_msec">TLS Negotiation Timeout (msec)</string>
<string name="account_alias_field">Alias</string>
<string name="title_account_alias_field">Alias</string>
<string name="dialogtitle_account_alias_field">Enter the alias for this account</string>
<string name="account_hostname_field">Hostname</string>
<string name="title_account_hostname_field">Hostname</string>
<string name="dialogtitle_account_hostname_field">Enter hostname</string>
<string name="account_username_field">Username</string>
<string name="title_account_username_field">Username</string>
<string name="dialogtitle_account_username_field">Enter username</string>
<string name="account_proxy_field">Proxy</string>
<string name="title_account_proxy_field">Proxy</string>
<string name="dialogtitle_account_proxy_field">Enter proxy</string>
<string name="account_registration_field">Registration Timeout</string>
<string name="title_account_registration_field">Registration Timeout</string>
<string name="dialogtitle_account_registration_field">Enter registration timeout</string>
<string name="account_network_field">Network Interface</string>
<string name="title_account_network_field">Network Interface</string>
<string name="dialogtitle_account_network_field">Enter registration timeout</string>
<string name="account_stun_field">Stun Server</string>
<string name="title_account_stun_field">Stun Server</string>
<string name="dialogtitle_account_stun_field">Enter stun server</string>
<string name="account_security_field">Security</string>
<string name="title_account_security_field">Security</string>
<string name="dialogtitle_account_security_field">Activate security feature</string>
<string name="account_tls_field">TLS</string>
<string name="title_account_tls_field">TLS</string>
<string name="dialogtitle_account_tls_field">Activate TLS feature</string>
<string name="account_srtp_field">SRTP</string>
<string name="title_account_srtp_field">SRTP</string>
<string name="dialogtitle_account_srtp_field">Activate SRTP feature</string>
<string name="title_audio_codec_list">Audio Codec</string>
<string name="dialogtitle_audio_codec_list">Audio Codec Available</string>
<string name="title_audio_ringtone_field">Ringtone</string>
<string name="dialogtitle_audio_ringtone_field">Ringtone</string>
<!-- Call Fragment -->
<string name="me">Moi</string>
<string name="action_call_attended_transfer">Transfert</string>
......
res/values-fr/strings_account.xml 0 → 100644
+ 113
− 0
View file @ 230d66e3
<resources>
<!-- Strings related to login -->
<string name="prompt_alias">Alias</string>
<string name="prompt_hostname">Nom du serveur</string>
<string name="prompt_username">Nom d\'utilisateur</string>
<string name="prompt_password">Mot de passe</string>
<string name="action_create"><b>Enregistrer le compte</b></string>
<string name="action_create_short">Enregistrer</string>
<string name="error_field_required">Ce champ est requis</string>
<!-- AccountManagementFragment -->
<string name="empty_account_list">Aucun compte enregistré</string>
<string name="normal_accounts_titles">Comptes</string>
<string name="ip2ip_account">Compte IP2IP</string>
<string name="ip2ip_state">PRÊT</string>
<!-- Preferences -->
<string name="preference_section1">Comptes</string>
<string name="account_preferences_audio">Audio</string>
<string name="account_preferences">Préférences de compte</string>
<string name="account_preferences_basic">Compte</string>
<string name="account_preferences_advanced">Advanced Account Preferences</string>
<string name="account_preferences_srtp">SRTP Account Preferences</string>
<string name="account_preferences_tls">TLS Account Preferences</string>
<string name="audio_preferences">Audio Preferences</string>
<string name="account_hostname_label">Hostname</string>
<string name="account_username_label">Username</string>
<string name="account_routeset_label">Route Set</string>
<string name="account_password_label">Password</string>
<string name="account_realm_label">Realm</string>
<string name="account_useragent_label">User Agent</string>
<string name="account_autoanswer_label">Auto Answer</string>
<string name="account_type_label">Account Type</string>
<string name="account_alias_label">Alias</string>
<string name="account_mailbox_label">Mailbox</string>
<string name="account_enabled_label">Account Enabled</string>
<string name="account_registration_exp_label">Registration Expire</string>
<string name="account_registration_status_label">Registration Status</string>
<string name="account_registration_code_label">Registration Code</string>
<string name="account_registration_state_label">Registration State</string>
<string name="account_credential_count_label">Credential Count</string>
<string name="account_config_dtmf_type_label">overrtp</string>
<string name="account_ringtone_path_label">Ringtone</string>
<string name="account_ringtone_enabled_label">Ringtone Enabled</string>
<string name="account_keep_alive_label">Keep Alive</string>
<string name="account_local_interface_label">Local Interface</string>
<string name="account_published_same_as_local_label">Published Port Same As Local</string>
<string name="account_local_port_label">Local Port</string>
<string name="account_published_port_label">Published Port</string>
<string name="account_published_address_label">Published Address</string>
<string name="account_displayname_label">Displayname Label</string>
<string name="account_stun_server_label">Stun Server</string>
<string name="account_stun_enable_label">Stun Enabled</string>
<string name="account_srtp_enabled_label">SRTP Enabled</string>
<string name="account_srtp_exchange_label">SRTP Key Exchange</string>
<string name="account_encryption_algo_label">Encryption Algo</string>
<string name="account_srtp_fallback_label">SRTP Fallback</string>
<string name="account_hello_hash_enable_label">Hello Hash Enabled</string>
<string name="account_display_sas_label">Display SAS</string>
<string name="account_not_supported_warning_label">Not Supported Warning</string>
<string name="account_display_sas_once_label">Display SAS Once</string>
<string name="account_listener_port_label">TLS Listener Port</string>
<string name="account_tls_enabled_label">TLS Enabled</string>
<string name="account_tls_certificate_list_label">TLS Certificate List File</string>
<string name="account_tls_certificate_file_label">TLS Certificate File</string>
<string name="account_tls_private_key_file_label">TLS Private Key File</string>
<string name="account_tls_password_label">TLS Private Key Password</string>
<string name="account_tls_method_label">TLS Method</string>
<string name="account_tls_ciphers_label">TLS Ciphers</string>
<string name="account_tls_server_name_label">TLS Server Name</string>
<string name="account_tls_verify_label">TLS Verify Server</string>
<string name="account_tls_verify_client_label">TLS Verify Client</string>
<string name="account_tls_require_client_certificat_label">TLS Require Client Certificate</string>
<string name="account_tls_negotiation_timeout_sec">TLS Negotiation Timeout (sec)</string>
<string name="account_tls_negotiation_timeout_msec">TLS Negotiation Timeout (msec)</string>
<string name="account_alias_field">Alias</string>
<string name="title_account_alias_field">Alias</string>
<string name="dialogtitle_account_alias_field">Enter the alias for this account</string>
<string name="account_hostname_field">Hostname</string>
<string name="title_account_hostname_field">Hostname</string>
<string name="dialogtitle_account_hostname_field">Enter hostname</string>
<string name="account_username_field">Username</string>
<string name="title_account_username_field">Username</string>
<string name="dialogtitle_account_username_field">Enter username</string>
<string name="account_proxy_field">Proxy</string>
<string name="title_account_proxy_field">Proxy</string>
<string name="dialogtitle_account_proxy_field">Enter proxy</string>
<string name="account_registration_field">Registration Timeout</string>
<string name="title_account_registration_field">Registration Timeout</string>
<string name="dialogtitle_account_registration_field">Enter registration timeout</string>
<string name="account_network_field">Network Interface</string>
<string name="title_account_network_field">Network Interface</string>
<string name="dialogtitle_account_network_field">Enter registration timeout</string>
<string name="account_stun_field">Stun Server</string>
<string name="title_account_stun_field">Stun Server</string>
<string name="dialogtitle_account_stun_field">Enter stun server</string>
<string name="account_security_field">Security</string>
<string name="title_account_security_field">Security</string>
<string name="dialogtitle_account_security_field">Activate security feature</string>
<string name="account_tls_field">TLS</string>
<string name="title_account_tls_field">TLS</string>
<string name="dialogtitle_account_tls_field">Activate TLS feature</string>
<string name="account_srtp_field">SRTP</string>
<string name="title_account_srtp_field">SRTP</string>
<string name="dialogtitle_account_srtp_field">Activate SRTP feature</string>
<string name="title_audio_codec_list">Audio Codec</string>
<string name="dialogtitle_audio_codec_list">Audio Codec Available</string>
<string name="title_audio_ringtone_field">Ringtone</string>
<string name="dialogtitle_audio_ringtone_field">Ringtone</string>
</resources>
res/values-fr/strings_register_account.xml deleted 100644 → 0
+ 0
− 12
View file @ 0e3c2dfe
<resources>
<!-- Strings related to login -->
<string name="prompt_alias">Alias</string>
<string name="prompt_hostname">Nom du serveur</string>
<string name="prompt_username">Nom d\'utilisateur</string>
<string name="prompt_password">Mot de passe</string>
<string name="action_create"><b>Enregistrer le compte</b></string>
<string name="action_create_short">Enregistrer</string>
<string name="error_field_required">Ce champ est requis</string>
</resources>
res/values/strings.xml
+ 3
− 96
View file @ 230d66e3
......@@ -100,102 +100,9 @@ as that of the covered work.
<!-- Menu Fragment -->
<string name="frag_menu_accounts_title">Accounts</string>
<!-- AccountManagementFragment -->
<string name="empty_account_list">No account registered</string>
<!-- Preferences -->
<string name="preference_section1">Accounts</string>
<string name="account_preferences_audio">Audio</string>
<string name="account_preferences">Account Preferences</string>
<string name="account_preferences_basic">Account</string>
<string name="account_preferences_advanced">Advanced Account Preferences</string>
<string name="account_preferences_srtp">SRTP Account Preferences</string>
<string name="account_preferences_tls">TLS Account Preferences</string>
<string name="audio_preferences">Audio Preferences</string>
<string name="account_hostname_label">Hostname</string>
<string name="account_username_label">Username</string>
<string name="account_routeset_label">Route Set</string>
<string name="account_password_label">Password</string>
<string name="account_realm_label">Realm</string>
<string name="account_useragent_label">User Agent</string>
<string name="account_autoanswer_label">Auto Answer</string>
<string name="account_type_label">Account Type</string>
<string name="account_alias_label">Alias</string>
<string name="account_mailbox_label">Mailbox</string>
<string name="account_enabled_label">Account Enabled</string>
<string name="account_registration_exp_label">Registration Expire</string>
<string name="account_registration_status_label">Registration Status</string>
<string name="account_registration_code_label">Registration Code</string>
<string name="account_registration_state_label">Registration State</string>
<string name="account_credential_count_label">Credential Count</string>
<string name="account_config_dtmf_type_label">overrtp</string>
<string name="account_ringtone_path_label">Ringtone</string>
<string name="account_ringtone_enabled_label">Ringtone Enabled</string>
<string name="account_keep_alive_label">Keep Alive</string>
<string name="account_local_interface_label">Local Interface</string>
<string name="account_published_same_as_local_label">Published Port Same As Local</string>
<string name="account_local_port_label">Local Port</string>
<string name="account_published_port_label">Published Port</string>
<string name="account_published_address_label">Published Address</string>
<string name="account_displayname_label">Displayname Label</string>
<string name="account_stun_server_label">Stun Server</string>
<string name="account_stun_enable_label">Stun Enabled</string>
<string name="account_srtp_enabled_label">SRTP Enabled</string>
<string name="account_srtp_exchange_label">SRTP Key Exchange</string>
<string name="account_encryption_algo_label">Encryption Algo</string>
<string name="account_srtp_fallback_label">SRTP Fallback</string>
<string name="account_hello_hash_enable_label">Hello Hash Enabled</string>
<string name="account_display_sas_label">Display SAS</string>
<string name="account_not_supported_warning_label">Not Supported Warning</string>
<string name="account_display_sas_once_label">Display SAS Once</string>
<string name="account_listener_port_label">TLS Listener Port</string>
<string name="account_tls_enabled_label">TLS Enabled</string>
<string name="account_tls_certificate_list_label">TLS Certificate List File</string>
<string name="account_tls_certificate_file_label">TLS Certificate File</string>
<string name="account_tls_private_key_file_label">TLS Private Key File</string>
<string name="account_tls_password_label">TLS Private Key Password</string>
<string name="account_tls_method_label">TLS Method</string>
<string name="account_tls_ciphers_label">TLS Ciphers</string>
<string name="account_tls_server_name_label">TLS Server Name</string>
<string name="account_tls_verify_label">TLS Verify Server</string>
<string name="account_tls_verify_client_label">TLS Verify Client</string>
<string name="account_tls_require_client_certificat_label">TLS Require Client Certificate</string>
<string name="account_tls_negotiation_timeout_sec">TLS Negotiation Timeout (sec)</string>
<string name="account_tls_negotiation_timeout_msec">TLS Negotiation Timeout (msec)</string>
<string name="account_alias_field">Alias</string>
<string name="title_account_alias_field">Alias</string>
<string name="dialogtitle_account_alias_field">Enter the alias for this account</string>
<string name="account_hostname_field">Hostname</string>
<string name="title_account_hostname_field">Hostname</string>
<string name="dialogtitle_account_hostname_field">Enter hostname</string>
<string name="account_username_field">Username</string>
<string name="title_account_username_field">Username</string>
<string name="dialogtitle_account_username_field">Enter username</string>
<string name="account_proxy_field">Proxy</string>
<string name="title_account_proxy_field">Proxy</string>
<string name="dialogtitle_account_proxy_field">Enter proxy</string>
<string name="account_registration_field">Registration Timeout</string>
<string name="title_account_registration_field">Registration Timeout</string>
<string name="dialogtitle_account_registration_field">Enter registration timeout</string>
<string name="account_network_field">Network Interface</string>
<string name="title_account_network_field">Network Interface</string>
<string name="dialogtitle_account_network_field">Enter registration timeout</string>
<string name="account_stun_field">Stun Server</string>
<string name="title_account_stun_field">Stun Server</string>
<string name="dialogtitle_account_stun_field">Enter stun server</string>
<string name="account_security_field">Security</string>
<string name="title_account_security_field">Security</string>
<string name="dialogtitle_account_security_field">Activate security feature</string>
<string name="account_tls_field">TLS</string>
<string name="title_account_tls_field">TLS</string>
<string name="dialogtitle_account_tls_field">Activate TLS feature</string>
<string name="account_srtp_field">SRTP</string>
<string name="title_account_srtp_field">SRTP</string>
<string name="dialogtitle_account_srtp_field">Activate SRTP feature</string>
<string name="title_audio_codec_list">Audio Codec</string>
<string name="dialogtitle_audio_codec_list">Audio Codec Available</string>
<string name="title_audio_ringtone_field">Ringtone</string>
<string name="dialogtitle_audio_ringtone_field">Ringtone</string>
<!-- Call Fragment -->
<string name="me">Me</string>
......
res/values/strings_account.xml 0 → 100644
+ 113
− 0
View file @ 230d66e3
<resources>
<!-- Strings related to login -->
<string name="prompt_alias">Alias</string>
<string name="prompt_hostname">Hostname</string>
<string name="prompt_username">Username</string>
<string name="prompt_password">Password</string>
<string name="action_create"><b>Register Account</b></string>
<string name="action_create_short">Register</string>
<string name="error_field_required">This field is required</string>
<!-- AccountManagementFragment -->
<string name="empty_account_list">No account registered</string>
<string name="normal_accounts_titles">Accounts</string>
<string name="ip2ip_account">IP2IP Account</string>
<string name="ip2ip_state">READY</string>
<!-- Preferences -->
<string name="preference_section1">Accounts</string>
<string name="account_preferences_audio">Audio</string>
<string name="account_preferences">Account Preferences</string>
<string name="account_preferences_basic">Account</string>
<string name="account_preferences_advanced">Advanced Account Preferences</string>
<string name="account_preferences_srtp">SRTP Account Preferences</string>
<string name="account_preferences_tls">TLS Account Preferences</string>
<string name="audio_preferences">Audio Preferences</string>
<string name="account_hostname_label">Hostname</string>
<string name="account_username_label">Username</string>
<string name="account_routeset_label">Route Set</string>
<string name="account_password_label">Password</string>
<string name="account_realm_label">Realm</string>
<string name="account_useragent_label">User Agent</string>
<string name="account_autoanswer_label">Auto Answer</string>
<string name="account_type_label">Account Type</string>
<string name="account_alias_label">Alias</string>
<string name="account_mailbox_label">Mailbox</string>
<string name="account_enabled_label">Account Enabled</string>
<string name="account_registration_exp_label">Registration Expire</string>
<string name="account_registration_status_label">Registration Status</string>
<string name="account_registration_code_label">Registration Code</string>
<string name="account_registration_state_label">Registration State</string>
<string name="account_credential_count_label">Credential Count</string>
<string name="account_config_dtmf_type_label">overrtp</string>
<string name="account_ringtone_path_label">Ringtone</string>
<string name="account_ringtone_enabled_label">Ringtone Enabled</string>
<string name="account_keep_alive_label">Keep Alive</string>
<string name="account_local_interface_label">Local Interface</string>
<string name="account_published_same_as_local_label">Published Port Same As Local</string>
<string name="account_local_port_label">Local Port</string>
<string name="account_published_port_label">Published Port</string>
<string name="account_published_address_label">Published Address</string>
<string name="account_displayname_label">Displayname Label</string>
<string name="account_stun_server_label">Stun Server</string>
<string name="account_stun_enable_label">Stun Enabled</string>
<string name="account_srtp_enabled_label">SRTP Enabled</string>
<string name="account_srtp_exchange_label">SRTP Key Exchange</string>
<string name="account_encryption_algo_label">Encryption Algo</string>
<string name="account_srtp_fallback_label">SRTP Fallback</string>
<string name="account_hello_hash_enable_label">Hello Hash Enabled</string>
<string name="account_display_sas_label">Display SAS</string>
<string name="account_not_supported_warning_label">Not Supported Warning</string>
<string name="account_display_sas_once_label">Display SAS Once</string>
<string name="account_listener_port_label">TLS Listener Port</string>
<string name="account_tls_enabled_label">TLS Enabled</string>
<string name="account_tls_certificate_list_label">TLS Certificate List File</string>
<string name="account_tls_certificate_file_label">TLS Certificate File</string>
<string name="account_tls_private_key_file_label">TLS Private Key File</string>
<string name="account_tls_password_label">TLS Private Key Password</string>
<string name="account_tls_method_label">TLS Method</string>
<string name="account_tls_ciphers_label">TLS Ciphers</string>
<string name="account_tls_server_name_label">TLS Server Name</string>
<string name="account_tls_verify_label">TLS Verify Server</string>
<string name="account_tls_verify_client_label">TLS Verify Client</string>
<string name="account_tls_require_client_certificat_label">TLS Require Client Certificate</string>
<string name="account_tls_negotiation_timeout_sec">TLS Negotiation Timeout (sec)</string>
<string name="account_tls_negotiation_timeout_msec">TLS Negotiation Timeout (msec)</string>
<string name="account_alias_field">Alias</string>
<string name="title_account_alias_field">Alias</string>
<string name="dialogtitle_account_alias_field">Enter the alias for this account</string>
<string name="account_hostname_field">Hostname</string>
<string name="title_account_hostname_field">Hostname</string>
<string name="dialogtitle_account_hostname_field">Enter hostname</string>
<string name="account_username_field">Username</string>
<string name="title_account_username_field">Username</string>
<string name="dialogtitle_account_username_field">Enter username</string>
<string name="account_proxy_field">Proxy</string>
<string name="title_account_proxy_field">Proxy</string>
<string name="dialogtitle_account_proxy_field">Enter proxy</string>
<string name="account_registration_field">Registration Timeout</string>
<string name="title_account_registration_field">Registration Timeout</string>
<string name="dialogtitle_account_registration_field">Enter registration timeout</string>
<string name="account_network_field">Network Interface</string>
<string name="title_account_network_field">Network Interface</string>
<string name="dialogtitle_account_network_field">Enter registration timeout</string>
<string name="account_stun_field">Stun Server</string>
<string name="title_account_stun_field">Stun Server</string>
<string name="dialogtitle_account_stun_field">Enter stun server</string>
<string name="account_security_field">Security</string>
<string name="title_account_security_field">Security</string>
<string name="dialogtitle_account_security_field">Activate security feature</string>
<string name="account_tls_field">TLS</string>
<string name="title_account_tls_field">TLS</string>
<string name="dialogtitle_account_tls_field">Activate TLS feature</string>
<string name="account_srtp_field">SRTP</string>
<string name="title_account_srtp_field">SRTP</string>
<string name="dialogtitle_account_srtp_field">Activate SRTP feature</string>
<string name="title_audio_codec_list">Audio Codec</string>
<string name="dialogtitle_audio_codec_list">Audio Codec Available</string>
<string name="title_audio_ringtone_field">Ringtone</string>
<string name="dialogtitle_audio_ringtone_field">Ringtone</string>
</resources>
res/values/strings_register_account.xml deleted 100644 → 0
+ 0
− 12
View file @ 0e3c2dfe
<resources>
<!-- Strings related to login -->
<string name="prompt_alias">Alias</string>
<string name="prompt_hostname">Hostname</string>
<string name="prompt_username">Username</string>
<string name="prompt_password">Password</string>
<string name="action_create"><b>Register Account</b></string>
<string name="action_create_short">Register</string>
<string name="error_field_required">This field is required</string>
</resources>
src/org/sflphone/fragments/AccountManagementFragment.java
+ 44
− 31
View file @ 230d66e3
......@@ -68,6 +68,7 @@ import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.BaseAdapter;
import android.widget.CheckBox;
import android.widget.ListView;
import android.widget.TextView;
public class AccountManagementFragment extends ListFragment implements LoaderCallbacks<Bundle>, AccountsInterface {
......@@ -76,17 +77,17 @@ public class AccountManagementFragment extends ListFragment implements LoaderCal
static final int ACCOUNT_CREATE_REQUEST = 1;
static final int ACCOUNT_EDIT_REQUEST = 2;
AccountsReceiver accountReceiver;
AccountsAdapter mAdapter;
AccountsAdapter mAccountsAdapter;
AccountsAdapter mIP2IPAdapter;
private DragSortListView.DropListener onDrop = new DragSortListView.DropListener() {
@Override
public void drop(int from, int to) {
if (from != to) {
Account item = mAdapter.getItem(from);
mAdapter.remove(item);
mAdapter.insert(item, to);
Account item = mAccountsAdapter.getItem(from);
mAccountsAdapter.remove(item);
mAccountsAdapter.insert(item, to);
try {
mCallbacks.getService().setAccountOrder(mAdapter.generateAccountOrder());
mCallbacks.getService().setAccountOrder(mAccountsAdapter.generateAccountOrder());
} catch (RemoteException e) {
e.printStackTrace();
}
......@@ -133,7 +134,8 @@ public class AccountManagementFragment extends ListFragment implements LoaderCal
super.onCreate(savedInstanceState);
Log.i(TAG, "Create Account Management Fragment");
mAdapter = new AccountsAdapter(getActivity(), new ArrayList<Account>());
mAccountsAdapter = new AccountsAdapter(getActivity(), new ArrayList<Account>());
mIP2IPAdapter = new AccountsAdapter(getActivity(), new ArrayList<Account>());
this.setHasOptionsMenu(true);
accountReceiver = new AccountsReceiver(this);
......@@ -142,7 +144,7 @@ public class AccountManagementFragment extends ListFragment implements LoaderCal
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) {
View inflatedView = inflater.inflate(R.layout.frag_accounts_list, parent, false);
setListAdapter(mAdapter);
setListAdapter(mAccountsAdapter);
return inflatedView;
}
......@@ -162,15 +164,17 @@ public class AccountManagementFragment extends ListFragment implements LoaderCal
@Override
public void onItemClick(AdapterView<?> arg0, View arg1, int pos, long arg3) {
launchAccountEditActivity(mAdapter.getItem(pos));
launchAccountEditActivity(mAccountsAdapter.getItem(pos));
}
});
getView().findViewById(R.id.layer).setOnClickListener(new OnClickListener() {
((ListView) getView().findViewById(R.id.ip2ip)).setAdapter(mIP2IPAdapter);
((ListView) getView().findViewById(R.id.ip2ip)).setOnItemClickListener(new OnItemClickListener() {
@Override
public void onClick(View v) {
public void onItemClick(AdapterView<?> arg0, View arg1, int arg2, long arg3) {
launchAccountEditActivity(ip2ip);
}
});
......@@ -204,10 +208,12 @@ public class AccountManagementFragment extends ListFragment implements LoaderCal
@Override
public void onLoadFinished(Loader<Bundle> loader, Bundle results) {
mAdapter.removeAll();
mAccountsAdapter.removeAll();
ArrayList<Account> tmp = results.getParcelableArrayList(AccountsLoader.ACCOUNTS);
ip2ip = results.getParcelable(AccountsLoader.ACCOUNT_IP2IP);
mAdapter.addAll(tmp);
mAccountsAdapter.addAll(tmp);
mIP2IPAdapter.removeAll();
mIP2IPAdapter.insert(ip2ip, 0);;
}
@Override
......@@ -255,7 +261,7 @@ public class AccountManagementFragment extends ListFragment implements LoaderCal
@Override
public void accountStateChanged(Intent accountState) {
mAdapter.updateAccount(accountState);
mAccountsAdapter.updateAccount(accountState);
}
/**
......@@ -328,22 +334,29 @@ public class AccountManagementFragment extends ListFragment implements LoaderCal
final Account item = accounts.get(pos);
entryView.alias.setText(accounts.get(pos).getAlias());
entryView.host.setText(item.getHost() + " - " + item.getRegistered_state());
entryView.enabled.setChecked(item.isEnabled());
entryView.enabled.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
item.setEnabled(!item.isEnabled());
try {
mCallbacks.getService().setAccountDetails(item.getAccountID(), item.getDetails());
} catch (RemoteException e) {
e.printStackTrace();
if(item.isIP2IP()){
entryView.host.setText(item.getRegistered_state());
entryView.enabled.setVisibility(View.GONE);
} else {
entryView.host.setText(item.getHost() + " - " + item.getRegistered_state());
entryView.enabled.setChecked(item.isEnabled());
entryView.enabled.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
item.setEnabled(!item.isEnabled());
try {
mCallbacks.getService().setAccountDetails(item.getAccountID(), item.getDetails());
} catch (RemoteException e) {
e.printStackTrace();
}
}
}
});
});
}
return rowView;
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment