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

diff --combined src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
index 42cbf09,8197143..5ca2e98
--- 1/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
--- 2/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
@@@ -27,7 -27,6 +27,7 @@@ import java.util.Set
  import java.util.Vector;
  
  import android.accounts.Account;
 +import android.graphics.Bitmap;
  import android.support.v4.app.Fragment;
  import android.support.v4.app.FragmentManager;
  import android.support.v4.app.FragmentStatePagerAdapter;
@@@ -35,8 -34,6 +35,8 @@@ import android.view.ViewGroup
  
  import com.owncloud.android.datamodel.FileDataStorageManager;
  import com.owncloud.android.datamodel.OCFile;
 +import com.owncloud.android.datamodel.ThumbnailsCacheManager;
 +import com.owncloud.android.ui.adapter.FileListListAdapter;
  import com.owncloud.android.ui.fragment.FileFragment;
  import com.owncloud.android.utils.FileStorageUtils;
  
@@@ -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>();
@@@ -106,15 -103,17 +106,15 @@@
          Fragment fragment = null;
          if (file.isDown()) {
              fragment = PreviewImageFragment.newInstance(file,
 -                    mObsoletePositions.contains(Integer.valueOf(i)));
 +                    mObsoletePositions.contains(Integer.valueOf(i)), false);
              
          } else if (mDownloadErrors.contains(Integer.valueOf(i))) {
              fragment = FileDownloadFragment.newInstance(file, mAccount, true);
              ((FileDownloadFragment)fragment).setError(true);
              mDownloadErrors.remove(Integer.valueOf(i));
 -            
          } else {
 -            fragment = FileDownloadFragment.newInstance(
 -                    file, mAccount, mObsoletePositions.contains(Integer.valueOf(i))
 -            );
 +            fragment = PreviewImageFragment.newInstance(file,
 +                    mObsoletePositions.contains(Integer.valueOf(i)), true);
          }
          mObsoletePositions.remove(Integer.valueOf(i));
          return fragment;