fix #1265

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index da8b7ba..b4f46f9 100644 (file)
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -44,15 +44,6 @@
                                                        android:title="@string/prefs_instant_upload_path_title"
                                                        android:key="instant_upload_path" />
            <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
                                                        android:title="@string/prefs_instant_upload_path_title"
                                                        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.PreferenceWithLongSummary
-                       android:dependency="instant_uploading"
-                       android:disableDependentsState="true"
-                       android:title="@string/prefs_instant_upload_path_title"
-                       android:key="instant_upload_path" />
-           <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle

                        android:dependency="instant_uploading"
                        android:disableDependentsState="true"
                android:title="@string/instant_upload_on_wifi"
                        android:dependency="instant_uploading"
                        android:disableDependentsState="true"
                android:title="@string/instant_upload_on_wifi"


@@ -83,17 +74,6 @@
                        android:title="@string/instant_video_upload_on_charging"
                        android:key="instant_video_upload_on_charging"/>
        </PreferenceCategory>
                        android:title="@string/instant_video_upload_on_charging"
                        android:key="instant_video_upload_on_charging"/>
        </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"/>
-               <Preference             android:key="log_history"
-                               android:title="@string/prefs_log_title_history"
-                               android:summary="@string/prefs_log_summary_history"/ -->
-                        
-    </PreferenceCategory>

 
        <PreferenceCategory android:title="@string/common_category" android:key="common_category">
                <EditTextPreference android:title="@string/pref_cache_size"
 
        <PreferenceCategory android:title="@string/common_category" android:key="common_category">
                <EditTextPreference android:title="@string/pref_cache_size"


@@ -102,6 +82,13 @@
        </PreferenceCategory>
 
        <PreferenceCategory android:title="@string/prefs_category_more" android:key="more">
        </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"/>
+               <Preference             android:key="log_history"
+                               android:title="@string/prefs_log_title_history"
+                               android:summary="@string/prefs_log_summary_history"/ -->

     <Preference android:title="@string/prefs_help" android:key="help" />
     <Preference android:title="@string/prefs_recommend" android:key="recommend" />
     <Preference android:title="@string/prefs_feedback" android:key="feedback" />
     <Preference android:title="@string/prefs_help" android:key="help" />
     <Preference android:title="@string/prefs_recommend" android:key="recommend" />
     <Preference android:title="@string/prefs_feedback" android:key="feedback" />

diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index 229f202..7b85fe6 100644 (file)
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -889,7 +889,7 @@ public class Preferences extends PreferenceActivity
         SharedPreferences appPrefs =
                 PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         mUploadVideoPath = appPrefs.getString("instant_video_upload_path", getString(R.string.instant_upload_path));
         SharedPreferences appPrefs =
                 PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         mUploadVideoPath = appPrefs.getString("instant_video_upload_path", getString(R.string.instant_upload_path));

-//        mPrefInstantVideoUploadPath.setSummary(mUploadVideoPath);
+        mPrefInstantVideoUploadPath.setSummary(mUploadVideoPath);

     }
 
     /**
     }
 
     /**