From 5c138c63277a60f1e3fa091a6b5dba5c317ff438 Mon Sep 17 00:00:00 2001
From: Bartosz Przybylski <bart.p.pl@gmail.com>
Date: Mon, 9 Nov 2015 22:06:53 +0100
Subject: [PATCH] Fix after rebase

---
 res/xml/preferences.xml                               | 2 +-
 src/com/owncloud/android/ui/activity/Preferences.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 4f3d577f..e5908cf3 100644
--- 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">
-		<Preference
+		<com.owncloud.android.ui.PreferenceWithLongSummary
 			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 78c61c7c..3d5d8ab9 100644
--- 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() {
@@ -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() {
-- 
2.11.0