AuthenticatorActivity is bound to OperationsService when created

diff --git a/res/values/strings.xml b/res/values/strings.xml
index a73f906..65c0dbc 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,257 +1,269 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 

-    <string name="about_android">%1$s Android App</string>
-    <string name="about_version">version %1$s</string>
-    <string name="actionbar_sync">Refresh account</string>
-    <string name="actionbar_upload">Upload</string>
-    <string name="actionbar_upload_from_apps">Content from other apps</string>
-    <string name="actionbar_upload_files">Files</string>
-    <string name="actionbar_open_with">Open with</string>
-    <string name="actionbar_mkdir">Create directory</string>
-    <string name="actionbar_settings">Settings</string>
-    <string name="actionbar_see_details">Details</string>
-    <string name="actionbar_send_file">Send</string>
-    <string name="prefs_category_general">General</string>
-    <string name="prefs_category_more">More</string>
-    <string name="prefs_accounts">Accounts</string>
-    <string name="prefs_manage_accounts">Manage Accounts</string>
-    <string name="prefs_pincode">App PIN</string>
-    <string name="prefs_pincode_summary">Protect your client</string>
-    <string name="prefs_instant_upload">Enable instant uploads</string>
-    <string name="prefs_instant_upload_summary">Instantly upload photos taken by camera</string>
-    <string name="prefs_log_title">Enable Logging</string>
-    <string name="prefs_log_summary">This is used to log problems</string>
-    <string name="prefs_log_title_history">Logging History</string>
-    <string name="prefs_log_summary_history">This shows the recorded logs</string>
-    <string name="prefs_log_delete_history_button">Delete History</string>
-    <string name="prefs_help">Help</string>
-    <string name="prefs_recommend">Recommend to a friend</string>
-    <string name="prefs_feedback">Feedback</string>
-    <string name="prefs_imprint">Imprint</string>
-    
+       <string name="about_android">%1$s Android App</string>
+       <string name="about_version">version %1$s</string>
+       <string name="actionbar_sync">Refresh account</string>
+       <string name="actionbar_upload">Upload</string>
+       <string name="actionbar_upload_from_apps">Content from other apps</string>
+       <string name="actionbar_upload_files">Files</string>
+       <string name="actionbar_open_with">Open with</string>
+       <string name="actionbar_mkdir">Create directory</string>
+       <string name="actionbar_settings">Settings</string>
+       <string name="actionbar_see_details">Details</string>
+       <string name="actionbar_send_file">Send</string>
+       <string name="prefs_category_general">General</string>
+       <string name="prefs_category_more">More</string>
+       <string name="prefs_accounts">Accounts</string>
+       <string name="prefs_manage_accounts">Manage Accounts</string>
+       <string name="prefs_pincode">App PIN</string>
+       <string name="prefs_pincode_summary">Protect your client</string>
+       <string name="prefs_instant_upload">Enable instant uploads</string>
+       <string name="prefs_instant_upload_summary">Instantly upload photos taken by camera</string>
+       <string name="prefs_log_title">Enable Logging</string>
+       <string name="prefs_log_summary">This is used to log problems</string>
+       <string name="prefs_log_summary_history">This shows the recorded logs</string>
+       <string name="prefs_log_delete_history_button">Delete History</string>
+       <string name="prefs_help">Help</string>
+       <string name="prefs_recommend">Recommend to a friend</string>
+       <string name="prefs_feedback">Feedback</string>
+       <string name="prefs_imprint">Imprint</string>
+

        <string name="recommend_subject">"Try %1$s on your smartphone!"</string>
        <string name="recommend_subject">"Try %1$s on your smartphone!"</string>

-       <string name="recommend_text">"I want to invite you to use %1$s on your smartphone!\nDownload here: %2$s"</string>  
+       <string name="recommend_text">"I want to invite you to use %1$s on your smartphone!\nDownload here: %2$s"
+       </string>

 
 

-    <string name="auth_check_server">Check Server</string>
-    <string name="auth_host_url">Server address https://…</string>
-    <string name="auth_username">Username</string>
-    <string name="auth_password">Password</string>
-    <string name="auth_register">New to %1$s?</string>
-    <string name="sync_string_files">Files</string>
-    <string name="setup_btn_connect">Connect</string>
-    <string name="uploader_btn_upload_text">Upload</string>
-    <string name="uploader_top_message">Choose upload directory:</string>
-    <string name="uploader_wrn_no_account_title">No account found</string>
-    <string name="uploader_wrn_no_account_text">There are no %1$s accounts on your device. Please setup an account first.</string>
-    <string name="uploader_wrn_no_account_setup_btn_text">Setup</string>
-    <string name="uploader_wrn_no_account_quit_btn_text">Quit</string>
-    <string name="uploader_wrn_no_content_title">No content to upload</string>
-    <string name="uploader_wrn_no_content_text">No content was received. Nothing to upload.</string>
-    <string name="uploader_error_forbidden_content">%1$s is not allowed to access the shared content</string>
-    <string name="uploader_info_uploading">Uploading</string>
-    <string name="file_list_empty">There are no files in this folder.\nNew files can be added with the \"Upload\" menu option.</string>
-    <string name="filedetails_select_file">Tap on a file to display additional information.</string>
-    <string name="filedetails_size">Size:</string>
-    <string name="filedetails_type">Type:</string>
-    <string name="filedetails_created">Created:</string>
-    <string name="filedetails_modified">Modified:</string>
-    <string name="filedetails_download">Download</string>
-    <string name="filedetails_sync_file">Refresh file</string>
-    <string name="filedetails_renamed_in_upload_msg">File was renamed to %1$s during upload</string>
-    <string name="action_share_file">Share link</string>
-    <string name="action_unshare_file">Unshare link</string>
-    <string name="common_yes">Yes</string>
-    <string name="common_no">No</string>
-    <string name="common_ok">OK</string>
-    <string name="common_cancel_download">Cancel download</string>
-    <string name="common_cancel_upload">Cancel upload</string>
-    <string name="common_cancel">Cancel</string>
-    <string name="common_save_exit">Save &amp; Exit</string>
-    <string name="common_error">Error</string>
-    <string name="common_loading">Loading &#8230;</string>
-    <string name="common_error_unknown">Unknown error</string>
-    <string name="about_title">About</string>
-    <string name="change_password">Change password</string>
-    <string name="delete_account">Delete account</string>
-    <string name="create_account">Create account</string>
-    <string name="upload_chooser_title">Upload from &#8230;</string>
-    <string name="uploader_info_dirname">Directory name</string>
-    <string name="uploader_upload_in_progress_ticker">Uploading &#8230;</string>
-    <string name="uploader_upload_in_progress_content">%1$d%% Uploading %2$s</string>
-    <string name="uploader_upload_succeeded_ticker">Upload succeeded</string>
-    <string name="uploader_upload_succeeded_content_single">%1$s was successfully uploaded</string>
-    <string name="uploader_upload_failed_ticker">Upload failed</string>
-    <string name="uploader_upload_failed_content_single">Upload of %1$s could not be completed</string>
-    <string name="downloader_download_in_progress_ticker">Downloading &#8230;</string>
-    <string name="downloader_download_in_progress_content">%1$d%% Downloading %2$s</string>
-    <string name="downloader_download_succeeded_ticker">Download succeeded</string>
-    <string name="downloader_download_succeeded_content">%1$s was successfully downloaded</string>
-    <string name="downloader_download_failed_ticker">Download failed</string>
-    <string name="downloader_download_failed_content">Download of %1$s could not be completed</string>
-    <string name="downloader_not_downloaded_yet">Not downloaded yet</string>
-    <string name="common_choose_account">Choose account</string>
-    <string name="sync_fail_ticker">Synchronization failed</string>
-    <string name="sync_fail_content">Synchronization of %1$s could not be completed</string>
-    <string name="sync_fail_content_unauthorized">Invalid password for %1$s</string>
+       <string name="auth_check_server">Check Server</string>
+       <string name="auth_host_url">Server address https://…</string>
+       <string name="auth_username">Username</string>
+       <string name="auth_password">Password</string>
+       <string name="auth_register">New to %1$s?</string>
+       <string name="sync_string_files">Files</string>
+       <string name="setup_btn_connect">Connect</string>
+       <string name="uploader_btn_upload_text">Upload</string>
+       <string name="uploader_top_message">Choose upload directory:</string>
+       <string name="uploader_wrn_no_account_title">No account found</string>
+       <string name="uploader_wrn_no_account_text">There are no %1$s accounts on your device. Please setup an account first.
+       </string>
+       <string name="uploader_wrn_no_account_setup_btn_text">Setup</string>
+       <string name="uploader_wrn_no_account_quit_btn_text">Quit</string>
+       <string name="uploader_wrn_no_content_title">No content to upload</string>
+       <string name="uploader_wrn_no_content_text">No content was received. Nothing to upload.</string>
+       <string name="uploader_error_forbidden_content">%1$s is not allowed to access the shared content</string>
+       <string name="uploader_info_uploading">Uploading</string>
+       <string name="file_list_empty">There are no files in this folder.\nNew files can be added with the \"Upload\"
+               menu option.</string>
+       <string name="filedetails_select_file">Tap on a file to display additional information.</string>
+       <string name="filedetails_size">Size:</string>
+       <string name="filedetails_type">Type:</string>
+       <string name="filedetails_created">Created:</string>
+       <string name="filedetails_modified">Modified:</string>
+       <string name="filedetails_download">Download</string>
+       <string name="filedetails_sync_file">Refresh file</string>
+       <string name="filedetails_renamed_in_upload_msg">File was renamed to %1$s during upload</string>
+       <string name="action_share_file">Share link</string>
+       <string name="action_unshare_file">Unshare link</string>
+       <string name="common_yes">Yes</string>
+       <string name="common_no">No</string>
+       <string name="common_ok">OK</string>
+       <string name="common_cancel_download">Cancel download</string>
+       <string name="common_cancel_upload">Cancel upload</string>
+       <string name="common_cancel">Cancel</string>
+       <string name="common_save_exit">Save &amp; Exit</string>
+       <string name="common_error">Error</string>
+       <string name="common_loading">Loading &#8230;</string>
+       <string name="common_error_unknown">Unknown error</string>
+       <string name="about_title">About</string>
+       <string name="change_password">Change password</string>
+       <string name="delete_account">Delete account</string>
+       <string name="create_account">Create account</string>
+       <string name="upload_chooser_title">Upload from &#8230;</string>
+       <string name="uploader_info_dirname">Directory name</string>
+       <string name="uploader_upload_in_progress_ticker">Uploading &#8230;</string>
+       <string name="uploader_upload_in_progress_content">%1$d%% Uploading %2$s</string>
+       <string name="uploader_upload_succeeded_ticker">Upload succeeded</string>
+       <string name="uploader_upload_succeeded_content_single">%1$s was successfully uploaded</string>
+       <string name="uploader_upload_failed_ticker">Upload failed</string>
+       <string name="uploader_upload_failed_content_single">Upload of %1$s could not be completed</string>
+       <string name="downloader_download_in_progress_ticker">Downloading &#8230;</string>
+       <string name="downloader_download_in_progress_content">%1$d%% Downloading %2$s</string>
+       <string name="downloader_download_succeeded_ticker">Download succeeded</string>
+       <string name="downloader_download_succeeded_content">%1$s was successfully downloaded</string>
+       <string name="downloader_download_failed_ticker">Download failed</string>
+       <string name="downloader_download_failed_content">Download of %1$s could not be completed</string>
+       <string name="downloader_not_downloaded_yet">Not downloaded yet</string>
+       <string name="common_choose_account">Choose account</string>
+       <string name="sync_fail_ticker">Synchronization failed</string>
+       <string name="sync_fail_content">Synchronization of %1$s could not be completed</string>
+       <string name="sync_fail_content_unauthorized">Invalid password for %1$s</string>

        <string name="sync_conflicts_in_favourites_ticker">Conflicts found</string>
        <string name="sync_conflicts_in_favourites_content">%1$d kept-in-sync files could not be sync\'ed</string>
        <string name="sync_conflicts_in_favourites_ticker">Conflicts found</string>
        <string name="sync_conflicts_in_favourites_content">%1$d kept-in-sync files could not be sync\'ed</string>

-    <string name="sync_fail_in_favourites_ticker">Kept-in-sync files failed</string>
-    <string name="sync_fail_in_favourites_content">Contents of %1$d files could not be sync\'ed (%2$d conflicts)</string>
-    <string name="sync_foreign_files_forgotten_ticker">Some local files were forgotten</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d files out of the %2$s directory could not be copied into</string>
-    <string name="sync_foreign_files_forgotten_explanation">As of version 1.3.16, files uploaded from this device are copied into the local %1$s folder to prevent data loss when a single file is synced with multiple accounts.\n\nDue to this change, all files uploaded in previous versions of this app were copied into the %2$s folder. However, an error prevented the completion of this operation during account synchronization. You may either leave the file(s) as is and remove the link to %3$s, or move the file(s) into the %1$s directory and retain the link to %4$s.\n\nListed below are the local file(s), and the remote file(s) in %5$s they were linked to.</string>
-       <string name="sync_current_folder_was_removed">Folder %1$s does not exist anymore</string>    
-    <string name="foreign_files_move">"Move all"</string>
-    <string name="foreign_files_success">"All files were moved"</string>
-    <string name="foreign_files_fail">"Some files could not be moved"</string>
-    <string name="foreign_files_local_text">"Local: %1$s"</string>
-    <string name="foreign_files_remote_text">"Remote: %1$s"</string>
-    <string name="upload_query_move_foreign_files">There is not space enough to copy the selected files into the %1$s folder. Would like to move them into instead? </string>
-    <string name="pincode_enter_pin_code">Please, insert your App PIN</string>
-    <string name="pincode_configure_your_pin">Enter your App PIN</string>
-    <string name="pincode_configure_your_pin_explanation">The PIN will be requested every time the app is started</string>
-    <string name="pincode_reenter_your_pincode">Please, reenter your App PIN</string>
-    <string name="pincode_remove_your_pincode">Remove your App PIN</string>
-    <string name="pincode_mismatch">The App PINs are not the same</string>
-    <string name="pincode_wrong">Incorrect App PIN</string>
-    <string name="pincode_removed">App PIN removed</string>
-    <string name="pincode_stored">App PIN stored</string>
-    
-    <string name="media_notif_ticker">"%1$s music player"</string>
-    <string name="media_state_playing">"%1$s (playing)"</string>
-    <string name="media_state_loading">"%1$s (loading)"</string>
-    <string name="media_event_done">"%1$s playback finished"</string>
-    <string name="media_err_nothing_to_play">No media file found</string>
+       <string name="sync_fail_in_favourites_ticker">Kept-in-sync files failed</string>
+       <string name="sync_fail_in_favourites_content">Contents of %1$d files could not be sync\'ed (%2$d conflicts)</string>
+       <string name="sync_foreign_files_forgotten_ticker">Some local files were forgotten</string>
+       <string name="sync_foreign_files_forgotten_content">%1$d files out of the %2$s directory could not be copied into</string>
+       <string name="sync_foreign_files_forgotten_explanation">As of version 1.3.16, files uploaded from this device are copied into the local
+               %1$s folder to prevent data loss when a single file is synced with multiple accounts.\n\nDue to
+               this change, all files uploaded in previous versions of this app were copied into the %2$s folder.
+               However, an error prevented the completion of this operation during account synchronization. You
+               may either leave the file(s) as is and remove the link to %3$s, or move the file(s) into the %1$s
+               directory and retain the link to %4$s.\n\nListed below are the local file(s), and the remote
+               file(s) in %5$s they were linked to.</string>
+       <string name="sync_current_folder_was_removed">Folder %1$s does not exist anymore</string>
+       <string name="foreign_files_move">"Move all"</string>
+       <string name="foreign_files_success">"All files were moved"</string>
+       <string name="foreign_files_fail">"Some files could not be moved"</string>
+       <string name="foreign_files_local_text">"Local: %1$s"</string>
+       <string name="foreign_files_remote_text">"Remote: %1$s"</string>
+       <string name="upload_query_move_foreign_files">There is not space enough to copy the selected files into the %1$s folder.
+               Would like to move them into instead? </string>
+       <string name="pincode_enter_pin_code">Please, insert your App PIN</string>
+       <string name="pincode_configure_your_pin">Enter your App PIN</string>
+       <string name="pincode_configure_your_pin_explanation">The PIN will be requested every time the app is started</string>
+       <string name="pincode_reenter_your_pincode">Please, reenter your App PIN</string>
+       <string name="pincode_remove_your_pincode">Remove your App PIN</string>
+       <string name="pincode_mismatch">The App PINs are not the same</string>
+       <string name="pincode_wrong">Incorrect App PIN</string>
+       <string name="pincode_removed">App PIN removed</string>
+       <string name="pincode_stored">App PIN stored</string>
+
+       <string name="media_notif_ticker">"%1$s music player"</string>
+       <string name="media_state_playing">"%1$s (playing)"</string>
+       <string name="media_state_loading">"%1$s (loading)"</string>
+       <string name="media_event_done">"%1$s playback finished"</string>
+       <string name="media_err_nothing_to_play">No media file found</string>

        <string name="media_err_no_account">No account provided</string>
        <string name="media_err_no_account">No account provided</string>

-    <string name="media_err_not_in_owncloud">File not in a valid account</string>
-    <string name="media_err_unsupported">Unsupported media codec</string>
-    <string name="media_err_io">Media file could not be read</string>
-    <string name="media_err_malformed">Media file not correctly encoded</string>
-    <string name="media_err_timeout">Timed out while trying to play</string>
-    <string name="media_err_invalid_progressive_playback">Media file cannot be streamed</string>
-    <string name="media_err_unknown">Media file cannot be played with the stock media player</string>
-    <string name="media_err_security_ex">Security error trying to play %1$s</string>
+       <string name="media_err_not_in_owncloud">File not in a valid account</string>
+       <string name="media_err_unsupported">Unsupported media codec</string>
+       <string name="media_err_io">Media file could not be read</string>
+       <string name="media_err_malformed">Media file not correctly encoded</string>
+       <string name="media_err_timeout">Timed out while trying to play</string>
+       <string name="media_err_invalid_progressive_playback">Media file cannot be streamed</string>
+       <string name="media_err_unknown">Media file cannot be played with the stock media player</string>
+       <string name="media_err_security_ex">Security error trying to play %1$s</string>

        <string name="media_err_io_ex">Input error trying to play %1$s</string>
        <string name="media_err_unexpected">Unexpected error trying to play %1$s</string>
        <string name="media_rewind_description">Rewind button</string>
        <string name="media_play_pause_description">Play or pause button</string>
        <string name="media_forward_description">Fast forward button</string>
 
        <string name="media_err_io_ex">Input error trying to play %1$s</string>
        <string name="media_err_unexpected">Unexpected error trying to play %1$s</string>
        <string name="media_rewind_description">Rewind button</string>
        <string name="media_play_pause_description">Play or pause button</string>
        <string name="media_forward_description">Fast forward button</string>
 

-    <string name="auth_trying_to_login">Trying to login&#8230;</string>
-    <string name="auth_no_net_conn_title">No network connection</string>
-    <string name="auth_nossl_plain_ok_title">Secure connection unavailable.</string>
-    <string name="auth_connection_established">Connection established</string>
-    <string name="auth_testing_connection">Testing connection&#8230;</string>
-    <string name="auth_not_configured_title">Malformed server configuration</string>
-    <string name="auth_account_not_new">An account for the same user and server already exists in the device</string>
-    <string name="auth_account_not_the_same">The entered user does not match the user of this account</string>
-    <string name="auth_unknown_error_title">Unknown error occurred!</string>
-    <string name="auth_unknown_host_title">Couldn\'t find host</string>
-    <string name="auth_incorrect_path_title">Server instance not found</string>
-    <string name="auth_timeout_title">The server took too long to respond</string>
-    <string name="auth_incorrect_address_title">Malformed URL</string>
-    <string name="auth_ssl_general_error_title">SSL initialization failed</string>
-    <string name="auth_ssl_unverified_server_title">Couldn\'t verify SSL server\'s identity</string>
-    <string name="auth_bad_oc_version_title">Unrecognized server version</string>
-    <string name="auth_wrong_connection_title">Couldn\'t establish connection</string>
-    <string name="auth_secure_connection">Secure connection established</string>
-    <string name="auth_unauthorized">Wrong username or password</string>
+       <string name="auth_trying_to_login">Trying to login&#8230;</string>
+       <string name="auth_no_net_conn_title">No network connection</string>
+       <string name="auth_nossl_plain_ok_title">Secure connection unavailable.</string>
+       <string name="auth_connection_established">Connection established</string>
+       <string name="auth_testing_connection">Testing connection&#8230;</string>
+       <string name="auth_not_configured_title">Malformed server configuration</string>
+       <string name="auth_account_not_new">An account for the same user and server already exists in the device</string>
+       <string name="auth_account_not_the_same">The entered user does not match the user of this account</string>
+       <string name="auth_unknown_error_title">Unknown error occurred!</string>
+       <string name="auth_unknown_host_title">Couldn\'t find host</string>
+       <string name="auth_incorrect_path_title">Server instance not found</string>
+       <string name="auth_timeout_title">The server took too long to respond</string>
+       <string name="auth_incorrect_address_title">Malformed URL</string>
+       <string name="auth_ssl_general_error_title">SSL initialization failed</string>
+       <string name="auth_ssl_unverified_server_title">Couldn\'t verify SSL server\'s identity</string>
+       <string name="auth_bad_oc_version_title">Unrecognized server version</string>
+       <string name="auth_wrong_connection_title">Couldn\'t establish connection</string>
+       <string name="auth_secure_connection">Secure connection established</string>
+       <string name="auth_unauthorized">Wrong username or password</string>

        <string name="auth_oauth_error">Unsuccessful authorization</string>
        <string name="auth_oauth_error_access_denied">Access denied by authorization server</string>
        <string name="auth_oauth_error">Unsuccessful authorization</string>
        <string name="auth_oauth_error_access_denied">Access denied by authorization server</string>

-    <string name="auth_wtf_reenter_URL">Unexpected state; please, enter the server URL again</string>
-    <string name="auth_expired_oauth_token_toast">Your authorization expired. Please, authorize again</string>
-    <string name="auth_expired_basic_auth_toast">Please, enter the current password</string>
-    <string name="auth_expired_saml_sso_token_toast">Your session expired. Please connect again</string>
+       <string name="auth_wtf_reenter_URL">Unexpected state; please, enter the server URL again</string>
+       <string name="auth_expired_oauth_token_toast">Your authorization expired. Please, authorize again</string>
+       <string name="auth_expired_basic_auth_toast">Please, enter the current password</string>
+       <string name="auth_expired_saml_sso_token_toast">Your session expired. Please connect again</string>

        <string name="auth_connecting_auth_server">Connecting to authentication server…</string>
        <string name="auth_connecting_auth_server">Connecting to authentication server…</string>

-       <string name="auth_unsupported_auth_method">The server does not support this authentication method</string>    
+       <string name="auth_unsupported_auth_method">The server does not support this authentication method</string>

        <string name="auth_unsupported_multiaccount">%1$s does not support multiple accounts</string>
        <string name="auth_unsupported_multiaccount">%1$s does not support multiple accounts</string>

-       <string name="auth_fail_get_user_name">Your server is not returning a correct user id, please contact an administrator</string>
+       <string name="auth_fail_get_user_name">Your server is not returning a correct user id, please contact an administrator
+       </string>

        <string name="auth_can_not_auth_against_server">Can not authenticate against this server</string>
        <string name="auth_can_not_auth_against_server">Can not authenticate against this server</string>

-    
-    <string name="fd_keep_in_sync">Keep file up to date</string>
-    <string name="common_rename">Rename</string>
-    <string name="common_remove">Remove</string>
-    <string name="confirmation_remove_alert">"Do you really want to remove %1$s ?"</string>
-    <string name="confirmation_remove_folder_alert">"Do you really want to remove %1$s and its contents ?"</string>
-    <string name="confirmation_remove_local">Local only</string>
-    <string name="confirmation_remove_folder_local">Local contents only</string>
-    <string name="confirmation_remove_remote">Remove from server</string>
-    <string name="confirmation_remove_remote_and_local">Remote and local</string>
-    <string name="remove_success_msg">"Removal succeeded"</string>
-    <string name="remove_fail_msg">"Removal failed"</string>
-    <string name="rename_dialog_title">Enter a new name</string>
-    <string name="rename_local_fail_msg">"Local copy could not be renamed; try a different name"</string>
-    <string name="rename_server_fail_msg">"Rename could not be completed"</string>
-    <string name="sync_file_fail_msg">Remote file could not be checked</string>
-    <string name="sync_file_nothing_to_do_msg">File contents already synchronized</string>
-    <string name="create_dir_fail_msg">Directory could not be created</string>
-    <string name="filename_forbidden_characters">Forbidden characters: / \\ &lt; &gt; : " | ? *</string>
-    <string name="wait_a_moment">Wait a moment</string>
-    <string name="filedisplay_unexpected_bad_get_content">"Unexpected problem ; please select the file from a different app"</string>
-    <string name="filedisplay_no_file_selected">No file was selected</string>
-    <string name="activity_chooser_title">Send link to &#8230;</string>
-    
-    <string name="oauth_check_onoff">Login with oAuth2</string> 
-    <string name="oauth_login_connection">Connecting to oAuth2 server…</string>    
-        
-    <string name="ssl_validator_header">The identity of the site could not be verified</string>
-    <string name="ssl_validator_reason_cert_not_trusted">- The server certificate is not trusted</string>
-    <string name="ssl_validator_reason_cert_expired">- The server certificate expired</string>
-    <string name="ssl_validator_reason_cert_not_yet_valid">- The server certificate valid dates are in the future</string>
-    <string name="ssl_validator_reason_hostname_not_verified">- The URL does not match the hostname in the certificate</string>
-    <string name="ssl_validator_question">Do you want to trust this certificate anyway?</string>
-    <string name="ssl_validator_not_saved">The certificate could not be saved</string>
-    <string name="ssl_validator_btn_details_see">Details</string>
-    <string name="ssl_validator_btn_details_hide">Hide</string>
-    <string name="ssl_validator_label_subject">Issued to:</string>
-    <string name="ssl_validator_label_issuer">Issued by:</string>
-    <string name="ssl_validator_label_CN">Common name:</string>
-    <string name="ssl_validator_label_O">Organization:</string>
-    <string name="ssl_validator_label_OU">Organizational unit:</string>
-    <string name="ssl_validator_label_C">Country:</string>
-    <string name="ssl_validator_label_ST">State:</string>
-    <string name="ssl_validator_label_L">Location:</string>
-    <string name="ssl_validator_label_validity">Validity:</string>
-    <string name="ssl_validator_label_validity_from">From:</string>
+
+       <string name="fd_keep_in_sync">Keep file up to date</string>
+       <string name="common_rename">Rename</string>
+       <string name="common_remove">Remove</string>
+       <string name="confirmation_remove_alert">"Do you really want to remove %1$s ?"</string>
+       <string name="confirmation_remove_folder_alert">"Do you really want to remove %1$s and its contents ?"</string>
+       <string name="confirmation_remove_local">Local only</string>
+       <string name="confirmation_remove_folder_local">Local contents only</string>
+       <string name="confirmation_remove_remote">Remove from server</string>
+       <string name="confirmation_remove_remote_and_local">Remote and local</string>
+       <string name="remove_success_msg">"Removal succeeded"</string>
+       <string name="remove_fail_msg">"Removal failed"</string>
+       <string name="rename_dialog_title">Enter a new name</string>
+       <string name="rename_local_fail_msg">"Local copy could not be renamed; try a different name"</string>
+       <string name="rename_server_fail_msg">"Rename could not be completed"</string>
+       <string name="sync_file_fail_msg">Remote file could not be checked</string>
+       <string name="sync_file_nothing_to_do_msg">File contents already synchronized</string>
+       <string name="create_dir_fail_msg">Directory could not be created</string>
+       <string name="filename_forbidden_characters">Forbidden characters: / \\ &lt; &gt; : " | ? *</string>
+       <string name="wait_a_moment">Wait a moment</string>
+       <string name="filedisplay_unexpected_bad_get_content">"Unexpected problem ; please select the file from a different app"</string>
+       <string name="filedisplay_no_file_selected">No file was selected</string>
+       <string name="activity_chooser_title">Send link to &#8230;</string>
+
+       <string name="oauth_check_onoff">Login with oAuth2</string>
+       <string name="oauth_login_connection">Connecting to oAuth2 server…</string>
+
+       <string name="ssl_validator_header">The identity of the site could not be verified</string>
+       <string name="ssl_validator_reason_cert_not_trusted">- The server certificate is not trusted</string>
+       <string name="ssl_validator_reason_cert_expired">- The server certificate expired</string>
+       <string name="ssl_validator_reason_cert_not_yet_valid">- The server certificate valid dates are in the future</string>
+       <string name="ssl_validator_reason_hostname_not_verified">- The URL does not match the hostname in the certificate</string>
+       <string name="ssl_validator_question">Do you want to trust this certificate anyway?</string>
+       <string name="ssl_validator_not_saved">The certificate could not be saved</string>
+       <string name="ssl_validator_btn_details_see">Details</string>
+       <string name="ssl_validator_btn_details_hide">Hide</string>
+       <string name="ssl_validator_label_subject">Issued to:</string>
+       <string name="ssl_validator_label_issuer">Issued by:</string>
+       <string name="ssl_validator_label_CN">Common name:</string>
+       <string name="ssl_validator_label_O">Organization:</string>
+       <string name="ssl_validator_label_OU">Organizational unit:</string>
+       <string name="ssl_validator_label_C">Country:</string>
+       <string name="ssl_validator_label_ST">State:</string>
+       <string name="ssl_validator_label_L">Location:</string>
+       <string name="ssl_validator_label_validity">Validity:</string>
+       <string name="ssl_validator_label_validity_from">From:</string>

        <string name="ssl_validator_label_validity_to">To:</string>
        <string name="ssl_validator_label_signature">Signature:</string>
        <string name="ssl_validator_label_signature_algorithm">Algorithm:</string>
        <string name="ssl_validator_null_cert">The certificate could not be shown.</string>
        <string name="ssl_validator_no_info_about_error">- No information about the error</string>
        <string name="ssl_validator_label_validity_to">To:</string>
        <string name="ssl_validator_label_signature">Signature:</string>
        <string name="ssl_validator_label_signature_algorithm">Algorithm:</string>
        <string name="ssl_validator_null_cert">The certificate could not be shown.</string>
        <string name="ssl_validator_no_info_about_error">- No information about the error</string>

-                       
-    <string name="placeholder_sentence">This is a placeholder</string>
-    <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">PNG Image</string>
-    <string name="placeholder_filesize">389 KB</string>
-    <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
-    <string name="placeholder_media_time">12:23:45</string>
-    
-    <string name="instant_upload_on_wifi">Upload pictures via WiFi only</string>
-    <string name="instant_upload_path">/InstantUpload</string>
-    <string name="conflict_title">Update conflict</string>
-    <string name="conflict_message">Remote file %s is not synchronized with local file. Continuing will replace content of file on server.</string>
-    <string name="conflict_keep_both">Keep both</string>
-    <string name="conflict_overwrite">Overwrite</string>
-    <string name="conflict_dont_upload">Don\'t upload</string>
-    
-    <string name="preview_image_description">Image preview</string>
-    <string name="preview_image_error_unknown_format">This image can not be shown</string>
-    
-    <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local directory</string>
-    <string name="actionbar_failed_instant_upload">Failed InstantUpload</string>
-    <string name="failed_upload_headline_text">Failed instant uploads</string>
-    <string name="failed_upload_headline_hint">Summary of all failed instant uploads</string>
-    <string name="failed_upload_all_cb">select all</string>
-    <string name="failed_upload_headline_retryall_btn">retry all selected</string>
-    <string name="failed_upload_headline_delete_all_btn">delete all  selected from uploadqueue</string>
-    <string name="failed_upload_retry_text">retry to upload the image: </string>
-    <string name="failed_upload_load_more_images">Load more Picrures</string>
-    <string name="failed_upload_retry_do_nothing_text">do nothing you are not online for instant upload</string>
+
+       <string name="placeholder_sentence">This is a placeholder</string>
+       <string name="placeholder_filename">placeholder.txt</string>
+       <string name="placeholder_filetype">PNG Image</string>
+       <string name="placeholder_filesize">389 KB</string>
+       <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
+       <string name="placeholder_media_time">12:23:45</string>
+
+       <string name="instant_upload_on_wifi">Upload pictures via WiFi only</string>
+       <string name="instant_upload_path">/InstantUpload</string>
+       <string name="conflict_title">Update conflict</string>
+       <string name="conflict_message">Remote file %s is not synchronized with local file. Continuing will replace
+               content of file on server.</string>
+       <string name="conflict_keep_both">Keep both</string>
+       <string name="conflict_overwrite">Overwrite</string>
+       <string name="conflict_dont_upload">Don\'t upload</string>
+
+       <string name="preview_image_description">Image preview</string>
+       <string name="preview_image_error_unknown_format">This image can not be shown</string>
+
+       <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local directory</string>
+       <string name="actionbar_failed_instant_upload">Failed InstantUpload</string>
+       <string name="failed_upload_headline_text">Failed instant uploads</string>
+       <string name="failed_upload_headline_hint">Summary of all failed instant uploads</string>
+       <string name="failed_upload_all_cb">select all</string>
+       <string name="failed_upload_headline_retryall_btn">retry all selected</string>
+       <string name="failed_upload_headline_delete_all_btn">delete all selected from uploadqueue</string>
+       <string name="failed_upload_retry_text">retry to upload the image: </string>
+       <string name="failed_upload_load_more_images">Load more Picrures</string>
+       <string name="failed_upload_retry_do_nothing_text">do nothing you are not online for instant upload</string>

        <string name="failed_upload_failure_text">Failure Message: </string>
        <string name="failed_upload_quota_exceeded_text">Please check your server configuration,maybe your quota is exceeded.</string>
        <string name="failed_upload_failure_text">Failure Message: </string>
        <string name="failed_upload_quota_exceeded_text">Please check your server configuration,maybe your quota is exceeded.</string>

-       
-       <string name="share_link_no_support_share_api">Sorry, sharing is not enabled on your server. Please contact your administrator.</string>
+
+       <string name="share_link_no_support_share_api">Sorry, sharing is not enabled on your server. Please contact your
+               administrator.</string>

        <string name="share_link_file_no_exist">Unable to share this file or folder. Please, make sure it exists</string>
        <string name="share_link_file_error">An error occurred while trying to share this file or folder</string>
        <string name="unshare_link_file_no_exist">Unable to unshare this file or folder. It does not exist.</string>
        <string name="share_link_file_no_exist">Unable to share this file or folder. Please, make sure it exists</string>
        <string name="share_link_file_error">An error occurred while trying to share this file or folder</string>
        <string name="unshare_link_file_no_exist">Unable to unshare this file or folder. It does not exist.</string>


@@ -259,7 +271,8 @@
 
        <string name="activity_chooser_send_file_title">Send</string>
 
 
        <string name="activity_chooser_send_file_title">Send</string>
 

-       <string name="copy_link">Copy link</string>     
+       <string name="copy_link">Copy link</string>

        <string name="clipboard_text_copied">Copied to clipboard</string>
        <string name="clipboard_text_copied">Copied to clipboard</string>

-       
+
+       <string name="error_cant_bind_to_operations_service">Critical error: can not perform operations</string>

 </resources>
 </resources>

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index e5e8014..6ff9f6a 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -25,8 +25,11 @@ import android.accounts.AccountManager;
 import android.app.AlertDialog;\r
 import android.app.Dialog;\r
 import android.app.ProgressDialog;\r
 import android.app.AlertDialog;\r
 import android.app.Dialog;\r
 import android.app.ProgressDialog;\r

+import android.content.ComponentName;\r
+import android.content.Context;\r

 import android.content.DialogInterface;\r
 import android.content.Intent;\r
 import android.content.DialogInterface;\r
 import android.content.Intent;\r

+import android.content.ServiceConnection;\r

 import android.content.SharedPreferences;\r
 import android.graphics.Rect;\r
 import android.graphics.drawable.Drawable;\r
 import android.content.SharedPreferences;\r
 import android.graphics.Rect;\r
 import android.graphics.drawable.Drawable;\r


@@ -34,6 +37,7 @@ import android.net.Uri;
 import android.net.http.SslError;\r
 import android.os.Bundle;\r
 import android.os.Handler;\r
 import android.net.http.SslError;\r
 import android.os.Bundle;\r
 import android.os.Handler;\r

+import android.os.IBinder;\r

 import android.preference.PreferenceManager;\r
 import android.support.v4.app.Fragment;\r
 import android.support.v4.app.FragmentManager;\r
 import android.preference.PreferenceManager;\r
 import android.support.v4.app.Fragment;\r
 import android.support.v4.app.FragmentManager;\r


@@ -54,6 +58,7 @@ import android.widget.CheckBox;
 import android.widget.EditText;\r
 import android.widget.TextView;\r
 import android.widget.TextView.OnEditorActionListener;\r
 import android.widget.EditText;\r
 import android.widget.TextView;\r
 import android.widget.TextView.OnEditorActionListener;\r

+import android.widget.Toast;\r

 \r
 import com.actionbarsherlock.app.SherlockDialogFragment;\r
 import com.owncloud.android.MainApp;\r
 \r
 import com.actionbarsherlock.app.SherlockDialogFragment;\r
 import com.owncloud.android.MainApp;\r


@@ -76,6 +81,8 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCo
 import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;\r
 import com.owncloud.android.lib.resources.users.GetRemoteUserNameOperation;\r
 \r
 import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;\r
 import com.owncloud.android.lib.resources.users.GetRemoteUserNameOperation;\r
 \r

+import com.owncloud.android.services.OperationsService;\r
+import com.owncloud.android.services.OperationsService.OperationsServiceBinder;\r

 import com.owncloud.android.ui.dialog.SamlWebViewDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;\r
 import com.owncloud.android.ui.dialog.SamlWebViewDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;\r


@@ -140,6 +147,9 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     private int mAuthStatusText, mAuthStatusIcon;    \r
     private TextView mAuthStatusLayout;\r
 \r
     private int mAuthStatusText, mAuthStatusIcon;    \r
     private TextView mAuthStatusLayout;\r
 \r

+    private ServiceConnection mOperationsConnection = null;\r
+    private OperationsServiceBinder mOperationsBinder = null;\r
+    \r

     private final Handler mHandler = new Handler();\r
     private Thread mOperationThread;\r
     private GetRemoteStatusOperation mOcServerChkOperation;\r
     private final Handler mHandler = new Handler();\r
     private Thread mOperationThread;\r
     private GetRemoteStatusOperation mOcServerChkOperation;\r


@@ -191,6 +201,32 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         super.onCreate(savedInstanceState);\r
         getWindow().requestFeature(Window.FEATURE_NO_TITLE);\r
 \r
         super.onCreate(savedInstanceState);\r
         getWindow().requestFeature(Window.FEATURE_NO_TITLE);\r
 \r

+        // bind to Operations Service\r
+        mOperationsConnection = new ServiceConnection() {\r
+\r
+            @Override\r
+            public void onServiceConnected(ComponentName name, IBinder service) {\r
+                Log_OC.d(TAG, "Operations service connected");\r
+                mOperationsBinder = (OperationsServiceBinder) service;\r
+            }\r
+\r
+            @Override\r
+            public void onServiceDisconnected(ComponentName name) {\r
+                Log_OC.d(TAG, "Operations service crashed");\r
+                mOperationsBinder = null;\r
+            }\r
+            \r
+        };\r
+        if (!bindService(new Intent(this, OperationsService.class), \r
+                        mOperationsConnection, \r
+                        Context.BIND_AUTO_CREATE)) {\r
+            Toast.makeText(this, \r
+                    R.string.error_cant_bind_to_operations_service, \r
+                    Toast.LENGTH_LONG)\r
+                        .show();\r
+            finish();\r
+        }\r
+\r

         /// set view and get references to view elements\r
         setContentView(R.layout.account_setup);\r
         mAuthMessage = (TextView) findViewById(R.id.auth_message);\r
         /// set view and get references to view elements\r
         setContentView(R.layout.account_setup);\r
         mAuthMessage = (TextView) findViewById(R.id.auth_message);\r


@@ -525,6 +561,16 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         mJustCreated = false;\r
 \r
     }\r
         mJustCreated = false;\r
 \r
     }\r

+    \r
+    \r
+    @Override\r
+    protected void onDestroy() {\r
+        if (mOperationsConnection != null) {\r
+            unbindService(mOperationsConnection);\r
+            mOperationsBinder = null;\r
+        }\r
+        super.onDestroy();\r
+    }\r

 \r
 \r
     /**\r
 \r
 \r
     /**\r

diff --git a/src/com/owncloud/android/services/OperationsService.java b/src/com/owncloud/android/services/OperationsService.java
index 80caea7..9dc8970 100644 (file)
--- a/src/com/owncloud/android/services/OperationsService.java
+++ b/src/com/owncloud/android/services/OperationsService.java
@@ -1,5 +1,5 @@
 /* ownCloud Android client application
 /* ownCloud Android client application

- *   Copyright (C) 2012-2013 ownCloud Inc.
+ *   Copyright (C) 2012-2014 ownCloud Inc.

  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,