Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta

diff --cc res/values/strings.xml
index 68597bf,aea93b7..1df3a15
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -388,42 -368,18 +388,46 @@@
      <string name="file_list__footer__files">%1$d files</string>
      <string name="file_list__footer__files_and_folder">%1$d files, 1 folder</string>
      <string name="file_list__footer__files_and_folders">%1$d files, %2$d folders</string>
 +    <string name="action_switch_grid_view">Switch to grid view</string>
 +    <string name="action_switch_list_view">Switch to list view</string>
 +    <string name="common_category">Common</string>
 +    <string name="pref_cache_size">Cache size</string>
 +    <string name="prefs_instant_behaviour_dialogTitle">Upload file to server and ...</string>
 +    <string name="prefs_instant_behaviour_title">Behaviour</string>
+     <string name="prefs_instant_behaviour_dialogTitle">Original file will be...</string>
+     <string name="prefs_instant_behaviour_title">Original file will be...</string>
      <string name="upload_copy_files">Copy file</string>
      <string name="upload_move_files">Move file</string>
 +    <string name="prefs_storage_path">Storage path</string>
 +    <string name="prefs_common">Common</string>
  
 +    <string name="pref_behaviour_entries_do_nothing">do nothing</string>
 +    <string name="pref_behaviour_entries_copy">copy file to OC folder</string>
 +    <string name="pref_behaviour_entries_move">move file to OC folder</string>
 +    <string name="pref_behaviour_entries_delete">delete origin file</string>
 +    <string name="confirmation_remove_files_alert">Do you really want to remove selected items?</string>
 +    <string name="confirmation_remove_folders_alert">Do you really want to remove a folder and its content?</string>
 +    <string name="confirmation_remove_files">selected items</string>
 +    <string name="error_log_exit">Exit</string>
 +    <string name="error_log_send">Send Log</string>
 +    <string name="error_log_title">Error Log</string>
 +    <string name="action_stream_file">Stream file with external player</string>
 +    <string name="stream_expose_password">Do you want to stream this file with an external app?\n\nCAUTION: This may expose your password!</string>
 +    <string name="set_picture_as">Set picture as</string>
 +    <string name="set_as">Set As</string>
+     <string name="pref_behaviour_entries_keep_file">kept in original folder</string>
+     <string name="pref_behaviour_entries_move">moved to ownCloud folder</string>
  
      <string name="share_dialog_title">Sharing</string>
 -    <string name="share_with_user_section_title">Share with Users and Groups</string>
 +    <string name="share_with_user_section_title">Share with users and groups</string>
      <string name="share_no_users">No data shared with users yet</string>
      <string name="share_add_user_or_group">Add User or Group</string>
 +    <string name="share_via_link_section_title">Share link</string>
 +    <string name="share_via_link_expiration_date_label">Set expiration date</string>
 +    <string name="share_via_link_password_label">Password protect</string>
 +    <string name="share_via_link_password_title">Secured</string>
 +    <string name="share_get_public_link_button">Get link</string>
 +
      <string name="share_search">Search</string>
  
      <string name="search_users_and_groups_hint">Search users and groups</string>

diff --cc res/xml/preferences.xml
index 3972e9e,eb95bcd..e1876e9
--- 1/res/xml/preferences.xml
--- 2/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@@ -47,45 -33,26 +38,53 @@@
                                                        android:title="@string/prefs_instant_upload_path_title"
                                                        android:key="instant_upload_path" />
            <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
 -                                              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" />
 +                      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:dependency="instant_uploading"
 +                      android:disableDependentsState="true"
 +                      android:title="@string/instant_upload_on_charging"
 +                      android:key="instant_upload_on_charging"/>
 +
 +              <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.PreferenceWithLongSummary
 -                                                      android:title="@string/prefs_instant_video_upload_path_title"
 -                                                      android:key="instant_video_upload_path" />
 +                      android:dependency="instant_video_uploading"
 +                      android:disableDependentsState="true"
 +                      android:title="@string/prefs_instant_video_upload_path_title"
 +                      android:key="instant_video_upload_path" />
            <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
 -                                              android:title="@string/instant_video_upload_on_wifi"
 -                                              android:key="instant_video_upload_on_wifi"/>
 +                      android:dependency="instant_video_uploading"
 +                      android:disableDependentsState="true"
 +              android:title="@string/instant_video_upload_on_wifi"
 +              android:key="instant_video_upload_on_wifi"/>
 +              <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
 +                      android:dependency="instant_video_uploading"
 +                      android:disableDependentsState="true"
 +                      android:title="@string/instant_video_upload_on_charging"
 +                      android:key="instant_video_upload_on_charging"/>
+               <com.owncloud.android.ui.dialog.OwnCloudListPreference android:key="prefs_instant_behaviour"
+                       android:dialogTitle="@string/prefs_instant_behaviour_dialogTitle"
+                       android:title="@string/prefs_instant_behaviour_title"
+                       android:entries="@array/pref_behaviour_entries"
+                       android:entryValues="@array/pref_behaviour_entryValues"
+                       android:defaultValue="NOTHING"
+                       android:summary="%s"
+                       />
 -          <!-- DISABLED FOR RELEASE UNTIL FIXED
 +      </PreferenceCategory>
 +
 +      <PreferenceCategory android:title="@string/common_category" android:key="common_category">
 +              <EditTextPreference android:title="@string/pref_cache_size"
 +                                                      android:key="pref_cache_size"
 +                                                      android:digits="0123456789"/>
 +      </PreferenceCategory>
 +
 +      <PreferenceCategory android:title="@string/prefs_category_more" android:key="more">
 +              <!-- DISABLED FOR RELEASE UNTIL FIXED
            CheckBoxPreference android:key="log_to_file"
                                android:title="@string/prefs_log_title"
                                android:summary="@string/prefs_log_summary"/>

diff --cc src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
Simple merge

diff --cc src/com/owncloud/android/files/services/FileUploader.java
Simple merge

diff --cc src/com/owncloud/android/operations/UploadFileOperation.java
Simple merge

diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
Simple merge

diff --cc src/com/owncloud/android/ui/activity/Preferences.java
index 61b4702,d76d696..d7288c9
--- 1/src/com/owncloud/android/ui/activity/Preferences.java
--- 2/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@@ -495,19 -434,17 +502,24 @@@ public class Preferences extends Prefer
                  return true;
              }
          });
-             
+ 
+         mPrefInstantUploadBehaviour = findPreference("prefs_instant_behaviour");
+         toggleInstantUploadBehaviour(
+                 ((CheckBoxPreference)mPrefInstantVideoUpload).isChecked(),
+                 ((CheckBoxPreference)mPrefInstantUpload).isChecked());
+ 
          /* About App */
 -       pAboutApp = (Preference) findPreference("about_app");
 +       pAboutApp = findPreference("about_app");
         if (pAboutApp != null) { 
 -               pAboutApp.setTitle(String.format(getString(R.string.about_android), getString(R.string.app_name)));
 -               pAboutApp.setSummary(String.format(getString(R.string.about_version), appVersion));
 +               pAboutApp.setTitle(String.format(getString(R.string.about_android),
 +                                                getString(R.string.app_name)));
 +           try {
 +               Integer currentVersion = getPackageManager().getPackageInfo
 +                  (getPackageName(), 0).versionCode;
 +               pAboutApp.setSummary(String.format(getString(R.string.about_version),
 +                                    currentVersion));
 +           } catch (NameNotFoundException e) {
 +           }
         }
  
         loadInstantUploadPath();

diff --cc tests/project.properties
index 00cf62b,00cf62b..916037e
--- 1/tests/project.properties
--- 2/tests/project.properties
+++ b/tests/project.properties
@@@ -11,4 -11,4 +11,4 @@@
  #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
  
  # Project target.
--target=android-22
++target=android-23