From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sun, 18 Oct 2015 10:50:54 +0000 (+0200)
Subject: Merge remote-tracking branch 'remotes/upstream/master' into uploadWhenCharging
X-Git-Tag: beta-20151122~103^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e5caabd104b8e3f5bc416821050c1ce706ec04a0?hp=-c

Merge remote-tracking branch 'remotes/upstream/master' into uploadWhenCharging
---

e5caabd104b8e3f5bc416821050c1ce706ec04a0
diff --combined AndroidManifest.xml
index 7a971d3c,acb5f1d8..f0d59e4a
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -1,5 -1,4 +1,4 @@@
- <?xml version="1.0" encoding="utf-8"?>
- <!-- 
+ <?xml version="1.0" encoding="utf-8"?><!--
    ownCloud Android client application
  
    Copyright (C) 2012  Bartek Przybylski
@@@ -18,8 -17,8 +17,8 @@@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
  <manifest package="com.owncloud.android"
-     android:versionCode="10700200"
-     android:versionName="1.7.2" xmlns:android="http://schemas.android.com/apk/res/android">
+     android:versionCode="10800000"
+     android:versionName="1.8.0" xmlns:android="http://schemas.android.com/apk/res/android">
  
      <uses-permission android:name="android.permission.GET_ACCOUNTS" />
      <uses-permission android:name="android.permission.USE_CREDENTIALS" />
@@@ -39,47 -38,38 +38,38 @@@
          android:minSdkVersion="14"
          android:targetSdkVersion="22" />
  
-     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" >
-     </uses-permission>
+     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
  
      <application
          android:name=".MainApp"
          android:icon="@drawable/icon"
          android:label="@string/app_name"
-         android:theme="@style/Theme.ownCloud"> 
+         android:theme="@style/Theme.ownCloud">
          <activity
              android:name=".ui.activity.FileDisplayActivity"
-             android:label="@string/app_name"
-             >
+             android:label="@string/app_name">
              <intent-filter>
                  <action android:name="android.intent.action.MAIN" />
                  <category android:name="android.intent.category.LAUNCHER" />
              </intent-filter>
          </activity>
-         <activity android:name=".ui.activity.UploadFilesActivity">
-         </activity>
-         <activity android:name=".ui.activity.Uploader" >
+         <activity android:name=".ui.activity.UploadFilesActivity"></activity>
+         <activity android:name=".ui.activity.Uploader">
              <intent-filter>
-                 <action android:name="android.intent.action.SEND" >
-                 </action>
+                 <action android:name="android.intent.action.SEND"></action>
  
-                 <category android:name="android.intent.category.DEFAULT" >
-                 </category>
+                 <category android:name="android.intent.category.DEFAULT"></category>
  
-                 <data android:mimeType="*/*" >
-                 </data>
+                 <data android:mimeType="*/*"></data>
              </intent-filter>
              <intent-filter>
-                 <action android:name="android.intent.action.SEND_MULTIPLE" >
-                 </action>
+                 <action android:name="android.intent.action.SEND_MULTIPLE"></action>
  
-                 <category android:name="android.intent.category.DEFAULT" >
-                 </category>
+                 <category android:name="android.intent.category.DEFAULT"></category>
  
-                 <data android:mimeType="*/*" >
-                 </data>
+                 <data android:mimeType="*/*"></data>
  
- 			</intent-filter>
+             </intent-filter>
          </activity>
          <activity
              android:name=".ui.activity.Preferences"
@@@ -92,15 -82,13 +82,13 @@@
  		        
          <activity	
              android:name=".ui.preview.PreviewVideoActivity"
- 			android:label="@string/app_name"
- 			android:theme="@style/Theme.ownCloud.Fullscreen" 
- 			>
- 		</activity>        
+             android:label="@string/app_name"
+             android:theme="@style/Theme.ownCloud.Fullscreen"></activity>
  
          <service
              android:name=".authentication.AccountAuthenticatorService"
              android:exported="true">
-             <intent-filter  android:priority="100">
+             <intent-filter android:priority="100">
                  <action android:name="android.accounts.AccountAuthenticator" />
              </intent-filter>
  
@@@ -110,8 -98,7 +98,7 @@@
          </service>
          <service
              android:name=".syncadapter.FileSyncService"
-             android:exported="true" 
-             >
+             android:exported="true">
              <intent-filter>
                  <action android:name="android.content.SyncAdapter" />
              </intent-filter>
@@@ -127,8 -114,7 +114,7 @@@
              android:enabled="true"
              android:exported="false"
              android:label="@string/sync_string_files"
-             android:syncable="true" >
-         </provider>
+             android:syncable="true"></provider>
  
          <activity
              android:name=".authentication.AuthenticatorActivity"
@@@ -137,8 -123,10 +123,10 @@@
              android:launchMode="singleTask">
              <intent-filter>
                  <action android:name="android.intent.action.VIEW" />
+ 
                  <category android:name="android.intent.category.DEFAULT" />
                  <category android:name="android.intent.category.BROWSABLE" />
+ 
                  <data android:scheme="@string/oauth2_redirect_scheme" />
              </intent-filter>
              <intent-filter>
@@@ -151,7 -139,7 +139,7 @@@
          <service android:name=".files.services.FileDownloader" />
          <service android:name=".files.services.FileUploader" />
          <service android:name=".media.MediaService" />
-         
+ 
          <activity android:name=".ui.activity.PassCodeActivity" />
          <activity android:name=".ui.activity.ConflictsResolveActivity"/>
          <activity android:name=".ui.activity.GenericExplanationActivity"/>
@@@ -163,7 -151,7 +151,7 @@@
              <intent-filter>
                  <!-- unofficially supported by many Android phones but not by HTC devices: -->
                  <action android:name="com.android.camera.NEW_PICTURE" />
-                 <!-- officially supported since Android 4.0 (SDK 14, works even for HTC devices): --> 
+                 <!-- officially supported since Android 4.0 (SDK 14, works even for HTC devices): -->
                  <action android:name="android.hardware.action.NEW_PICTURE" />
                  <data android:mimeType="image/*" />
              </intent-filter>
@@@ -172,16 -160,12 +160,16 @@@
                  <data android:mimeType="video/*" />
              </intent-filter>
              <intent-filter>
-                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
+                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
              </intent-filter>
 +            <intent-filter>
 +				<action android:name="android.intent.action.ACTION_POWER_CONNECTED"/>
 +			    <action android:name="android.intent.action.ACTION_POWER_DISCONNECTED"/>
 +			</intent-filter>
          </receiver>
          <receiver android:name=".files.BootupBroadcastReceiver">
              <intent-filter>
-                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                 <action android:name="android.intent.action.BOOT_COMPLETED" />
              </intent-filter>
          </receiver>
          <service android:name=".services.observer.FileObserverService"/>
@@@ -191,11 -175,11 +179,11 @@@
  			android:label="@string/copy_link"
  			android:icon="@drawable/copy_link"/>
  
-         <activity 
+         <activity
  			android:name=".ui.activity.FolderPickerActivity"
  			android:label="@string/app_name"/>
  
-         <activity 
+         <activity
  			android:name=".ui.activity.UploadPathActivity"
  			android:label="@string/app_name"/>
          
diff --combined res/values/strings.xml
index 9a5ee4b4,267d713e..25223073
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -74,6 -74,7 +74,7 @@@
      <string name="file_list_seconds_ago">seconds ago</string>
      <string name="file_list_empty">Nothing in here. Upload something!</string>
      <string name="file_list_loading">Loading&#8230;</string>
+     <string name="file_list_no_app_for_file_type">No App found for file type!</string>
      <string name="local_file_list_empty">There are no files in this folder.</string>
      <string name="filedetails_select_file">Tap on a file to display additional information.</string>
      <string name="filedetails_size">Size:</string>
@@@ -122,14 -123,14 +123,14 @@@
      <string name="sync_fail_ticker_unauthorized">Synchronization failed, you need to relogin</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 folder 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 folder 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="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>
@@@ -152,20 -153,20 +153,20 @@@
      <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_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_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_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_getting_authorization">Getting authorization&#8230;</string>
  	<string name="auth_trying_to_login">Trying to login&#8230;</string>
@@@ -250,22 -251,21 +251,22 @@@
      <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_video_upload_on_wifi">Upload videos via WiFi only</string>
 +    
 +    <string name="instant_upload_on_wifi">Upload pictures via wifi only</string>
 +    <string name="instant_upload_on_charging">Upload when charging only</string>
 +    <string name="instant_video_upload_on_wifi">Upload videos via wifi only</string>
      <string name="instant_upload_path">/InstantUpload</string>
      <string name="conflict_title">File conflict</string>
      <string name="conflict_message">Which files do you want to keep? If you select both versions, the local file will have a number added to its name.</string>
@@@ -275,9 -275,9 +276,9 @@@
      
      <string name="preview_image_description">Image preview</string>
      <string name="preview_image_error_unknown_format">This image cannot be shown</string>
-     
+ 
      <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local folder</string>
 -    <string name="prefs_instant_upload_path_title">Upload Path</string>
 +    <string name="prefs_instant_upload_path_title">Upload path</string>
  
  	<string name="share_link_no_support_share_api">Sorry, sharing is not enabled on your server. Please contact your
  		administrator.</string>
@@@ -288,32 -288,31 +289,31 @@@
      <string name="share_link_password_title">Enter a password</string>
      <string name="share_link_empty_password">You must enter a password</string>
  
- 	<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="clipboard_text_copied">Copied to clipboard</string>
+     <string name="copy_link">Copy link</string>
+     <string name="clipboard_text_copied">Copied to clipboard</string>
  
- 	<string name="error_cant_bind_to_operations_service">Critical error: cannot perform operations</string>
- 	
- 	<string name="network_error_socket_exception">An error occurred while connecting with the server.</string>
- 	<string name="network_error_socket_timeout_exception">An error occurred while waiting for the server, the operation couldn\'t have been done</string>
- 	<string name="network_error_connect_timeout_exception">An error occurred while waiting for the server, the operation couldn\'t have been done</string>
- 	<string name="network_host_not_available">The operation couldn\'t be completed, server is unavailable</string>
+     <string name="error_cant_bind_to_operations_service">Critical error: cannot perform operations</string>
  
- 	<string name="empty" />
- 	
- 	<string name="forbidden_permissions">You do not have permission %s</string>
- 	<string name="forbidden_permissions_rename">to rename this file</string>
- 	<string name="forbidden_permissions_delete">to delete this file</string>
- 	<string name="share_link_forbidden_permissions">to share this file</string>
- 	<string name="unshare_link_forbidden_permissions">to unshare this file</string>
- 	<string name="forbidden_permissions_create">to create the file</string>
- 	<string name="uploader_upload_forbidden_permissions">to upload in this folder</string>
- 	<string name="downloader_download_file_not_found">The file is no longer available on the server</string>
+     <string name="network_error_socket_exception">An error occurred while connecting with the server.</string>
+     <string name="network_error_socket_timeout_exception">An error occurred while waiting for the server, the operation couldn\'t have been done</string>
+     <string name="network_error_connect_timeout_exception">An error occurred while waiting for the server, the operation couldn\'t have been done</string>
+     <string name="network_host_not_available">The operation couldn\'t be completed, server is unavailable</string>
+     <string name="empty" />
  
- 	<string name="prefs_category_accounts">Accounts</string>
- 	<string name="prefs_add_account">Add account</string>
- 	<string name="auth_redirect_non_secure_connection_title">Secure connection is redirected to an unsecured route.</string>
+     <string name="forbidden_permissions">You do not have permission %s</string>
+     <string name="forbidden_permissions_rename">to rename this file</string>
+     <string name="forbidden_permissions_delete">to delete this file</string>
+     <string name="share_link_forbidden_permissions">to share this file</string>
+     <string name="unshare_link_forbidden_permissions">to unshare this file</string>
+     <string name="forbidden_permissions_create">to create the file</string>
+     <string name="uploader_upload_forbidden_permissions">to upload in this folder</string>
+     <string name="downloader_download_file_not_found">The file is no longer available on the server</string>
+ 
+     <string name="prefs_category_accounts">Accounts</string>
+     <string name="prefs_add_account">Add account</string>
+     <string name="auth_redirect_non_secure_connection_title">Secure connection is redirected through an unsecured route.</string>
  
  	<string name="actionbar_logger">Logs</string>
  	<string name="log_send_history_button">Send History</string>
@@@ -327,16 -326,23 +327,23 @@@
  	<string name="file_list_empty_moving">Nothing in here. You can add a folder!</string>
  	<string name="folder_picker_choose_button_text">Choose</string>
  
- 	<string name="move_file_not_found">Unable to move. Please check whether the file exists</string>
- 	<string name="move_file_invalid_into_descendent">It is not possible to move a folder into a descendant</string>
- 	<string name="move_file_invalid_overwrite">The file exists already in the destination folder</string>
- 	<string name="move_file_error">An error occurred while trying to move this file or folder</string>
- 	<string name="forbidden_permissions_move">to move this file</string>
+     <string name="move_file_not_found">Unable to move. Please check whether the file exists</string>
+     <string name="move_file_invalid_into_descendent">It is not possible to move a folder into a descendant</string>
+     <string name="move_file_invalid_overwrite">The file exists already in the destination folder</string>
+     <string name="move_file_error">An error occurred while trying to move this file or folder</string>
+     <string name="forbidden_permissions_move">to move this file</string>
+ 
+ 
+     <string name="copy_file_not_found">Unable to copy. Please check whether the file exists</string>
+     <string name="copy_file_invalid_into_descendent">It is not possible to copy a folder into a descendant</string>
+     <string name="copy_file_invalid_overwrite">The file exists already in the destination folder</string>
+     <string name="copy_file_error">An error occurred while trying to copy this file or folder</string>
+     <string name="forbidden_permissions_copy">to copy this file</string>
  
- 	<string name="prefs_category_instant_uploading">Instant Uploads</string>
+     <string name="prefs_category_instant_uploading">Instant Uploads</string>
  	<string name="prefs_category_security">Security</string>
  
 -	<string name="prefs_instant_video_upload_path_title">Upload Video Path</string>
 +	<string name="prefs_instant_video_upload_path_title">Upload video path</string>
      <string name="download_folder_failed_content">Download of %1$s folder could not be completed</string>
  
  	<string name="shared_subject_header">shared</string>