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

Refresh accounts works and remove about/assistant from settings

Browse source
This commit is contained in:
Margaux Clerc 2015-10-15 16:31:39 +02:00
parent 237487cb58
commit 23e66f1c70
7 changed files with 490 additions and 485 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
res/layout/search_contact_cell.xml
View file

@ -2,38 +2,27 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="50dp"
android:gravity="center_vertical"
android:background="@drawable/list_selector"
android:orientation="vertical" >
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:orientation="horizontal">
<TextView
android:id="@+id/Contact_name"
android:lines="1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/icon"
android:layout_centerVertical="true"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/text_contrast"
android:layout_marginLeft="10dp" />
<TextView
android:id="@+id/contact_address"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:adjustViewBounds="true"
android:layout_marginRight="20dp"
android:scaleType="centerInside" />
</RelativeLayout>
</LinearLayout>
<TextView
android:id="@+id/Contact_name"
android:lines="1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/icon"
android:layout_centerVertical="true"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/colorB" />
<TextView
android:id="@+id/contact_address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:adjustViewBounds="true"
android:scaleType="centerInside" />
</LinearLayout>

704
res/values/strings.xml
View file

@ -7,12 +7,16 @@
<string name="username">Username</string>
<string name="display_name">Display name</string>
<string name="password">Password</string>
<string name="confirm_password">Confirm password</string>
<string name="domain">Domain</string>
<string name="remote_provisioning_url">Provisioning url</string>
<string name="email">Email</string>
<string name="delete_text">Are you sure you want to delete your selection ?</string>
<string name="delete">Delete</string>
<string name="retry">Retry</string>
<string name="cancel">Cancel</string>
<string name="accept">Accept</string>
<string name="about">About</string>
<!-- splashscreen -->
<string name="app_description">free SIP VOIP client</string>
@ -34,7 +38,7 @@
<string name="assistant_create">Create account</string>
<string name="assistant_apply">Apply</string>
<string name="assistant_ec_calibration">Echo canceller calibration in progress</string>
<string name="assistant_password_confirm">Confirm password</string>
<!-- 1. Dailer -->
<string name="address_bar_hint">Enter a number or an address</string>
@ -56,6 +60,7 @@
<!-- Call -->
<string name="incoming_call">incoming call</string>
<string name="outgoing_call">outgoing call</string>
<string name="call_update_video">Call update requested\nYour correspondent would like to add video to the current call.</string>
<!-- Content description -->
@ -110,360 +115,357 @@
<string name="content_description_conference">Conference</string>
<string name="pref_disable_account">Disable</string>
<string name="pref_tunnel">Tunnel</string>
<string name="pref_tunnel_host">Hostname</string>
<string name="pref_tunnel_port">Port</string>
<string name="pref_tunnel_mode">Mode</string>
<!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
<string-array name="tunnel_mode_entries">
<item>disabled</item>
<item>3G only</item>
<item>always</item>
<item>auto</item>
</string-array>
<string name="pref_disable_account">Disable</string>
<string name="pref_tunnel">Tunnel</string>
<string name="pref_tunnel_host">Hostname</string>
<string name="pref_tunnel_port">Port</string>
<string name="pref_tunnel_mode">Mode</string>
<!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
<string-array name="tunnel_mode_entries">
<item>disabled</item>
<item>3G only</item>
<item>always</item>
<item>auto</item>
</string-array>
<string name="incall_notif_active">Audio call ongoing</string>
<string name="incall_notif_paused">Paused call ongoing</string>
<string name="incall_notif_video">Video capturing call ongoing</string>
<string name="not_ready_to_make_new_call">Not ready for a new call</string>
<string name="bad_target_uri">Bad contact : %s</string>
<string name="reset_sas_fmt">Reset verified %s</string>
<string name="verify_sas_fmt">Verify %s</string>
<string name="communication_encrypted">Encrypted</string>
<string name="waiting_for_startup">Starting up…</string>
<string name="couldnt_accept_call">An error occurred while accepting call</string>
<string name="error_adding_new_call">Error adding new call</string>
<string name="transfer_started">Transfer initiated</string>
<string name="transfer_dialog_title">Transfer call to</string>
<string name="transfer_to_new_call">New call</string>
<string name="resume_dialog_title">Resume call</string>
<string name="cannot_resume_paused_by_remote_call">Cannot resume call paused by remote</string>
<string name="conf_show_details_text">Show details</string>
<string name="skipable_error_service_not_ready">Warning: service is not ready</string>
<string name="close_button_text">Close</string>
<string name="status_conf_call">conf</string>
<string name="status_active_call">active</string>
<string name="state_paused">paused</string>
<string name="state_paused_by_remote">paused by remote</string>
<string name="state_streams_running"></string>
<string name="mutemic_button_txt">Mute</string>
<string name="speaker_button_txt">Speaker</string>
<string name="bluetooth_button_txt">Bluetooth</string>
<string name="CancelButtonText">Cancel</string>
<string name="AddCallButtonText">Add call</string>
<string name="TransferCallButtonText">Transfer call</string>
<string name="conf_admin_choice_enter">Enter conference</string>
<string name="conf_admin_choice_leave">Momentarily leave conference</string>
<string name="conf_admin_choice_terminate">Terminate conference</string>
<string name="hangup">Hang up</string>
<string name="conf_simple_merge_bt_txt">Merge</string>
<string name="conf_simple_transfer_bt_txt">Transfer</string>
<string name="conf_simple_video_bt_txt">video</string>
<!--<string name="conf_simple_no_current_call">No active call</string>-->
<string name="show_send_dtmfs_button">Dialpad</string>
<string name="conf_conference">Conference</string>
<string name="in_conf">You are part of it</string>
<string name="in_conf_leave">Go out</string>
<string name="out_conf">You are out of it</string>
<string name="out_conf_enter">Go in</string>
<string name="pref_audio_hacks_title">Audio hacks</string>
<string name="pref_audio_use_specific_mode_title">Use specific mode hack</string>
<string name="pref_audio_use_specific_mode_summary">0=MODE_NORMAL (default), 2=MODE_IN_CALL</string>
<string name="pref_audio_hacks_use_routing_api_title">Use routing API hack</string>
<string name="pref_audio_hacks_use_galaxys_hack_title">Use Galaxy S audio hack</string>
<string name="pref_audio_soft_volume_title">Use software volume</string>
<string name="pref_ipv6_title">Use ipv6 instead of ipv4</string>
<string name="error_while_accepting_pending_call">Error while accepting pending call</string>
<string name="incoming_call_dialog_title">%s is calling you</string>
<string name="accept">Accept</string>
<string name="decline">Decline</string>
<string name="unknown_incoming_call_name">Unknown</string>
<string name="pref_network_title">Network</string>
<string name="pref_transport">Transport</string>
<string name="pref_transport_udp">UDP</string>
<string name="pref_transport_tcp">TCP</string>
<string name="pref_transport_tls">TLS</string>
<string name="pref_transport_use_random_ports">Use random ports</string>
<string name="pref_sip_port_title">SIP port to use</string>
<string name="at_least_a_protocol">At least one item is required</string>
<string name="first_launch_ok">Registration successful</string>
<string name="error">Error</string>
<string name="click_to_show_first_login_view">Start</string>
<string name="dialer_null_on_new_intent">Application not ready</string>
<string name="pref_add_account">Add account</string>
<string name="no_phone_numbers">No phone numbers found for %s</string>
<string name="filter_contacts">Filter contacts</string>
<string name="title_numbers_dialog">%s\'s phone numbers</string>
<string name="pref_delete_account">Delete this account</string>
<string name="pref_default_account">Use as default</string>
<string name="pref_echo_canceller_calibration">Echo canceller calibration</string>
<string name="pref_video_use_front_camera_title">Use front camera</string>
<string name="pref_video">Video</string>
<string name="pref_preferences">Preferences</string>
<string name="pref_video_codecs_title">Codecs</string>
<string name="pref_preferred_video_size">Preferred video size</string>
<string name="menu_videocall_back_to_dialer_title">Display dialer</string>
<string name="menu_videocall_switch_camera_title">Front/Rear Camera</string>
<string name="menu_videocall_change_resolution_when_low_resolution">Try High resolution</string>
<string name="menu_videocall_change_resolution_when_high_resolution">Low resolution</string>
<string name="menu_videocall_change_resolution_title">Change resolution</string>
<string name="menu_videocall_toggle_camera_title">Mute/Unmute camera</string>
<string name="menu_videocall_toggle_camera_disable">Disable camera</string>
<string name="menu_videocall_toggle_camera_enable">Enable camera</string>
<string name="menu_videocall_terminate_call_title">Terminate call</string>
<string name="pref_video_settings_title">Video settings</string>
<string name="pref_video_automatically_share_my_video_title">Share my camera</string>
<string name="pref_video_automatically_accept_video_title">Accept incoming video requests</string>
<string name="pref_video_automatically_share_my_video">Automatically send my camera</string>
<string name="pref_video_automatically_accept_video">Always accept video requests</string>
<string name="pref_video_initiate_call_with_video_title">Initiate video calls</string>
<string name="pref_video_initiate_call_with_video">Always send video requests</string>
<string name="pref_video_enable_title">Enable Video</string>
<string name="pref_bandwidth_limit">Bandwidth limit in kbits/s</string>
<string name="pref_animation_enable_title">Enable Animations</string>
<string name="pref_escape_plus">Replace + by 00</string>
<string name="pref_ilbc_summary">iLBC might be unavailable depending on ARM processor and Android OS version.</string>
<string name="pref_echo_cancellation">Echo cancellation</string>
<string name="pref_autostart">Start at boot time</string>
<string name="pref_enable_outbound_proxy">Outbound proxy</string>
<string name="incall_notif_active">Audio call ongoing</string>
<string name="incall_notif_paused">Paused call ongoing</string>
<string name="incall_notif_video">Video capturing call ongoing</string>
<string name="not_ready_to_make_new_call">Not ready for a new call</string>
<string name="bad_target_uri">Bad contact : %s</string>
<string name="reset_sas_fmt">Reset verified %s</string>
<string name="verify_sas_fmt">Verify %s</string>
<string name="communication_encrypted">Encrypted</string>
<string name="waiting_for_startup">Starting up…</string>
<string name="couldnt_accept_call">An error occurred while accepting call</string>
<string name="error_adding_new_call">Error adding new call</string>
<string name="transfer_started">Transfer initiated</string>
<string name="transfer_dialog_title">Transfer call to</string>
<string name="transfer_to_new_call">New call</string>
<string name="resume_dialog_title">Resume call</string>
<string name="cannot_resume_paused_by_remote_call">Cannot resume call paused by remote</string>
<string name="conf_show_details_text">Show details</string>
<string name="skipable_error_service_not_ready">Warning: service is not ready</string>
<string name="close_button_text">Close</string>
<string name="status_conf_call">conf</string>
<string name="status_active_call">active</string>
<string name="state_paused">paused</string>
<string name="state_paused_by_remote">paused by remote</string>
<string name="state_streams_running"></string>
<string name="mutemic_button_txt">Mute</string>
<string name="speaker_button_txt">Speaker</string>
<string name="bluetooth_button_txt">Bluetooth</string>
<string name="CancelButtonText">Cancel</string>
<string name="AddCallButtonText">Add call</string>
<string name="TransferCallButtonText">Transfer call</string>
<string name="conf_admin_choice_enter">Enter conference</string>
<string name="conf_admin_choice_leave">Momentarily leave conference</string>
<string name="conf_admin_choice_terminate">Terminate conference</string>
<string name="hangup">Hang up</string>
<string name="conf_simple_merge_bt_txt">Merge</string>
<string name="conf_simple_transfer_bt_txt">Transfer</string>
<string name="conf_simple_video_bt_txt">video</string>
<!--<string name="conf_simple_no_current_call">No active call</string>-->
<string name="show_send_dtmfs_button">Dialpad</string>
<string name="conf_conference">Conference</string>
<string name="in_conf">You are part of it</string>
<string name="in_conf_leave">Go out</string>
<string name="out_conf">You are out of it</string>
<string name="out_conf_enter">Go in</string>
<string name="pref_audio_hacks_title">Audio hacks</string>
<string name="pref_audio_use_specific_mode_title">Use specific mode hack</string>
<string name="pref_audio_use_specific_mode_summary">0=MODE_NORMAL (default), 2=MODE_IN_CALL</string>
<string name="pref_audio_hacks_use_routing_api_title">Use routing API hack</string>
<string name="pref_audio_hacks_use_galaxys_hack_title">Use Galaxy S audio hack</string>
<string name="pref_audio_soft_volume_title">Use software volume</string>
<string name="pref_ipv6_title">Use ipv6 instead of ipv4</string>
<string name="error_while_accepting_pending_call">Error while accepting pending call</string>
<string name="incoming_call_dialog_title">%s is calling you</string>
<string name="decline">Decline</string>
<string name="unknown_incoming_call_name">Unknown</string>
<string name="pref_network_title">Network</string>
<string name="pref_transport">Transport</string>
<string name="pref_transport_udp">UDP</string>
<string name="pref_transport_tcp">TCP</string>
<string name="pref_transport_tls">TLS</string>
<string name="pref_transport_use_random_ports">Use random ports</string>
<string name="pref_sip_port_title">SIP port to use</string>
<string name="at_least_a_protocol">At least one item is required</string>
<string name="first_launch_ok">Registration successful</string>
<string name="error">Error</string>
<string name="click_to_show_first_login_view">Start</string>
<string name="dialer_null_on_new_intent">Application not ready</string>
<string name="pref_add_account">Add account</string>
<string name="no_phone_numbers">No phone numbers found for %s</string>
<string name="filter_contacts">Filter contacts</string>
<string name="title_numbers_dialog">%s\'s phone numbers</string>
<string name="pref_delete_account">Delete this account</string>
<string name="pref_default_account">Use as default</string>
<string name="pref_echo_canceller_calibration">Echo canceller calibration</string>
<string name="pref_video_use_front_camera_title">Use front camera</string>
<string name="pref_video">Video</string>
<string name="pref_preferences">Preferences</string>
<string name="pref_video_codecs_title">Codecs</string>
<string name="pref_preferred_video_size">Preferred video size</string>
<string name="menu_videocall_back_to_dialer_title">Display dialer</string>
<string name="menu_videocall_switch_camera_title">Front/Rear Camera</string>
<string name="menu_videocall_change_resolution_when_low_resolution">Try High resolution</string>
<string name="menu_videocall_change_resolution_when_high_resolution">Low resolution</string>
<string name="menu_videocall_change_resolution_title">Change resolution</string>
<string name="menu_videocall_toggle_camera_title">Mute/Unmute camera</string>
<string name="menu_videocall_toggle_camera_disable">Disable camera</string>
<string name="menu_videocall_toggle_camera_enable">Enable camera</string>
<string name="menu_videocall_terminate_call_title">Terminate call</string>
<string name="pref_video_settings_title">Video settings</string>
<string name="pref_video_automatically_share_my_video_title">Share my camera</string>
<string name="pref_video_automatically_accept_video_title">Accept incoming video requests</string>
<string name="pref_video_automatically_share_my_video">Automatically send my camera</string>
<string name="pref_video_automatically_accept_video">Always accept video requests</string>
<string name="pref_video_initiate_call_with_video_title">Initiate video calls</string>
<string name="pref_video_initiate_call_with_video">Always send video requests</string>
<string name="pref_video_enable_title">Enable Video</string>
<string name="pref_bandwidth_limit">Bandwidth limit in kbits/s</string>
<string name="pref_animation_enable_title">Enable Animations</string>
<string name="pref_escape_plus">Replace + by 00</string>
<string name="pref_ilbc_summary">iLBC might be unavailable depending on ARM processor and Android OS version.</string>
<string name="pref_echo_cancellation">Echo cancellation</string>
<string name="pref_autostart">Start at boot time</string>
<string name="pref_enable_outbound_proxy">Outbound proxy</string>
<string name="pref_codecs">Codecs</string>
<string name="pref_communication_expire_title">Communication timeout</string>
<string name="pref_incoming_expire_title">Incoming call timeout</string>
<string name="pref_video_port_title">Video port or port range</string>
<string name="pref_audio_port_title">Audio port or port range</string>
<string name="pref_video_port_description">Video port or port range (minport-maxport)</string>
<string name="pref_audio_port_description">Audio port or port range (minport-maxport)</string>
<string name="pref_incoming_call_timeout_title">Incoming call timeout (in seconds)</string>
<string name="place_call_chooser">Place a call</string>
<string name="pref_adaptive_rate_control">Adaptive rate control</string>
<string name="pref_adaptive_rate_algorithm">Adaptive rate algorithm</string>
<string name="pref_codec_bitrate_limit">Codec bitrate limit</string>
<string-array name="limit_bitrate_entries">
<item>10 kbits/s</item>
<item>15 kbits/s</item>
<item>20 kbits/s</item>
<item>36 kbits/s</item>
<item>64 kbits/s</item>
<item>128 kbits/s</item>
</string-array>
<string name="pref_codecs">Codecs</string>
<string name="pref_communication_expire_title">Communication timeout</string>
<string name="pref_incoming_expire_title">Incoming call timeout</string>
<string name="pref_video_port_title">Video port or port range</string>
<string name="pref_audio_port_title">Audio port or port range</string>
<string name="pref_video_port_description">Video port or port range (minport-maxport)</string>
<string name="pref_audio_port_description">Audio port or port range (minport-maxport)</string>
<string name="pref_incoming_call_timeout_title">Incoming call timeout (in seconds)</string>
<string name="place_call_chooser">Place a call</string>
<string name="pref_adaptive_rate_control">Adaptive rate control</string>
<string name="pref_adaptive_rate_algorithm">Adaptive rate algorithm</string>
<string name="pref_codec_bitrate_limit">Codec bitrate limit</string>
<string-array name="limit_bitrate_entries">
<item>10 kbits/s</item>
<item>15 kbits/s</item>
<item>20 kbits/s</item>
<item>36 kbits/s</item>
<item>64 kbits/s</item>
<item>128 kbits/s</item>
</string-array>
<string name="pref_debug">Debug</string>
<string name="about_report_issue">Report issue</string>
<string name="about_bugreport_email_text">Describe problem here</string>
<string name="about_error_generating_bugreport_attachement">Error generating bug report</string>
<string name="about_logs_not_found">Logs not found.</string>
<string name="about_reading_logs">Reading logs, may takes time…</string>
<string name="about_mailer_chooser_text">Send bug report with…</string>
<string name="menu_about">About</string>
<string name="menu_send_log">Send log</string>
<string name="menu_reset_log">Reset log</string>
<string name="pref_audio">Audio</string>
<string name="pref_prefix">Prefix</string>
<string name="pref_advanced">Advanced</string>
<string name="menu_settings">Settings</string>
<string name="pref_proxy">Proxy</string>
<string name="pref_domain">Domain*</string>
<string name="pref_passwd">Password*</string>
<string name="pref_username">Username*</string>
<string name="pref_sipaccount">SIP Account</string>
<string name="wrong_username">wrong user name</string>
<string name="wrong_passwd">wrong password</string>
<string name="wrong_domain">Wrong domain</string>
<string name="wrong_settings">Wrong settings</string>
<string name="tab_dialer">Dialer</string>
<string name="tab_contact">Contact</string>
<string name="call_error">Cannot call %s</string>
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="dismiss">Dismiss</string>
<string name="cont">Continue</string>
<string name="never_remind">Never remind me</string>
<string name="config_error">%s, do you want to go to the settings page ?</string>
<string name="ec_calibration_launch_message">Starting echo cancelation audio calibration </string>
<string name="warning_already_incall">Cannot initiate a new call because a call is already engaged</string>
<string name="tab_history">History</string>
<string name="warning_wrong_destination_address">Cannot build destination address from [%s]</string>
<string name="menu_clear_history">Clear</string>
<string name="error_cannot_get_call_parameters">Cannot get call parameters</string>
<string name="error_cannot_create_default_parameters">Cannot create default call parameters</string>
<string name="error_cannot_invite_address">Cannot invite destination address [%s]</string>
<string name="notification_started">started</string>
<string name="pref_echo_cancellation_summary">Removes the echo heard by other end</string>
<string name="pref_stun_server">Stun server</string>
<string name="pref_ice_enable">Enable ICE</string>
<string name="pref_ice_enable_summary">A STUN server must be configured to use ICE</string>
<string name="ec_calibrating">Calibrating…</string>
<string name="ec_calibrated">Calibrated [%s ms]</string>
<string name="no_echo">No echo</string>
<string name="failed">failed</string>
<string name="first_login_explanation">Enter your username and password to connect to the service.</string>
<string name="first_login_username">Username</string>
<string name="first_login_password">Password</string>
<string name="first_login_connect">Connect</string>
<string name="first_launch_no_login_password">Please enter your login and password</string>
<string name="first_launch_bad_login_password">Couldn\'t connect; check your login and password and start again</string>
<string name="pref_amr_summary">AMR codec might not be present on your phone</string>
<string name="pref_media_encryption">Media encryption</string>
<string name="media_encryption_none">None</string>
<string name="pref_video_codec_h264_unavailable">Codec disabled, build the app from source code to enable it</string>
<string name="pref_video_codec_mpeg4_unavailable">Codec disabled, build the app from source code to enable it</string>
<string name="pref_sipaccounts">SIP Accounts</string>
<string name="pref_wifi_only">Use wifi only</string>
<string name="pref_push_notification">Enable push notifications</string>
<string name="wizard_failed">An error occurred, try again later.</string>
<string name="wizard_server_unavailable">Server unreachable, verify your internet connection.</string>
<string name="wizard_username_unavailable">This username is already in use.</string>
<string name="wizard_username_incorrect">Your username is not valid.</string>
<string name="wizard_email_incorrect">Your email is not valid.</string>
<string name="wizard_password_incorrect">Your password is not valid (6 characters min).</string>
<string name="wizard_passwords_unmatched">Passwords entered are different.</string>
<string name="pref_help_proxy">SIP proxy hostname or ip address (optional)</string>
<string name="pref_help_outbound_proxy">Route all calls through SIP proxy</string>
<string name="pref_help_username">Example: john if your account is john@sip.example.org</string>
<string name="pref_help_domain">sip.example.org if your account is john@sip.example.org</string>
<string name="pref_help_password">You have to re-enter your password if you edit your username and/or the domain</string>
<string name="pref_debug">Debug</string>
<string name="about_report_issue">Report issue</string>
<string name="about_bugreport_email_text">Describe problem here</string>
<string name="about_error_generating_bugreport_attachement">Error generating bug report</string>
<string name="about_logs_not_found">Logs not found.</string>
<string name="about_reading_logs">Reading logs, may takes time…</string>
<string name="about_mailer_chooser_text">Send bug report with…</string>
<string name="menu_about">About</string>
<string name="menu_send_log">Send log</string>
<string name="menu_reset_log">Reset log</string>
<string name="pref_audio">Audio</string>
<string name="pref_prefix">Prefix</string>
<string name="pref_advanced">Advanced</string>
<string name="menu_settings">Settings</string>
<string name="pref_proxy">Proxy</string>
<string name="pref_domain">Domain*</string>
<string name="pref_passwd">Password*</string>
<string name="pref_username">Username*</string>
<string name="pref_sipaccount">SIP Account</string>
<string name="wrong_username">wrong user name</string>
<string name="wrong_passwd">wrong password</string>
<string name="wrong_domain">Wrong domain</string>
<string name="wrong_settings">Wrong settings</string>
<string name="tab_dialer">Dialer</string>
<string name="tab_contact">Contact</string>
<string name="call_error">Cannot call %s</string>
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="dismiss">Dismiss</string>
<string name="cont">Continue</string>
<string name="never_remind">Never remind me</string>
<string name="config_error">%s, do you want to go to the settings page ?</string>
<string name="ec_calibration_launch_message">Starting echo cancelation audio calibration </string>
<string name="warning_already_incall">Cannot initiate a new call because a call is already engaged</string>
<string name="tab_history">History</string>
<string name="warning_wrong_destination_address">Cannot build destination address from [%s]</string>
<string name="menu_clear_history">Clear</string>
<string name="error_cannot_get_call_parameters">Cannot get call parameters</string>
<string name="error_cannot_create_default_parameters">Cannot create default call parameters</string>
<string name="error_cannot_invite_address">Cannot invite destination address [%s]</string>
<string name="notification_started">started</string>
<string name="pref_echo_cancellation_summary">Removes the echo heard by other end</string>
<string name="pref_stun_server">Stun server</string>
<string name="pref_ice_enable">Enable ICE</string>
<string name="pref_ice_enable_summary">A STUN server must be configured to use ICE</string>
<string name="ec_calibrating">Calibrating…</string>
<string name="ec_calibrated">Calibrated [%s ms]</string>
<string name="no_echo">No echo</string>
<string name="failed">failed</string>
<string name="first_login_explanation">Enter your username and password to connect to the service.</string>
<string name="first_login_username">Username</string>
<string name="first_login_password">Password</string>
<string name="first_login_connect">Connect</string>
<string name="first_launch_no_login_password">Please enter your login and password</string>
<string name="first_launch_bad_login_password">Couldn\'t connect; check your login and password and start again</string>
<string name="pref_amr_summary">AMR codec might not be present on your phone</string>
<string name="pref_media_encryption">Media encryption</string>
<string name="media_encryption_none">None</string>
<string name="pref_video_codec_h264_unavailable">Codec disabled, build the app from source code to enable it</string>
<string name="pref_video_codec_mpeg4_unavailable">Codec disabled, build the app from source code to enable it</string>
<string name="pref_sipaccounts">SIP Accounts</string>
<string name="pref_wifi_only">Use wifi only</string>
<string name="pref_push_notification">Enable push notifications</string>
<string name="wizard_failed">An error occurred, try again later.</string>
<string name="wizard_server_unavailable">Server unreachable, verify your internet connection.</string>
<string name="wizard_username_unavailable">This username is already in use.</string>
<string name="wizard_username_incorrect">Your username is not valid.</string>
<string name="wizard_email_incorrect">Your email is not valid.</string>
<string name="wizard_password_incorrect">Your password is not valid (6 characters min).</string>
<string name="wizard_passwords_unmatched">Passwords entered are different.</string>
<string name="pref_help_proxy">SIP proxy hostname or ip address (optional)</string>
<string name="pref_help_outbound_proxy">Route all calls through SIP proxy</string>
<string name="pref_help_username">Example: john if your account is john@sip.example.org</string>
<string name="pref_help_domain">sip.example.org if your account is john@sip.example.org</string>
<string name="pref_help_password">You have to re-enter your password if you edit your username and/or the domain</string>
<string name="chat">Chat</string>
<string name="call">Call</string>
<string name="add_to_contacts">Add to contacts</string>
<string name="status_connected">Registered</string>
<string name="status_not_connected">Not Registered</string>
<string name="status_in_progress">Registration in progress</string>
<string name="status_error">Registration failed</string>
<string name="conference">Conference</string>
<string name="draft">Draft</string>
<string name="new_fast_chat">Enter a SIP address to chat with…</string>
<string name="no_call_history">No call in your history.</string>
<string name="no_missed_call_history">No missed call in your history.</string>
<string name="no_contact">No contact in your address book.</string>
<string name="no_sip_contact">No SIP contact in your address book.</string>
<string name="no_chat_history">No chat history.</string>
<string name="call_stats_audio">Audio</string>
<string name="call_stats_video">Video</string>
<string name="call_stats_codec">Codec:</string>
<string name="call_stats_upload">Upload bandwidth:</string>
<string name="call_stats_download">Download bandwidth:</string>
<string name="call_stats_ice">ICE connectivity:</string>
<string name="call_stats_video_resolution">Video size:</string>
<!--Used by Android to help blind people by describing them images-->
<string name="chat">Chat</string>
<string name="call">Call</string>
<string name="add_to_contacts">Add to contacts</string>
<string name="status_connected">Registered</string>
<string name="status_not_connected">Not Registered</string>
<string name="status_in_progress">Registration in progress</string>
<string name="status_error">Registration failed</string>
<string name="conference">Conference</string>
<string name="draft">Draft</string>
<string name="new_fast_chat">Enter a SIP address to chat with…</string>
<string name="no_call_history">No call in your history.</string>
<string name="no_missed_call_history">No missed call in your history.</string>
<string name="no_contact">No contact in your address book.</string>
<string name="no_sip_contact">No SIP contact in your address book.</string>
<string name="no_chat_history">No chat history.</string>
<string name="call_stats_audio">Audio</string>
<string name="call_stats_video">Video</string>
<string name="call_stats_codec">Codec:</string>
<string name="call_stats_upload">Upload bandwidth:</string>
<string name="call_stats_download">Download bandwidth:</string>
<string name="call_stats_ice">ICE connectivity:</string>
<string name="call_stats_video_resolution">Video size:</string>
<!--Used by Android to help blind people by describing them images-->
<string name="setup_password_hint">password</string>
<string name="setup_domain_hint">domain</string>
<string name="setup_email_hint">email</string>
<string name="setup_create">Create Account</string>
<string name="setup_validate_account">An email has been sent to the address you gave. In order to activate your account, you need to click on the link inside it. Once it is done, come back here and click on the button above.</string>
<string name="setup_check_account_validation">Check</string>
<string name="setup_account_not_validated">Your account has not been validated yet.</string>
<string name="setup_account_validated">Your account has been validated.</string>
<string name="button_history">History</string>
<string name="button_contacts">Contacts</string>
<string name="button_settings">Settings</string>
<string name="button_chat">Chat</string>
<string name="button_about">About</string>
<string name="button_setup_cancel">Cancel</string>
<string name="button_setup_back">Back</string>
<string name="button_setup_next">Let\'s go</string>
<string name="button_new_chat">New conversation</string>
<string name="button_edit">Edit</string>
<string name="button_cancel">Cancel</string>
<string name="button_ok">Okay</string>
<string name="button_back">Back</string>
<string name="button_all_contacts">All</string>
<string name="button_add_contact">New contact</string>
<string name="button_all_call">All</string>
<string name="button_missed_call">Missed</string>
<string name="button_delete_all">Delete</string>
<string name="button_transfer">Transfer</string>
<string name="button_add_call">Add call</string>
<string name="button_video">Video</string>
<string name="button_micro">Micro</string>
<string name="button_speaker">Speaker</string>
<string name="button_route">Route</string>
<string name="button_receiver">Receiver</string>
<string name="button_bluetooth">Bluetooth</string>
<string name="button_options">Options</string>
<string name="button_send_message">Send</string>
<string name="button_send_picture">Pic</string>
<string name="uploading_image">Uploading…</string>
<string name="call_update_title">Call update requested</string>
<string name="call_update_desc">Your correspondent would like to add video to the current call.</string>
<string name="call_update_yes">Accept</string>
<string name="call_update_no">Decline</string>
<string name="share_picture_size_small">Small</string>
<string name="share_picture_size_medium">Medium</string>
<string name="share_picture_size_large">Large</string>
<string name="share_picture_size_real">Real size</string>
<string name="save_picture">Save picture</string>
<string name="text_copied_to_clipboard">Text copied to clipboard</string>
<string name="copy_text">Copy text</string>
<string name="image_picker_title">Select source</string>
<string name="image_saved">Image saved</string>
<string name="image_not_saved">Error, image not saved</string>
<string name="pref_linphone_friend_title">Friends</string>
<string name="pref_auto_accept_friends_title">New friends</string>
<string name="pref_auto_accept_friends_desc">Automatically accept new friend requests</string>
<string name="linphone_friend_new_request_title">Friend request</string>
<string name="linphone_friend_new_request_desc">wants to share it\'s presence status with you and be aware of yours.</string>
<string name="setup_password_hint">password</string>
<string name="setup_domain_hint">domain</string>
<string name="setup_email_hint">email</string>
<string name="setup_create">Create Account</string>
<string name="setup_validate_account">An email has been sent to the address you gave. In order to activate your account, you need to click on the link inside it. Once it is done, come back here and click on the button above.</string>
<string name="setup_check_account_validation">Check</string>
<string name="setup_account_not_validated">Your account has not been validated yet.</string>
<string name="setup_account_validated">Your account has been validated.</string>
<string name="button_history">History</string>
<string name="button_contacts">Contacts</string>
<string name="button_settings">Settings</string>
<string name="button_chat">Chat</string>
<string name="button_about">About</string>
<string name="button_setup_cancel">Cancel</string>
<string name="button_setup_back">Back</string>
<string name="button_setup_next">Let\'s go</string>
<string name="button_new_chat">New conversation</string>
<string name="button_edit">Edit</string>
<string name="button_ok">Okay</string>
<string name="button_back">Back</string>
<string name="button_all_contacts">All</string>
<string name="button_add_contact">New contact</string>
<string name="button_all_call">All</string>
<string name="button_missed_call">Missed</string>
<string name="button_delete_all">Delete</string>
<string name="button_transfer">Transfer</string>
<string name="button_add_call">Add call</string>
<string name="button_video">Video</string>
<string name="button_micro">Micro</string>
<string name="button_speaker">Speaker</string>
<string name="button_route">Route</string>
<string name="button_receiver">Receiver</string>
<string name="button_bluetooth">Bluetooth</string>
<string name="button_options">Options</string>
<string name="button_send_message">Send</string>
<string name="button_send_picture">Pic</string>
<string name="uploading_image">Uploading…</string>
<string name="call_update_title">Call update requested</string>
<string name="call_update_desc">Your correspondent would like to add video to the current call.</string>
<string name="call_update_yes">Accept</string>
<string name="call_update_no">Decline</string>
<string name="share_picture_size_small">Small</string>
<string name="share_picture_size_medium">Medium</string>
<string name="share_picture_size_large">Large</string>
<string name="share_picture_size_real">Real size</string>
<string name="save_picture">Save picture</string>
<string name="text_copied_to_clipboard">Text copied to clipboard</string>
<string name="copy_text">Copy text</string>
<string name="image_picker_title">Select source</string>
<string name="image_saved">Image saved</string>
<string name="image_not_saved">Error, image not saved</string>
<string name="pref_linphone_friend_title">Friends</string>
<string name="pref_auto_accept_friends_title">New friends</string>
<string name="pref_auto_accept_friends_desc">Automatically accept new friend requests</string>
<string name="linphone_friend_new_request_title">Friend request</string>
<string name="linphone_friend_new_request_desc">wants to share it\'s presence status with you and be aware of yours.</string>
<string name="pref_image_sharing_server_title">Sharing server</string>
<string name="pref_remote_provisioning_title">Remote provisioning</string>
<string name="delete_contact">Delete</string>
<string name="delete_contact_dialog">This contact will be deleted.</string>
<string name="sip_address">SIP address</string>
<string name="phone_number">Phone number</string>
<string name="contact_first_name">First name</string>
<string name="contact_last_name">Last name</string>
<string name="pref_primary_account_title">Primary account</string>
<string name="pref_display_name_title">Display name</string>
<string name="pref_user_name_title">Username</string>
<string name="pref_expire_title">Expire</string>
<string name="pref_avpf">AVPF</string>
<string name="pref_avpf_rr_interval"> AVPF regular RTCP interval in seconds (between 1 and 5)</string>
<string name="pref_rfc2833_dtmf">Send RFC2833 DTMFs</string>
<string name="pref_sipinfo_dtmf">Send SIP INFO DTMFs</string>
<string name="pref_voice_mail">Voice mail uri</string>
<string name="voicemail_unread"> unread messages</string>
<string name="error_unknown">Unknown error</string>
<string name="error_call_declined">Call declined</string>
<string name="error_user_not_found">User not found</string>
<string name="error_incompatible_media">Incompatible media parameters</string>
<string name="error_low_bandwidth">Your correspondent has low bandwidth, video can\'t be started</string>
<string name="error_network_unreachable">Network is unreachable</string>
<string name="error_bad_credentials">Bad credentials</string>
<string name="error_unauthorized">Unauthorized</string>
<string name="error_io_error">Network error</string>
<string name="today">Today</string>
<string name="yesterday">Yesterday</string>
<string name="call_state_missed">Missed</string>
<string name="call_state_outgoing">Outgoing</string>
<string name="call_state_incoming">Incoming</string>
<string name="pref_background_mode">Background mode</string>
<string name="show_image">Show</string>
<string name="download_image">Download</string>
<string name="download_image_failed">Download failed. Please check your internet access or try again later.</string>
<string name="pref_auth_userid">Auth userid</string>
<string name="pref_help_auth_userid">Enter authentication userid (optionnal)</string>
<string name="pref_display_name">Display name</string>
<string name="pref_help_display_name">Enter display name (optionnal)</string>
<string name="pref_upnp_enable">Enable UPNP</string>
<string name="pref_manage">Manage</string>
<string name="wait">Please wait...</string>
<string name="importing_messages">Updating messages database</string>
<string name="default_account_flag">Default account</string>
<string name="setup_remote_provisioning_hint">This assistant will download an existing configuration.</string>
<string name="setup_remote_provisioning_url_hint">provisioning url</string>
<string name="setup_remote_provisioning_login_hint">The configuration you downloaded doesn\'t include your account. Please fill it in.</string>
<string name="setup_confirm_username">Your username will be %s.\r\n\r\nIt may differ from what you entered to match some requirements.\r\nDo you accept ?</string>
<string name="pref_image_sharing_server_title">Sharing server</string>
<string name="pref_remote_provisioning_title">Remote provisioning</string>
<string name="delete_contact">Delete</string>
<string name="delete_contact_dialog">This contact will be deleted.</string>
<string name="sip_address">SIP address</string>
<string name="phone_number">Phone number</string>
<string name="contact_first_name">First name</string>
<string name="contact_last_name">Last name</string>
<string name="pref_primary_account_title">Primary account</string>
<string name="pref_display_name_title">Display name</string>
<string name="pref_user_name_title">Username</string>
<string name="pref_expire_title">Expire</string>
<string name="pref_avpf">AVPF</string>
<string name="pref_avpf_rr_interval"> AVPF regular RTCP interval in seconds (between 1 and 5)</string>
<string name="pref_rfc2833_dtmf">Send RFC2833 DTMFs</string>
<string name="pref_sipinfo_dtmf">Send SIP INFO DTMFs</string>
<string name="pref_voice_mail">Voice mail uri</string>
<string name="voicemail_unread"> unread messages</string>
<string name="error_unknown">Unknown error</string>
<string name="error_call_declined">Call declined</string>
<string name="error_user_not_found">User not found</string>
<string name="error_incompatible_media">Incompatible media parameters</string>
<string name="error_low_bandwidth">Your correspondent has low bandwidth, video can\'t be started</string>
<string name="error_network_unreachable">Network is unreachable</string>
<string name="error_bad_credentials">Bad credentials</string>
<string name="error_unauthorized">Unauthorized</string>
<string name="error_io_error">Network error</string>
<string name="today">Today</string>
<string name="yesterday">Yesterday</string>
<string name="call_state_missed">Missed</string>
<string name="call_state_outgoing">Outgoing</string>
<string name="call_state_incoming">Incoming</string>
<string name="pref_background_mode">Background mode</string>
<string name="show_image">Show</string>
<string name="download_image">Download</string>
<string name="download_image_failed">Download failed. Please check your internet access or try again later.</string>
<string name="pref_auth_userid">Auth userid</string>
<string name="pref_help_auth_userid">Enter authentication userid (optionnal)</string>
<string name="pref_display_name">Display name</string>
<string name="pref_help_display_name">Enter display name (optionnal)</string>
<string name="pref_upnp_enable">Enable UPNP</string>
<string name="pref_manage">Manage</string>
<string name="wait">Please wait...</string>
<string name="importing_messages">Updating messages database</string>
<string name="default_account_flag">Default account</string>
<string name="setup_remote_provisioning_hint">This assistant will download an existing configuration.</string>
<string name="setup_remote_provisioning_url_hint">provisioning url</string>
<string name="setup_remote_provisioning_login_hint">The configuration you downloaded doesn\'t include your account. Please fill it in.</string>
<string name="setup_confirm_username">Your username will be %s.\r\n\r\nIt may differ from what you entered to match some requirements.\r\nDo you accept ?</string>
<string name="zrtp_accept">Accept</string>
<string name="zrtp_deny">Deny</string>
<string name="zrtp_help">You should only accept if you have the same code (see above) as your correspondent</string>
<string name="remote_composing">Remote is writing...</string>
<string name="unread_messages">%i unread messages</string>
<string name="retry">Retry</string>
<string name="remote_provisioning_failure">Failed to download or apply remote provisioning profile...</string>
<string name="remote_provisioning_again_title">Remote provisioning</string>
<string name="remote_provisioning_again_message">Do you want to change the provisioning URI ?</string>
<string name="processing_image">Processing image, can take up to a few seconds depending on the size of the file</string></resources>
<string name="zrtp_accept">Accept</string>
<string name="zrtp_deny">Deny</string>
<string name="zrtp_help">You should only accept if you have the same code (see above) as your correspondent</string>
<string name="remote_composing">Remote is writing...</string>
<string name="unread_messages">%i unread messages</string>
<string name="remote_provisioning_failure">Failed to download or apply remote provisioning profile...</string>
<string name="remote_provisioning_again_title">Remote provisioning</string>
<string name="remote_provisioning_again_message">Do you want to change the provisioning URI ?</string>
<string name="processing_image">Processing image, can take up to a few seconds depending on the size of the file</string></resources>

8
res/xml/preferences.xml
View file

@ -1,17 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<Preference
android:title="@string/menu_about"
android:key="@string/menu_about_key"/>
<PreferenceCategory
android:title="@string/pref_sipaccounts"
android:key="@string/pref_sipaccounts_key"/>
<Preference
android:title="@string/assistant_title"
android:key="@string/setup_key"/>
<Preference
android:title="@string/pref_add_account"

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

@ -207,6 +207,12 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
}
}
if(proxy == lc.getDefaultProxyConfig()){
displayMainAccount();
} else {
refreshAccounts();
}
if(state.equals(RegistrationState.RegistrationFailed) && newProxyConfig) {
newProxyConfig = false;
if (proxy.getError() == Reason.BadCredentials) {
@ -219,7 +225,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
displayCustomToast(getString(R.string.error_io_error), Toast.LENGTH_LONG);
}
}
initAccounts();
}
@Override
@ -1306,60 +1311,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
});
}
private void initAccounts() {
accountsList = (ListView) findViewById(R.id.accounts_list);
defaultAccount = (RelativeLayout) findViewById(R.id.default_account);
if (LinphoneManager.getLc().getDefaultProxyConfig() != null) {
defaultAccount.setVisibility(View.VISIBLE);
ImageView status = (ImageView)findViewById(R.id.status_led);
TextView address = (TextView) findViewById(R.id.address);
TextView displayName = (TextView) findViewById(R.id.display_name);
try {
LinphoneAddress identity = LinphoneCoreFactory.instance().createLinphoneAddress((LinphoneManager.getLc().getDefaultProxyConfig().getIdentity()));
address.setText(identity.asStringUriOnly());
if (identity.getDisplayName() != null) {
displayName.setText(identity.getDisplayName());
} else if (identity.getUserName() != null) {
displayName.setText(identity.getUserName());
} else {
displayName.setText("");
}
} catch (Exception e) {
e.printStackTrace();
}
status.setImageResource(getStatusIconResource(LinphoneManager.getLc().getDefaultProxyConfig().getState()));
defaultAccount.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
LinphoneActivity.instance().displayAccountSettings(LinphonePreferences.instance().getDefaultAccountIndex());
openOrCloseSideMenu(false);
}
});
} else {
defaultAccount.setVisibility(View.GONE);
}
if(LinphoneManager.getLc().getProxyConfigList().length > 1) {
accountsList.setVisibility(View.VISIBLE);
accountsList.setAdapter(new AccountsListAdapter());
accountsList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
int position = Integer.parseInt(view.getTag().toString());
LinphoneActivity.instance().displayAccountSettings(position);
openOrCloseSideMenu(false);
}
});
} else {
accountsList.setVisibility(View.GONE);
}
}
private int getStatusIconResource(LinphoneCore.RegistrationState state) {
try {
LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
@ -1379,6 +1330,58 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
return R.drawable.led_disconnected;
}
private void displayMainAccount(){
defaultAccount.setVisibility(View.VISIBLE);
defaultAccount = (RelativeLayout) findViewById(R.id.default_account);
ImageView status = (ImageView) defaultAccount.findViewById(R.id.status_led);
TextView address = (TextView) defaultAccount.findViewById(R.id.address);
TextView displayName = (TextView) defaultAccount.findViewById(R.id.display_name);
LinphoneProxyConfig proxy = LinphoneManager.getLc().getDefaultProxyConfig();
address.setText(proxy.getAddress().asStringUriOnly());
displayName.setText(LinphoneUtils.getAddressDisplayName(proxy.getAddress()));
status.setImageResource(getStatusIconResource(proxy.getState()));
defaultAccount.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
LinphoneActivity.instance().displayAccountSettings(LinphonePreferences.instance().getDefaultAccountIndex());
openOrCloseSideMenu(false);
}
});
}
private void refreshAccounts(){
if(LinphoneManager.getLc().getProxyConfigList().length > 1) {
accountsList.setVisibility(View.VISIBLE);
accountsList.setAdapter(new AccountsListAdapter());
accountsList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
int position = Integer.parseInt(view.getTag().toString());
LinphoneActivity.instance().displayAccountSettings(position);
openOrCloseSideMenu(false);
}
});
} else {
accountsList.setVisibility(View.GONE);
}
}
private void initAccounts() {
accountsList = (ListView) findViewById(R.id.accounts_list);
defaultAccount = (RelativeLayout) findViewById(R.id.default_account);
if (LinphoneManager.getLc().getDefaultProxyConfig() != null) {
displayMainAccount();
} else {
defaultAccount.setVisibility(View.GONE);
}
refreshAccounts();
}
class AccountsListAdapter extends BaseAdapter {
List<LinphoneProxyConfig> proxy_list;
@ -1425,12 +1428,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
TextView address = (TextView) view.findViewById(R.id.address);
String sipAddress = lpc.getAddress().asStringUriOnly();
try {
LinphoneAddress identity = LinphoneCoreFactory.instance().createLinphoneAddress(lpc.getIdentity());
address.setText(identity.asStringUriOnly());
} catch (Exception e) {
e.printStackTrace();
}
address.setText(sipAddress);
int nbAccounts = LinphonePreferences.instance().getAccountCount();
int accountIndex = 0;

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

@ -458,13 +458,10 @@ public class LinphonePreferences {
}
public String getAccountDisplayName(int n) {
try {
LinphoneAddress addr = LinphoneCoreFactory.instance().createLinphoneAddress(getProxyConfig(n).getIdentity());
LinphoneAddress addr = getProxyConfig(n).getAddress();
if(addr != null) {
return addr.getDisplayName();
} catch (Exception e) {
e.printStackTrace();
}
return null;
}

56
src/org/linphone/LinphoneUtils.java
View file

@ -29,8 +29,10 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.MalformedURLException;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collection;
import java.util.List;
import java.util.zip.ZipEntry;
@ -99,6 +101,28 @@ public final class LinphoneUtils {
return isSipAddress(numberOrAddress) && numberOrAddress.startsWith("sip:");
}
public static String getAddressDisplayName(String uri){
LinphoneAddress lAddress;
try {
lAddress = LinphoneCoreFactory.instance().createLinphoneAddress(uri);
return getAddressDisplayName(lAddress);
} catch (LinphoneCoreException e) {
return null;
}
}
public static String getAddressDisplayName(LinphoneAddress address){
if(address.getDisplayName() != null) {
return address.getDisplayName();
} else {
if(address.getUserName() != null){
return address.getUserName();
} else {
return address.asStringUriOnly();
}
}
}
public static String getUsernameFromAddress(String address) {
if (address.contains("sip:"))
address = address.replace("sip:", "");
@ -120,6 +144,38 @@ public final class LinphoneUtils {
return true;
}
public static String timestampToHumanDate(Context context, long timestamp, String format) {
try {
Calendar cal = Calendar.getInstance();
cal.setTimeInMillis(timestamp);
SimpleDateFormat dateFormat;
if (isToday(cal)) {
dateFormat = new SimpleDateFormat(context.getResources().getString(R.string.today_date_format));
} else {
dateFormat = new SimpleDateFormat(format);
}
return dateFormat.format(cal.getTime());
} catch (NumberFormatException nfe) {
return String.valueOf(timestamp);
}
}
static boolean isToday(Calendar cal) {
return isSameDay(cal, Calendar.getInstance());
}
static boolean isSameDay(Calendar cal1, Calendar cal2) {
if (cal1 == null || cal2 == null) {
return false;
}
return (cal1.get(Calendar.ERA) == cal2.get(Calendar.ERA) &&
cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) &&
cal1.get(Calendar.DAY_OF_YEAR) == cal2.get(Calendar.DAY_OF_YEAR));
}
public static boolean onKeyVolumeAdjust(int keyCode) {
if (!((keyCode == KeyEvent.KEYCODE_VOLUME_UP || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)
&& (Hacks.needSoftvolume())|| Build.VERSION.SDK_INT >= 15)) {

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

@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import java.util.ArrayList;
import java.util.List;
import org.linphone.assistant.AssistantActivity;
import org.linphone.core.LinphoneAddress;
import org.linphone.core.LinphoneCore;
import org.linphone.core.LinphoneCore.AdaptiveRateAlgorithm;
@ -39,7 +38,6 @@ import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
import org.linphone.ui.LedPreference;
import org.linphone.ui.PreferencesListFragment;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
import android.preference.CheckBoxPreference;
@ -55,7 +53,6 @@ import android.preference.PreferenceScreen;
* @author Sylvain Berfini
*/
public class SettingsFragment extends PreferencesListFragment {
private static final int WIZARD_INTENT = 1;
private LinphonePreferences mPrefs;
private Handler mHandler = new Handler();
private LinphoneCoreListenerBase mListener;
@ -110,25 +107,6 @@ public class SettingsFragment extends PreferencesListFragment {
initNetworkSettings();
initAdvancedSettings();
// Add action on About button
findPreference(getString(R.string.menu_about_key)).setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
if (LinphoneActivity.isInstanciated()) {
LinphoneActivity.instance().displayAbout();
return true;
}
return false;
}
});
findPreference(getString(R.string.setup_key)).setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
Intent intent = new Intent(LinphoneService.instance(), AssistantActivity.class);
startActivityForResult(intent, WIZARD_INTENT);
return true;
}
});
findPreference(getString(R.string.pref_add_account_key)).setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
@ -155,10 +133,6 @@ public class SettingsFragment extends PreferencesListFragment {
emptyAndHidePreference(R.string.pref_sipaccounts_key);
}
if (getResources().getBoolean(R.bool.hide_wizard)){
hidePreference(R.string.setup_key);
}
if(!getResources().getBoolean(R.bool.replace_wizard_with_old_interface)){
hidePreference(R.string.pref_add_account_key);
}
@ -1054,9 +1028,6 @@ public class SettingsFragment extends PreferencesListFragment {
if (LinphoneActivity.isInstanciated()) {
LinphoneActivity.instance().selectMenu(FragmentsAvailable.SETTINGS);
if (getResources().getBoolean(R.bool.show_statusbar_only_on_dialer)) {
LinphoneActivity.instance().hideStatusBar();
}
}
}
}