From: Magnus Sjoqvist <magnus.b.j.sjoqvist@gmail.com>
Date: Mon, 20 Oct 2014 12:38:13 +0000 (+0200)
Subject: Merge with develop
X-Git-Tag: oc-android-1.7.0_signed~119^2~2^2~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/844790057b6519bc6e90f49c139335a97aade4c8?ds=inline

Merge with develop
---

844790057b6519bc6e90f49c139335a97aade4c8
diff --cc res/values/strings.xml
index 30c9557b,b021ed7e..4332c19b
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -304,4 -302,8 +305,7 @@@
  	<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="prefs_category_instant_uploading">Instant Uploads</string>
+ 	<string name="prefs_category_security">Security</string>
 -
  </resources>
diff --cc res/xml/preferences.xml
index 77ef6ed1,3b8b3e81..bda15014
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@@ -21,39 -21,42 +21,45 @@@
      <PreferenceCategory android:title="@string/prefs_category_accounts" android:key="accounts_category">
      </PreferenceCategory>
      
- 	<PreferenceCategory android:title="@string/prefs_category_general">
-     <!-- ListPreference
-         android:key="select_oc_account"
-         android:title="@string/prefs_select_oc_account"
-         android:summary="@string/prefs_summary_select_oc_account" 
-         / -->
-     <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:title="@string/prefs_pincode" android:key="set_pincode" 
+ 	<PreferenceCategory android:title="@string/prefs_category_security">
+ 	    <!-- ListPreference
+ 	        android:key="select_oc_account"
+ 	        android:title="@string/prefs_select_oc_account"
+ 	        android:summary="@string/prefs_summary_select_oc_account"
+ 	        / -->
+ 	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:title="@string/prefs_pincode" android:key="set_pincode" 
                          android:summary="@string/prefs_pincode_summary"/>
-     <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_uploading" 
-                         android:title="@string/prefs_instant_upload"  
-                         android:summary="@string/prefs_instant_upload_summary"/>
++
 +    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="save_last_upload_location"
 +        android:title="@string/prefs_remember_last_share_location"
 +        android:summary="@string/prefs_remember_last_upload_location_summary"/>
-     <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:dependency="instant_uploading" 
-         				android:disableDependentsState="true" 
-         				android:title="@string/instant_upload_on_wifi" 
-         				android:key="instant_upload_on_wifi"/>
-     <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_video_uploading" 
-                         android:title="@string/prefs_instant_video_upload"  
-                         android:summary="@string/prefs_instant_video_upload_summary"/>
-     <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:dependency="instant_video_uploading" 
-         				android:disableDependentsState="true" 
-         				android:title="@string/instant_video_upload_on_wifi" 
-         				android:key="instant_video_upload_on_wifi"/>
-     <!-- DISABLED FOR RELEASE UNTIL FIXED 
-     CheckBoxPreference android:key="log_to_file" 
-                         android:title="@string/prefs_log_title"  
-                         android:summary="@string/prefs_log_summary"/>
- 	<Preference 		android:key="log_history" 
-                         android:title="@string/prefs_log_title_history"  
-                         android:summary="@string/prefs_log_summary_history"/ -->
-                         
+ 	</PreferenceCategory>
+ 
+     <PreferenceCategory android:title="@string/prefs_category_instant_uploading">
+ 	    <EditTextPreference android:title="@string/prefs_instant_upload_path_title"
+ 	        				android:defaultValue="@string/instant_upload_path"
+ 	        				android:key="instant_upload_path"/>
+ 	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_uploading"
+ 	                        android:title="@string/prefs_instant_upload"
+ 	                        android:summary="@string/prefs_instant_upload_summary"/>
+ 	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:dependency="instant_uploading"
+ 	        				android:disableDependentsState="true"
+ 	        				android:title="@string/instant_upload_on_wifi"
+ 	        				android:key="instant_upload_on_wifi"/>
+ 	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_video_uploading"
+ 	                        android:title="@string/prefs_instant_video_upload"
+ 	                        android:summary="@string/prefs_instant_video_upload_summary"/>
+ 	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:dependency="instant_video_uploading"
+ 	        				android:disableDependentsState="true"
+ 	        				android:title="@string/instant_video_upload_on_wifi"
+ 	        				android:key="instant_video_upload_on_wifi"/>
+ 	    <!-- DISABLED FOR RELEASE UNTIL FIXED
+ 	    CheckBoxPreference android:key="log_to_file"
+ 	                        android:title="@string/prefs_log_title"
+ 	                        android:summary="@string/prefs_log_summary"/>
+ 		<Preference 		android:key="log_history"
+ 	                        android:title="@string/prefs_log_title_history"
+ 	                        android:summary="@string/prefs_log_summary_history"/ -->
 -                        
      </PreferenceCategory>
  	
  	<PreferenceCategory android:title="@string/prefs_category_more" android:key="more">