From: tobiasKaminsky 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?hp=02aa04eafc025725c3239a1f1f4adc5054f52ffd 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 42cbf09a..5ca2e98d 100644 --- 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);