changed according to latest discussion

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 7d80983..d51b3c0 100644 (file)
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -12,16 +12,12 @@
        </declare-styleable>
 
        <string-array name="pref_behaviour_entries">
        </declare-styleable>
 
        <string-array name="pref_behaviour_entries">

-               <item>@string/pref_behaviour_entries_do_nothing</item>
-               <item>@string/pref_behaviour_entries_copy</item>
+               <item>@string/pref_behaviour_entries_keep_file</item>

                <item>@string/pref_behaviour_entries_move</item>
                <item>@string/pref_behaviour_entries_move</item>

-               <item>@string/pref_behaviour_entries_delete</item>

        </string-array>
 
        <string-array name="pref_behaviour_entryValues">
                <item>NOTHING</item>
        </string-array>
 
        <string-array name="pref_behaviour_entryValues">
                <item>NOTHING</item>

-               <item>COPY</item>

                <item>MOVE</item>
                <item>MOVE</item>

-               <item>DELETE</item>

        </string-array>
 </resources>
\ No newline at end of file
        </string-array>
 </resources>
\ No newline at end of file

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 706baf0..aea93b7 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -368,15 +368,13 @@
     <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="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="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="upload_copy_files">Copy file</string>
     <string name="upload_move_files">Move file</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="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_dialog_title">Sharing</string>
     <string name="share_with_user_section_title">Share with Users and Groups</string>

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 161bb66..eb95bcd 100644 (file)
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -26,15 +26,6 @@
        </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/prefs_category_instant_uploading" android:key="instant_uploading_category">
        </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/prefs_category_instant_uploading" android:key="instant_uploading_category">

-         <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"
-                        />
-

                <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="instant_uploading"
                                android:title="@string/prefs_instant_upload"
                                android:summary="@string/prefs_instant_upload_summary"/>


@@ -53,6 +44,14 @@
            <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
                                                android:title="@string/instant_video_upload_on_wifi"
                                                android:key="instant_video_upload_on_wifi"/>
            <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
                                                android:title="@string/instant_video_upload_on_wifi"
                                                android:key="instant_video_upload_on_wifi"/>

+               <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
            CheckBoxPreference android:key="log_to_file"
                                android:title="@string/prefs_log_title"
            <!-- DISABLED FOR RELEASE UNTIL FIXED
            CheckBoxPreference android:key="log_to_file"
                                android:title="@string/prefs_log_title"

diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index e1c5c10..d76d696 100644 (file)
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -106,6 +106,7 @@ public class Preferences extends PreferenceActivity
     private String mUploadPath;
     private PreferenceCategory mPrefInstantUploadCategory;
     private Preference mPrefInstantUpload;
     private String mUploadPath;
     private PreferenceCategory mPrefInstantUploadCategory;
     private Preference mPrefInstantUpload;

+    private Preference mPrefInstantUploadBehaviour;

     private Preference mPrefInstantUploadPath;
     private Preference mPrefInstantUploadPathWiFi;
     private Preference mPrefInstantVideoUpload;
     private Preference mPrefInstantUploadPath;
     private Preference mPrefInstantUploadPathWiFi;
     private Preference mPrefInstantVideoUpload;


@@ -393,6 +394,9 @@ public class Preferences extends PreferenceActivity
             @Override
             public boolean onPreferenceChange(Preference preference, Object newValue) {
                 toggleInstantPictureOptions((Boolean) newValue);
             @Override
             public boolean onPreferenceChange(Preference preference, Object newValue) {
                 toggleInstantPictureOptions((Boolean) newValue);

+                toggleInstantUploadBehaviour(
+                        ((CheckBoxPreference)mPrefInstantVideoUpload).isChecked(),
+                        (Boolean) newValue);

                 return true;
             }
         });
                 return true;
             }
         });


@@ -420,14 +424,22 @@ public class Preferences extends PreferenceActivity
         toggleInstantVideoOptions(((CheckBoxPreference) mPrefInstantVideoUpload).isChecked());
         
         mPrefInstantVideoUpload.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
         toggleInstantVideoOptions(((CheckBoxPreference) mPrefInstantVideoUpload).isChecked());
         
         mPrefInstantVideoUpload.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {

-            
+

             @Override
             public boolean onPreferenceChange(Preference preference, Object newValue) {
                 toggleInstantVideoOptions((Boolean) newValue);
             @Override
             public boolean onPreferenceChange(Preference preference, Object newValue) {
                 toggleInstantVideoOptions((Boolean) newValue);

+                toggleInstantUploadBehaviour(
+                        (Boolean) newValue,
+                        ((CheckBoxPreference) mPrefInstantUpload).isChecked());

                 return true;
             }
         });
                 return true;
             }
         });

-            
+
+        mPrefInstantUploadBehaviour = findPreference("prefs_instant_behaviour");
+        toggleInstantUploadBehaviour(
+                ((CheckBoxPreference)mPrefInstantVideoUpload).isChecked(),
+                ((CheckBoxPreference)mPrefInstantUpload).isChecked());
+

         /* About App */
        pAboutApp = (Preference) findPreference("about_app");
        if (pAboutApp != null) { 
         /* About App */
        pAboutApp = (Preference) findPreference("about_app");
        if (pAboutApp != null) { 


@@ -472,6 +484,14 @@ public class Preferences extends PreferenceActivity
         }
     }
 
         }
     }
 

+    private void toggleInstantUploadBehaviour(Boolean video, Boolean picture){
+        if (picture || video){
+            mPrefInstantUploadCategory.addPreference(mPrefInstantUploadBehaviour);
+        } else {
+            mPrefInstantUploadCategory.removePreference(mPrefInstantUploadBehaviour);
+        }
+    }
+

     @Override
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
 
     @Override
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {