Merge branch 'master' of https://github.com/owncloud/android into video_thumbnail

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / fragment / OCFileListFragment.java

diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 47d9992..5dfb329 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -429,7 +429,7 @@ public class OCFileListFragment extends ExtendedListFragment {
                     foldersCount++;
                 } else {
                     filesCount++;
-                    if (file.isImage()){
+                    if (file.isImage() || file.isVideo()){
                         imagesCount++;
                     }
                 }
@@ -445,6 +445,7 @@ public class OCFileListFragment extends ExtendedListFragment {
                 switchToGridView();
             } else {
                 switchToListView();
+//                switchToGridView();
             }
         }
     }