Fix after rebase

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 4f3d577..e5908cf 100644 (file)
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -19,7 +19,7 @@
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
        <PreferenceCategory android:title="@string/prefs_category_general">
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
        <PreferenceCategory android:title="@string/prefs_category_general">

-               <Preference
+               <com.owncloud.android.ui.PreferenceWithLongSummary

                        android:title="@string/prefs_storage_path"
                        android:key="storage_path" />
        </PreferenceCategory>
                        android:title="@string/prefs_storage_path"
                        android:key="storage_path" />
        </PreferenceCategory>

diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index 78c61c7..3d5d8ab 100644 (file)
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -372,7 +372,7 @@ public class Preferences extends PreferenceActivity
             }
         }
 
             }
         }
 

-        mPrefStoragePath =  findPreference("storage_path");
+        mPrefStoragePath =  (PreferenceWithLongSummary)findPreference("storage_path");

         if (mPrefStoragePath != null) {
 
             mPrefStoragePath.setOnPreferenceClickListener(new OnPreferenceClickListener() {
         if (mPrefStoragePath != null) {
 
             mPrefStoragePath.setOnPreferenceClickListener(new OnPreferenceClickListener() {


@@ -394,7 +394,7 @@ public class Preferences extends PreferenceActivity
                 });
         }
 
                 });
         }
 

-        mPrefInstantUploadPath =  findPreference("instant_upload_path");
+        mPrefInstantUploadPath = (PreferenceWithLongSummary)findPreference("instant_upload_path");

         if (mPrefInstantUploadPath != null){
 
             mPrefInstantUploadPath.setOnPreferenceClickListener(new OnPreferenceClickListener() {
         if (mPrefInstantUploadPath != null){
 
             mPrefInstantUploadPath.setOnPreferenceClickListener(new OnPreferenceClickListener() {