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

diff --git a/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java b/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
index 42cbf09..5ca2e98 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
@@ -80,7 +80,7 @@ public class PreviewImagePagerAdapter extends FragmentStatePagerAdapter {
 
         mAccount = account;
         mStorageManager = storageManager;
-        mImageFiles = mStorageManager.getFolderImages(parentFolder, false);
+        mImageFiles = mStorageManager.getFolderImages(parentFolder, onlyOnDevice);
         
         mImageFiles = FileStorageUtils.sortOcFolder(mImageFiles);