From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sat, 21 Nov 2015 08:33:26 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/switchOfflineFiles' into beta
X-Git-Tag: beta-20151122~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b1df33a8066fe756f09aab140775f21163489a5e?ds=inline

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

b1df33a8066fe756f09aab140775f21163489a5e
diff --cc src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
index 42cbf09a,8197143e..5ca2e98d
--- a/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
@@@ -80,9 -77,9 +80,9 @@@ public class PreviewImagePagerAdapter e
  
          mAccount = account;
          mStorageManager = storageManager;
-         mImageFiles = mStorageManager.getFolderImages(parentFolder, false);
+         mImageFiles = mStorageManager.getFolderImages(parentFolder, onlyOnDevice);
          
 -        mImageFiles = FileStorageUtils.sortFolder(mImageFiles);
 +        mImageFiles = FileStorageUtils.sortOcFolder(mImageFiles);
          
          mObsoleteFragments = new HashSet<Object>();
          mObsoletePositions = new HashSet<Integer>();